Commit 5b067823 authored by unknown's avatar unknown
Browse files

--defaults-extra-file bug fixed


mysys/default.c:
  silly mistake happened during the merge
parent dd3cfa8d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static int search_files(const char *conf_file, int *argc, char ***argv,
  if (defaults_extra_file)
    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)
  {