Commit 8cc379eb authored by unknown's avatar unknown

Fixes to eliminate warnings.

parent b3c4bc6e
...@@ -1455,8 +1455,10 @@ static void copy_str_and_move(const char **src, ...@@ -1455,8 +1455,10 @@ static void copy_str_and_move(const char **src,
} }
static char const *code_name(int code) { static char const *
char buf[255]; 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";
...@@ -1549,7 +1551,7 @@ Query_log_event::Query_log_event(const char* buf, uint event_len, ...@@ -1549,7 +1551,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 +1596,7 @@ Query_log_event::Query_log_event(const char* buf, uint event_len, ...@@ -1594,7 +1596,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"));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment