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

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl

Browse Source 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
This commit is contained in:
unknown 2007-11-14 15:41:33 +01:00
commit 5a3baf3d05
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sql/log_event.cc
View File

@ -1455,8 +1455,11 @@ static void copy_str_and_move(const char **src,
} }
static char const *code_name(int code) { #ifndef DBUG_OFF
char buf[255]; static char const *
code_name(int code)
{
static char buf[255];
switch (code) { switch (code) {
case Q_FLAGS2_CODE: return "Q_FLAGS2_CODE"; case Q_FLAGS2_CODE: return "Q_FLAGS2_CODE";
case Q_SQL_MODE_CODE: return "Q_SQL_MODE_CODE"; case Q_SQL_MODE_CODE: return "Q_SQL_MODE_CODE";
@ -1471,6 +1474,7 @@ static char const *code_name(int code) {
sprintf(buf, "CODE#%d", code); sprintf(buf, "CODE#%d", code);
return buf; return buf;
} }
#endif
/** /**
Macro to check that there is enough space to read from memory. Macro to check that there is enough space to read from memory.
@ -1549,7 +1553,7 @@ Query_log_event::Query_log_event(const char* buf, uint event_len,
*/ */
if (status_vars_len > min(data_len, MAX_SIZE_LOG_EVENT_STATUS)) if (status_vars_len > min(data_len, MAX_SIZE_LOG_EVENT_STATUS))
{ {
DBUG_PRINT("info", ("status_vars_len: %d; data_len: %d; query= 0", DBUG_PRINT("info", ("status_vars_len (%u) > data_len (%lu); query= 0",
status_vars_len, data_len)); status_vars_len, data_len));
query= 0; query= 0;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
@ -1594,7 +1598,7 @@ Query_log_event::Query_log_event(const char* buf, uint event_len,
} }
case Q_CATALOG_NZ_CODE: case Q_CATALOG_NZ_CODE:
DBUG_PRINT("info", ("case Q_CATALOG_NZ_CODE; pos: 0x%lx; end: 0x%lx", DBUG_PRINT("info", ("case Q_CATALOG_NZ_CODE; pos: 0x%lx; end: 0x%lx",
pos, end)); (ulong) pos, (ulong) end));
if (get_str_len_and_pointer(&pos, &catalog, &catalog_len, end)) if (get_str_len_and_pointer(&pos, &catalog, &catalog_len, end))
{ {
DBUG_PRINT("info", ("query= 0")); DBUG_PRINT("info", ("query= 0"));