mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Backport post fix compiler warnings and test failures for BUG#25192 BUG#12190

Browse source
This commit is contained in:
He Zhenxing 2009-10-02 16:40:06 +08:00
commit 4381f7ed90
4 changed files with 34 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mysys/default.c
View file

@ -478,7 +478,7 @@ int my_load_defaults(const char *conf_file, const char **groups,
res= (char**) (ptr+sizeof(alloc));
res[0]= **argv; /* Copy program name */
/* set arguments separator */
res[1]= args_separator;
res[1]= (char *)args_separator;
for (i=2 ; i < (uint) *argc ; i++)
res[i]=argv[0][i];
res[i]=0; /* End pointer */
@ -534,7 +534,7 @@ int my_load_defaults(const char *conf_file, const char **groups,
/* set arguments separator for arguments from config file and
command line */
res[args.elements+1]= args_separator;
res[args.elements+1]= (char *)args_separator;
if (*argc)
memcpy((uchar*) (res+1+args.elements+1), (char*) ((*argv)+1),