bk commit into 5.1 tree (mats:1.2240)

[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 22:38:57+02:00, mats@romeo.(none) +2 -0
  Fixing the prototype for my_strndup() to compile on Windows.

  mysys/my_malloc.c@stripped, 2006-07-07 22:38:53+02:00, mats@romeo.(none) +1 -1
    Changing prototype for my_strndup().

  server-tools/instance-manager/parse.h@stripped, 2006-07-07 22:38:53+02:00, mats@romeo.(none) +1 -1
    Changing prototype for my_strndup().

# 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.10/mysys/my_malloc.c	2006-07-07 22:39:04 +02:00
+++ 1.11/mysys/my_malloc.c	2006-07-07 22:39:04 +02:00
@@ -83,7 +83,7 @@
 }
 
 
-char *my_strndup(const byte *from, uint length, myf my_flags)
+char *my_strndup(const char *from, uint length, myf my_flags)
 {
   gptr ptr;
   if ((ptr=my_malloc(length+1,my_flags)) != 0)

--- 1.7/server-tools/instance-manager/parse.h	2006-07-07 22:39:04 +02:00
+++ 1.8/server-tools/instance-manager/parse.h	2006-07-07 22:39:04 +02:00
@@ -69,7 +69,7 @@
 
 inline char *Named_value::alloc_str(const LEX_STRING *str)
 {
-  return my_strndup((const byte *) str->str, str->length, MYF(0));
+  return my_strndup(str->str, str->length, MYF(0));
 }
 
 inline char *Named_value::alloc_str(const char *str)