bk commit into 5.0 tree (mats:1.2552)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.0 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-13 09:01:42+01:00, mats@stripped +1 -0
  Fixes to eliminate warnings.

  sql/log_event.cc@stripped, 2007-11-13 09:01:39+01:00, mats@stripped +6
-4
    Fixes to eliminate warnings.

diff -Nrup a/sql/log_event.cc b/sql/log_event.cc
--- a/sql/log_event.cc	2007-11-12 22:02:05 +01:00
+++ b/sql/log_event.cc	2007-11-13 09:01:39 +01:00
@@ -1455,8 +1455,10 @@ static void copy_str_and_move(const char
 }
 
 
-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 c
     */
     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 c
     }
     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"));