diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | mysys/default.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index b850584df5b..86ee9bcad4f 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -144,6 +144,7 @@ pem@per-erik-martins-dator.local peter@linux.local peter@mysql.com peterg@mysql.com +petr@mysql.com pgulutzan@linux.local pmartin@build.mysql2.com psergey@psergey-rh8.(none) 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)++; } } |