diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2007-11-14 15:41:33 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2007-11-14 15:41:33 +0100 |
| commit | 5a3baf3d05824ebd6581eea8a717bd982ca5bba5 (patch) | |
| tree | 2e4dffe64ae7b58da58b98b19af1beaaddfb9b87 | |
| parent | f5613086480b6b3a5d8a673376f461b753269418 (diff) | |
| parent | c1b3466f799bf68b1f5151a2656b91ca1aea85e8 (diff) | |
| download | mariadb-git-5a3baf3d05824ebd6581eea8a717bd982ca5bba5.tar.gz | |
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
| -rw-r--r-- | sql/log_event.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 5c3fcf2f86b..d22973d12a3 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1455,8 +1455,11 @@ static void copy_str_and_move(const char **src, } -static char const *code_name(int code) { - char buf[255]; +#ifndef DBUG_OFF +static char const * +code_name(int code) +{ + static char buf[255]; switch (code) { case Q_FLAGS2_CODE: return "Q_FLAGS2_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); return buf; } +#endif /** 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)) { - 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)); query= 0; DBUG_VOID_RETURN; @@ -1594,7 +1598,7 @@ Query_log_event::Query_log_event(const char* buf, uint event_len, } case Q_CATALOG_NZ_CODE: 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)) { DBUG_PRINT("info", ("query= 0")); |