bk commit into 5.1 tree (mats:1.2239)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 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, 2006-07-07 21:03:19+02:00, mats@romeo.(none) +4 -0
  Fixing usage of my_strndup() to new prototype.

  sql/ha_federated.cc@stripped, 2006-07-07 21:03:15+02:00, mats@romeo.(none) +3 -4
    Fixing usage of my_strndup() to new prototype.

  sql/log_event.cc@stripped, 2006-07-07 21:03:15+02:00, mats@romeo.(none) +2 -5
    Fixing usage of my_strndup() to new prototype.

  sql/set_var.cc@stripped, 2006-07-07 21:03:16+02:00, mats@romeo.(none) +2 -2
    Fixing usage of my_strndup() to new prototype.

  sql/set_var.h@stripped, 2006-07-07 21:03:16+02:00, mats@romeo.(none) +1 -1
    Fixing usage of my_strndup() to new prototype.

# 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:	mats
# Host:	romeo.(none)
# Root:	/home/bk/b20821-mysql-5.1-new-rpl

--- 1.230/sql/log_event.cc	2006-07-07 21:03:26 +02:00
+++ 1.231/sql/log_event.cc	2006-07-07 21:03:26 +02:00
@@ -3175,8 +3175,7 @@
                       llstr(pos_arg, buff), flags));
 #endif
   if (flags & DUP_NAME)
-    new_log_ident= my_strndup((const byte*) new_log_ident_arg,
-                                         ident_len, MYF(MY_WME));
+    new_log_ident= my_strndup(new_log_ident_arg, ident_len, MYF(MY_WME));
   DBUG_VOID_RETURN;
 }
 #endif
@@ -3199,9 +3198,7 @@
                      (header_size+post_header_len)); 
   ident_offset = post_header_len; 
   set_if_smaller(ident_len,FN_REFLEN-1);
-  new_log_ident= my_strndup((byte*) buf + ident_offset,
-                                       (uint) ident_len,
-                                       MYF(MY_WME));
+  new_log_ident= my_strndup(buf + ident_offset, (uint) ident_len, MYF(MY_WME));
   DBUG_VOID_RETURN;
 }
 

--- 1.178/sql/set_var.cc	2006-07-07 21:03:26 +02:00
+++ 1.179/sql/set_var.cc	2006-07-07 21:03:26 +02:00
@@ -1097,7 +1097,7 @@
   uint new_length= (var ? var->value->str_value.length() : 0);
   if (!old_value)
     old_value= (char*) "";
-  if (!(res= my_strndup((byte*)old_value, new_length, MYF(0))))
+  if (!(res= my_strndup(old_value, new_length, MYF(0))))
     return 1;
   /*
     Replace the old value in such a way that the any thread using
@@ -2632,7 +2632,7 @@
     old_value= make_default_log_name(buff, log_ext);
     str_length= strlen(old_value);
   }
-  if (!(res= my_strndup((byte*)old_value, str_length, MYF(MY_FAE+MY_WME))))
+  if (!(res= my_strndup(old_value, str_length, MYF(MY_FAE+MY_WME))))
   {
     result= 1;
     goto err;

--- 1.89/sql/set_var.h	2006-07-07 21:03:26 +02:00
+++ 1.90/sql/set_var.h	2006-07-07 21:03:26 +02:00
@@ -1055,7 +1055,7 @@
 	     uint name_length_arg, gptr data_arg)
     :name_length(name_length_arg), data(data_arg)
   {
-    name= my_strndup((byte*) name_arg, name_length, MYF(MY_WME));
+    name= my_strndup(name_arg, name_length, MYF(MY_WME));
     links->push_back(this);
   }
   inline bool cmp(const char *name_cmp, uint length)

--- 1.62/sql/ha_federated.cc	2006-07-07 21:03:27 +02:00
+++ 1.63/sql/ha_federated.cc	2006-07-07 21:03:27 +02:00
@@ -629,10 +629,9 @@
   DBUG_PRINT("info", ("Length: %d", table->s->connect_string.length));
   DBUG_PRINT("info", ("String: '%.*s'", table->s->connect_string.length, 
                       table->s->connect_string.str));
-  share->scheme= my_strndup((const byte*)table->s->
-                                       connect_string.str, 
-                                       table->s->connect_string.length,
-                                       MYF(0));
+  share->scheme= my_strndup(table->s->connect_string.str,
+                            table->s->connect_string.length,
+                            MYF(0));
 
   // Add a null for later termination of table name
   share->scheme[table->s->connect_string.length]= 0;