From 8cc379ebab5412846c5add52f9a4e3fdb32aa54a Mon Sep 17 00:00:00 2001
From: unknown <mats@kindahl-laptop.dnsalias.net>
Date: Tue, 13 Nov 2007 09:01:42 +0100
Subject: [PATCH 1/2] Fixes to eliminate warnings.

---
 sql/log_event.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sql/log_event.cc b/sql/log_event.cc
index 5c3fcf2f86b..13c15924210 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1455,8 +1455,10 @@ static void copy_str_and_move(const char **src,
 }
 
 
-static char const *code_name(int code) {
-  char buf[255];
+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";
@@ -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))
     {
-      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 +1596,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"));

From c1b3466f799bf68b1f5151a2656b91ca1aea85e8 Mon Sep 17 00:00:00 2001
From: unknown <mats@kindahl-laptop.dnsalias.net>
Date: Tue, 13 Nov 2007 09:43:29 +0100
Subject: [PATCH 2/2] Elimination of warning for unused function code_name() in
 non-debug mode.

---
 sql/log_event.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sql/log_event.cc b/sql/log_event.cc
index 13c15924210..d22973d12a3 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1455,6 +1455,7 @@ static void copy_str_and_move(const char **src,
 }
 
 
+#ifndef DBUG_OFF
 static char const *
 code_name(int code)
 {
@@ -1473,6 +1474,7 @@ code_name(int code)
   sprintf(buf, "CODE#%d", code);
   return buf;
 }
+#endif
 
 /**
    Macro to check that there is enough space to read from memory.