1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix handling of the -e flag to my_print_defaults. (Bug #9136)

Browse Source 
mysys/default.c:
  Don't automatically reset defaults_extra_file in load_defaults(),
  only update it based on it appearing as a command-line option.
This commit is contained in:
unknown 2005-03-15 15:54:57 -08:00
parent e656fba778
commit 61b1f2ce95
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mysys/default.c
View File

@ -144,7 +144,7 @@ int load_defaults(const char *conf_file, const char **groups,
int *argc, char ***argv) int *argc, char ***argv)
{ {
DYNAMIC_ARRAY args; DYNAMIC_ARRAY args;
const char **dirs, *forced_default_file; const char **dirs, *forced_default_file, *forced_extra_defaults;
TYPELIB group; TYPELIB group;
my_bool found_print_defaults=0; my_bool found_print_defaults=0;
uint args_used=0; uint args_used=0;
@ -174,13 +174,14 @@ int load_defaults(const char *conf_file, const char **groups,
} }
get_defaults_files(*argc, *argv, get_defaults_files(*argc, *argv,
(char **)&forced_default_file, &defaults_extra_file); (char **)&forced_default_file,
(char **)&forced_extra_defaults);
if (forced_default_file) if (forced_default_file)
forced_default_file= strchr(forced_default_file,'=')+1; forced_default_file= strchr(forced_default_file,'=')+1;
if (defaults_extra_file) if (forced_extra_defaults)
defaults_extra_file= strchr(defaults_extra_file,'=')+1; defaults_extra_file= strchr(forced_extra_defaults,'=')+1;
args_used+= (forced_default_file ? 1 : 0) + (defaults_extra_file ? 1 : 0); args_used+= (forced_default_file ? 1 : 0) + (forced_extra_defaults ? 1 : 0);
group.count=0; group.count=0;
group.name= "defaults"; group.name= "defaults";