1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post-merge fix: header is used by the client API. Obvious in retrospect.

Browse Source 
Also, update a few cases missed by the initial patch.
This commit is contained in:
Davi Arnaut 2010-06-05 16:39:03 -03:00
parent 5dec0c9637
commit 75dce25ca8
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysqltest.cc
View File

@ -87,7 +87,7 @@ enum {
OPT_SKIP_SAFEMALLOC=OPT_MAX_CLIENT_OPTION, OPT_SKIP_SAFEMALLOC=OPT_MAX_CLIENT_OPTION,
OPT_PS_PROTOCOL, OPT_SP_PROTOCOL, OPT_CURSOR_PROTOCOL, OPT_VIEW_PROTOCOL, OPT_PS_PROTOCOL, OPT_SP_PROTOCOL, OPT_CURSOR_PROTOCOL, OPT_VIEW_PROTOCOL,
OPT_MAX_CONNECT_RETRIES, OPT_MAX_CONNECTIONS, OPT_MARK_PROGRESS, OPT_MAX_CONNECT_RETRIES, OPT_MAX_CONNECTIONS, OPT_MARK_PROGRESS,
OPT_LOG_DIR, OPT_TAIL_LINES, OPT_RESULT_FORMAT_VERSION, OPT_LOG_DIR, OPT_TAIL_LINES, OPT_RESULT_FORMAT_VERSION
}; };
static int record= 0, opt_sleep= -1; static int record= 0, opt_sleep= -1;

8
include/my_alloc.h
View File

@ -23,7 +23,9 @@
#define ALLOC_MAX_BLOCK_TO_DROP 4096 #define ALLOC_MAX_BLOCK_TO_DROP 4096
#define ALLOC_MAX_BLOCK_USAGE_BEFORE_DROP 10 #define ALLOC_MAX_BLOCK_USAGE_BEFORE_DROP 10
C_MODE_START #ifdef __cplusplus
extern "C" {
#endif
typedef struct st_used_mem typedef struct st_used_mem
{ /* struct for once_alloc (block) */ { /* struct for once_alloc (block) */
@ -51,6 +53,8 @@ typedef struct st_mem_root
void (*error_handler)(void); void (*error_handler)(void);
} MEM_ROOT; } MEM_ROOT;
C_MODE_END #ifdef __cplusplus
}
#endif
#endif #endif

2
include/mysql.h.pp
View File

@ -202,7 +202,6 @@ typedef unsigned int MYSQL_FIELD_OFFSET;
typedef unsigned long long my_ulonglong; typedef unsigned long long my_ulonglong;
#include "typelib.h" #include "typelib.h"
#include "my_alloc.h" #include "my_alloc.h"
C_MODE_START
typedef struct st_used_mem typedef struct st_used_mem
{ {
struct st_used_mem *next; struct st_used_mem *next;
@ -220,7 +219,6 @@ typedef struct st_mem_root
unsigned int first_block_usage; unsigned int first_block_usage;
void (*error_handler)(void); void (*error_handler)(void);
} MEM_ROOT; } MEM_ROOT;
C_MODE_END
typedef struct st_typelib { typedef struct st_typelib {
unsigned int count; unsigned int count;
const char *name; const char *name;

2
plugin/semisync/semisync_master.h
View File

@ -153,7 +153,7 @@ public:
int free_nodes_before(TranxNode* node) int free_nodes_before(TranxNode* node)
{ {
Block *block; Block *block;
Block *prev_block; Block *prev_block= NULL;
block= first_block; block= first_block;
while (block != current_block->next) while (block != current_block->next)

7
sql/debug_sync.cc
View File

@ -387,6 +387,13 @@ static st_debug_sync_globals debug_sync_global; /* All globals in one object */
*/ */
extern "C" void (*debug_sync_C_callback_ptr)(const char *, size_t); extern "C" void (*debug_sync_C_callback_ptr)(const char *, size_t);
/**
Callbacks from C files.
*/
C_MODE_START
static void debug_sync_C_callback(const char *, size_t);
static int debug_sync_qsort_cmp(const void *, const void *);
C_MODE_END
/** /**
Callback for debug sync, to be used by C files. See thr_lock.c for example. Callback for debug sync, to be used by C files. See thr_lock.c for example.