diff options
author | hf@deer.(none) <> | 2003-05-31 15:15:46 +0500 |
---|---|---|
committer | hf@deer.(none) <> | 2003-05-31 15:15:46 +0500 |
commit | 02d3d7e8bd0b5a582befe8d02d41c9cca1bcfe8e (patch) | |
tree | 4dd324e7d5c4509bfa76cfb1ebecf8f75b9cc6f5 /mysys/default.c | |
parent | 6bc3473f8883783f4613d25af99f89f06b12c600 (diff) | |
download | mariadb-git-02d3d7e8bd0b5a582befe8d02d41c9cca1bcfe8e.tar.gz |
SCRUM:
Here is another pack of changes about gathering common client code in
sql-common/client.c.
Now i symlink the client.c from sql/ and libmysql/. These directories
have client_settings.h files to be included to client.c. It contains
defines and declarations to compile client.c in appropriate manner.
Also i've added include/sql_common.h, containing declarations of what
is exported from client.c
I removed as many #ifdef-s from client.c as i dared to. I think it's better
push it with some extra #ifdef-s now (of course, if everythihg besides it is
ok) so other people can check the code.
Diffstat (limited to 'mysys/default.c')
-rw-r--r-- | mysys/default.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/default.c b/mysys/default.c index 17ee1b8c8da..7b02999160e 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -174,7 +174,7 @@ void load_defaults(const char *conf_file, const char **groups, res= (char**) (ptr+sizeof(alloc)); /* copy name + found arguments + command line arguments to new array */ - res[0]=*argc ? argv[0][0] : ""; + res[0]=*argc ? argv[0][0] : (char *)""; memcpy((gptr) (res+1), args.buffer, args.elements*sizeof(char*)); /* Skipp --defaults-file and --defaults-extra-file */ |