diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-10-02 16:40:06 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-10-02 16:40:06 +0800 |
| commit | 4381f7ed90f54be0be0c569e38d17aefe98b7d0b (patch) | |
| tree | 9faad92f9f32392fd8020b3e2acdbaac7057e1b6 /mysys | |
| parent | 228ae2bf50c776e94decc731decefe6eaae0118f (diff) | |
| download | mariadb-git-4381f7ed90f54be0be0c569e38d17aefe98b7d0b.tar.gz | |
Backport post fix compiler warnings and test failures for BUG#25192 BUG#12190
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/default.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/default.c b/mysys/default.c index c610b57c6d1..6468cf2b35d 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -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), |