Skip to content

M
mariadb
Commit 5b067823 authored by unknown's avatar unknown
Browse files
Options

--defaults-extra-file bug fixed 


mysys/default.c:
  silly mistake happened during the merge
parent dd3cfa8d
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
mysys/default.c
View file @ 5b067823
...@@ -119,7 +119,7 @@ static int search_files(const char *conf_file, int *argc, char ***argv, ...@@ -119,7 +119,7 @@ static int search_files(const char *conf_file, int *argc, char ***argv,
if (defaults_extra_file) if (defaults_extra_file)
defaults_extra_file= strchr(defaults_extra_file,'=')+1; defaults_extra_file= strchr(defaults_extra_file,'=')+1;
args_used+= (forced_default_file ? 1 : 0) + (defaults_extra_file ? 1 : 0); (*args_used)+= (forced_default_file ? 1 : 0) + (defaults_extra_file ? 1 : 0);
if (forced_default_file) if (forced_default_file)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7