bk commit into 5.1 tree (cbell:1.2370) BUG#22645

[cbell]

Below is the list of changes that have just been committed into a local
5.1 repository of cbell. When cbell 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-01-08 11:15:43-05:00, cbell@stripped +1 -0
  BUG#22645 - LC_TIME_NAMES: Statement not replicated
  This patch is an additional code change to the get_str_len_and_pointer
  method in log_events.cc. This change is necessary to correct a problem
  encountered on 64-bit SUSE where the auto_increment_* variables were
  being overwritten. The change corrects a cast mismatch which caused
  the problem.

  sql/log_event.cc@stripped, 2007-01-08 11:15:38-05:00, cbell@stripped +12 -5
    BUG#22645 - LC_TIME_NAMES: Statement not replicated
    This patch is an additional code change to the get_str_len_and_pointer
    method in log_events.cc. This change is necessary to correct a problem
    encountered on 64-bit SUSE where the auto_increment_* variables were
    being overwritten. The change corrects a cast mismatch which caused
    the problem.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cbell
# Host:	suse.vabb.com
# Root:	/home/Chuck/development/mysql-5.1-red

--- 1.259/sql/log_event.cc	2006-12-29 07:45:07 -05:00
+++ 1.260/sql/log_event.cc	2007-01-08 11:15:38 -05:00
@@ -1516,14 +1516,19 @@ Query_log_event::Query_log_event(THD* th
 
 /* 2 utility functions for the next method */
 
-static void get_str_len_and_pointer(const char **dst, const char **src, uint *len)
+
+/* 
+  Get the pointer for a string (src) that contains the length in
+  the first byte. Set the output string (dst) to the string value
+  and place the length of the string in the byte after the string.
+*/
+static void get_str_len_and_pointer(const uchar **src, const uchar **dst, uint *len)
 {
   if ((*len= **src))
     *dst= *src + 1;                          // Will be copied later
-  (*src)+= *len+1;
+  (*src)+= *len + 1;
 }
 
-
 static void copy_str_and_move(char **dst, const char **src, uint len)
 {
   memcpy(*dst, *src, len);
@@ -1621,7 +1626,8 @@ Query_log_event::Query_log_event(const c
       break;
     }
     case Q_CATALOG_NZ_CODE:
-      get_str_len_and_pointer(&catalog, (const char **)(&pos), &catalog_len);
+      get_str_len_and_pointer((const uchar **)&pos, 
+                              (const uchar **)&catalog, &catalog_len);
       break;
     case Q_AUTO_INCREMENT:
       auto_increment_increment= uint2korr(pos);
@@ -1637,7 +1643,8 @@ Query_log_event::Query_log_event(const c
     }
     case Q_TIME_ZONE_CODE:
     {
-      get_str_len_and_pointer(&time_zone_str, (const char **)(&pos), &time_zone_len);
+      get_str_len_and_pointer((const uchar **)&pos, 
+                              (const uchar **)&time_zone_str, &time_zone_len);
       break;
     }
     case Q_CATALOG_CODE: /* for 5.0.x where 0<=x<=3 masters */