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

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl

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"));