Commit 15526e4e authored by unknown's avatar unknown

Fixed a problem causing load_defaults not to accept some command-line

options.


mysys/default.c:
  Fixed search_files function to return the number of used arguments
  properly.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parent fcbd2485
No related merge requests found
...@@ -144,6 +144,7 @@ pem@per-erik-martins-dator.local ...@@ -144,6 +144,7 @@ pem@per-erik-martins-dator.local
peter@linux.local peter@linux.local
peter@mysql.com peter@mysql.com
peterg@mysql.com peterg@mysql.com
petr@mysql.com
pgulutzan@linux.local pgulutzan@linux.local
pmartin@build.mysql2.com pmartin@build.mysql2.com
psergey@psergey-rh8.(none) psergey@psergey-rh8.(none)
......
...@@ -119,8 +119,6 @@ static int search_files(const char *conf_file, int *argc, char ***argv, ...@@ -119,8 +119,6 @@ static int search_files(const char *conf_file, int *argc, char ***argv,
int error= 0; int error= 0;
DBUG_ENTER("search_files"); DBUG_ENTER("search_files");
args_used= 0;
/* Check if we want to force the use a specific default file */ /* Check if we want to force the use a specific default file */
forced_default_file= 0; forced_default_file= 0;
if (*argc >= 2) if (*argc >= 2)
...@@ -128,12 +126,12 @@ static int search_files(const char *conf_file, int *argc, char ***argv, ...@@ -128,12 +126,12 @@ static int search_files(const char *conf_file, int *argc, char ***argv,
if (is_prefix(argv[0][1],"--defaults-file=")) if (is_prefix(argv[0][1],"--defaults-file="))
{ {
forced_default_file= strchr(argv[0][1],'=') + 1; forced_default_file= strchr(argv[0][1],'=') + 1;
*args_used++; (*args_used)++;
} }
else if (is_prefix(argv[0][1],"--defaults-extra-file=")) else if (is_prefix(argv[0][1],"--defaults-extra-file="))
{ {
defaults_extra_file= strchr(argv[0][1],'=') + 1; defaults_extra_file= strchr(argv[0][1],'=') + 1;
*args_used++; (*args_used)++;
} }
} }
......
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