database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-19015: mysql_plugin doesn't read all server option groups

Browse Source 
Closes #1262
This commit is contained in:
Anel Husakovic
2019-04-12 01:21:11 -07:00
committed by Sergei Golubchik
parent 9ca3571cb8
commit bed1ede197
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/mysql_plugin.c
View File

@@ -321,7 +321,7 @@ static int get_default_values()
int ret= 0; int ret= 0;
FILE *file= 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))) if ((error= find_tool("my_print_defaults" FN_EXEEXT, tool_path)))
goto exit; goto exit;
else else
@@ -334,9 +334,9 @@ static int get_default_values()
char *format_str= 0; char *format_str= 0;
if (has_spaces(tool_path) || has_spaces(defaults_file)) if (has_spaces(tool_path) || has_spaces(defaults_file))
format_str = "\"%s mysqld > %s\""; format_str = "\"%s --mysqld > %s\"";
else else
format_str = "%s mysqld > %s"; format_str = "%s --mysqld > %s";
snprintf(defaults_cmd, sizeof(defaults_cmd), format_str, snprintf(defaults_cmd, sizeof(defaults_cmd), format_str,
add_quotes(tool_path), add_quotes(defaults_file)); add_quotes(tool_path), add_quotes(defaults_file));
@@ -347,7 +347,7 @@ static int get_default_values()
} }
#else #else
snprintf(defaults_cmd, sizeof(defaults_cmd), snprintf(defaults_cmd, sizeof(defaults_cmd),
"%s mysqld > %s", tool_path, defaults_file); "%s --mysqld > %s", tool_path, defaults_file);
#endif #endif
/* Execute the command */ /* Execute the command */