diff options
| author | Anel Husakovic <anel@mariadb.org> | 2019-04-12 01:21:11 -0700 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-04-24 16:06:54 +0200 |
| commit | bed1ede197cecca633023bf19248533fae085130 (patch) | |
| tree | 39abd7ca743fd4f47079adfbf0006fea1200acc9 /client | |
| parent | 9ca3571cb881f271ffc3fd97480052e858f21f61 (diff) | |
| download | mariadb-git-bed1ede197cecca633023bf19248533fae085130.tar.gz | |
MDEV-19015: mysql_plugin doesn't read all server option groups
Closes #1262
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql_plugin.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/mysql_plugin.c b/client/mysql_plugin.c index 76108c7a287..c353fb039d6 100644 --- a/client/mysql_plugin.c +++ b/client/mysql_plugin.c @@ -321,7 +321,7 @@ static int get_default_values() int ret= 0; FILE *file= 0; - bzero(tool_path, FN_REFLEN); + memset(tool_path, 0, FN_REFLEN); if ((error= find_tool("my_print_defaults" FN_EXEEXT, tool_path))) goto exit; else @@ -334,9 +334,9 @@ static int get_default_values() char *format_str= 0; if (has_spaces(tool_path) || has_spaces(defaults_file)) - format_str = "\"%s mysqld > %s\""; + format_str = "\"%s --mysqld > %s\""; else - format_str = "%s mysqld > %s"; + format_str = "%s --mysqld > %s"; snprintf(defaults_cmd, sizeof(defaults_cmd), format_str, add_quotes(tool_path), add_quotes(defaults_file)); @@ -347,7 +347,7 @@ static int get_default_values() } #else snprintf(defaults_cmd, sizeof(defaults_cmd), - "%s mysqld > %s", tool_path, defaults_file); + "%s --mysqld > %s", tool_path, defaults_file); #endif /* Execute the command */ |