diff options
| author | unknown <hf@deer.(none)> | 2005-01-03 19:21:54 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2005-01-03 19:21:54 +0400 |
| commit | d3be3cbcfdf74f4131e16b201c7eb5dfde0a8257 (patch) | |
| tree | 96a377282ba249c3076ed502ea0325733639fff9 /client | |
| parent | a77d4ce2725a0d8e2310b3d7e1c3aed7908ea143 (diff) | |
| download | mariadb-git-d3be3cbcfdf74f4131e16b201c7eb5dfde0a8257.tar.gz | |
fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file)
client/mysql.cc:
bug #5920 (embedded-server mysql doesn't handle --defaults-file)
defaults files handled
include/my_sys.h:
bug #5920 (embedded-server mysql doesn't handle --defaults-file)
get_defaults_file interface added
libmysqld/libmysqld.c:
just small fix, not related to the bug.
mysys/default.c:
bug #5920 (embedded-server mysql doesn't handle --defaults-file)
get_defaults_files implementation
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 0ea0f10f5d7..5739d3203e7 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -330,6 +330,16 @@ static sig_handler mysql_end(int sig); int main(int argc,char *argv[]) { char buff[80]; + char *defaults, *extra_defaults; + char *emb_argv[3]; + int emb_argc= 1; + + emb_argv[0]= argv[0]; + get_defaults_files(argc, argv, &defaults, &extra_defaults); + if (defaults) + emb_argv[emb_argc++]= defaults; + if (extra_defaults) + emb_argv[emb_argc++]= extra_defaults; MY_INIT(argv[0]); DBUG_ENTER("main"); @@ -375,7 +385,7 @@ int main(int argc,char *argv[]) my_end(0); exit(1); } - if (mysql_server_init(0, NULL, (char**) server_default_groups)) + if (mysql_server_init(emb_argc, emb_argv, (char**) server_default_groups)) { free_defaults(defaults_argv); my_end(0); |