bzr commit into mysql-6.0-rpl branch (zhenxing.he:2848)

[He Zhenxing]

#At file:///media/sdb2/hezx/work/mysql/bzrwork/b38468/6.0-rpl/ based on revid:zhenxing.he@stripped

 2848 He Zhenxing	2009-04-21
      Post fix of compiler warnings after push

    M  mysys/default.c
=== modified file 'mysys/default.c'
--- a/mysys/default.c	2009-04-21 09:27:46 +0000
+++ b/mysys/default.c	2009-04-21 13:16:54 +0000
@@ -478,7 +478,7 @@ int my_load_defaults(const char *conf_fi
     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_fi
 
   /* 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),


Attachment: [text/bzr-bundle] bzr/[e-mail]