mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-22 08:15:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

Browse source 
into  siva.hindu.god:/usr/home/tim/m/bk/merge-51
(which is mysql-5.1-new-maint team tree)


include/my_base.h:
  Auto merged
mysql-test/extra/rpl_tests/rpl_loaddata.test:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/lib/mtr_report.pl:
  merge of mysql-5.1 -> mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
  merge of mysql-5.1 -> mysql-5.1-new-maint
This commit is contained in:
unknown 2006-07-15 00:33:24 -06:00
commit 690101ad88
128 changed files with 5572 additions and 2136 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mysys/my_handler.c
View file

@ -15,6 +15,7 @@
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
MA 02111-1307, USA */
#include <my_global.h>
#include "my_handler.h"
int mi_compare_text(CHARSET_INFO *charset_info, uchar *a, uint a_length,

5
mysys/safemalloc.c
View file

@ -525,8 +525,9 @@ char *_my_strdup(const char *from, const char *filename, uint lineno,
} /* _my_strdup */
char *_my_strndup(const char *from, uint length, const char *filename,
uint lineno, myf MyFlags)
char *_my_strndup(const char *from, uint length,
const char *filename, uint lineno,
myf MyFlags)
{
gptr ptr;
if ((ptr=_mymalloc(length+1,filename,lineno,MyFlags)) != 0)