bzr commit into mysql-5.1-telco-6.3 branch (magnus.blaudd:3192) Bug#48357

[Magnus Blåudd]

#At file:///home/msvensson/mysql/6.3/ based on revid:jonas@strippedfs7r

 3192 Magnus Blåudd	2009-12-14
      Merge bug#48357 into mysql-5.1-telco-6.3"

    modified:
      sql/log_event.cc
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2009-10-05 10:42:32 +0000
+++ b/sql/log_event.cc	2009-12-14 10:57:23 +0000
@@ -2141,8 +2141,8 @@ void Query_log_event::pack_info(Protocol
 /**
   Utility function for the next method (Query_log_event::write()) .
 */
-static void write_str_with_code_and_len(char **dst, const char *src,
-                                        int len, uint code)
+static void write_str_with_code_and_len(uchar **dst, const char *src,
+                                        uint len, uint code)
 {
   /*
     only 1 byte to store the length of catalog, so it should not
@@ -2237,7 +2237,7 @@ bool Query_log_event::write(IO_CACHE* fi
   }
   if (catalog_len) // i.e. this var is inited (false for 4.0 events)
   {
-    write_str_with_code_and_len((char **)(&start),
+    write_str_with_code_and_len(&start,
                                 catalog, catalog_len, Q_CATALOG_NZ_CODE);
     /*
       In 5.0.x where x<4 masters we used to store the end zero here. This was
@@ -2275,7 +2275,7 @@ bool Query_log_event::write(IO_CACHE* fi
   {
     /* In the TZ sys table, column Name is of length 64 so this should be ok */
     DBUG_ASSERT(time_zone_len <= MAX_TIME_ZONE_NAME_LENGTH);
-    write_str_with_code_and_len((char **)(&start),
+    write_str_with_code_and_len(&start,
                                 time_zone_str, time_zone_len, Q_TIME_ZONE_CODE);
   }
   if (lc_time_names_number)

Attachment: [text/bzr-bundle] bzr/[e-mail]