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

1 files changed, 2 insertions, 4 deletions

diff --git a/mysys/default.c b/mysys/default.c
index a8343c6a21d..198a6402b8b 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -119,8 +119,6 @@ static int search_files(const char *conf_file, int *argc, char ***argv,
   int error= 0;
   DBUG_ENTER("search_files");
 
-  args_used= 0;
-
   /* Check if we want to force the use a specific default file */
   forced_default_file= 0;
   if (*argc >= 2)
@@ -128,12 +126,12 @@ static int search_files(const char *conf_file, int *argc, char ***argv,
     if (is_prefix(argv[0][1],"--defaults-file="))
     {
       forced_default_file= strchr(argv[0][1],'=') + 1;
-      *args_used++;
+      (*args_used)++;
     }
     else if (is_prefix(argv[0][1],"--defaults-extra-file="))
     {
       defaults_extra_file= strchr(argv[0][1],'=') + 1;
-      *args_used++;
+      (*args_used)++;
     }
   }