MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Mats Kindahl Date:July 7 2006 1:59pm
Subject:bk commit into 5.1 tree (mats:1.2236)
View as plain text  
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 15:59:17+02:00, mats@romeo.(none) +2 -0
  Correcting signature for my_strndup to be able to build on Windows
  in pushbuild on Replication/Backup team tree.

  include/my_sys.h@stripped, 2006-07-07 15:59:13+02:00, mats@romeo.(none) +2 -2
    Using "char" instead of "byte" for my_strndup().

  mysys/safemalloc.c@stripped, 2006-07-07 15:59:13+02:00, mats@romeo.(none) +1 -1
    Using "char" instead of "byte" 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.201/include/my_sys.h	2006-07-07 15:59:24 +02:00
+++ 1.202/include/my_sys.h	2006-07-07 15:59:24 +02:00
@@ -163,7 +163,7 @@
 extern void my_no_flags_free(gptr ptr);
 extern gptr my_memdup(const byte *from,uint length,myf MyFlags);
 extern char *my_strdup(const char *from,myf MyFlags);
-extern char *my_strndup(const byte *from, uint length,
+extern char *my_strndup(const char *from, uint length,
 				   myf MyFlags);
 /* we do use FG (as a no-op) in below so that a typo on FG is caught */
 #define my_free(PTR,FG) ((void)FG,my_no_flags_free(PTR))
@@ -587,7 +587,7 @@
 		       const char *sFile, uint uLine,myf MyFlag);
 extern my_string _my_strdup(const char *from, const char *sFile, uint uLine,
 			    myf MyFlag);
-extern char *_my_strndup(const byte *from, uint length,
+extern char *_my_strndup(const char *from, uint length,
 				    const char *sFile, uint uLine,
 				    myf MyFlag);
 

--- 1.25/mysys/safemalloc.c	2006-07-07 15:59:24 +02:00
+++ 1.26/mysys/safemalloc.c	2006-07-07 15:59:24 +02:00
@@ -525,7 +525,7 @@
 } /* _my_strdup */
 
 
-char *_my_strndup(const byte *from, uint length,
+char *_my_strndup(const char *from, uint length,
 			     const char *filename, uint lineno,
 			     myf MyFlags)
 {
Thread
bk commit into 5.1 tree (mats:1.2236)Mats Kindahl7 Jul