summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2003-11-03 22:48:03 +0200
committermonty@narttu.mysql.fi <>2003-11-03 22:48:03 +0200
commit6b79cd5c23c33d36c6dba2c990b20af8a88f97c1 (patch)
tree68c6948d4fbd18bb59fa1aeafdce4a07a41b835f /mysys
parentdde384d9ea881353f04ee9827421c23ded4e8c29 (diff)
parent085b1c56084d99646f2e52aee42ef026b7526eeb (diff)
downloadmariadb-git-6b79cd5c23c33d36c6dba2c990b20af8a88f97c1.tar.gz
Merge
Diffstat (limited to 'mysys')
-rw-r--r--mysys/default.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/default.c b/mysys/default.c
index 15eb358df22..b1d9e40a1c2 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (C) 2000-2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -214,6 +214,7 @@ int 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]= argv[0][0]; /* Name MUST be set, even by embedded library */
memcpy((gptr) (res+1), args.buffer, args.elements*sizeof(char*));
/* Skipp --defaults-file and --defaults-extra-file */
(*argc)-= args_used;