diff options
author | unknown <petr@mysql.com> | 2004-09-11 00:48:13 +0400 |
---|---|---|
committer | unknown <petr@mysql.com> | 2004-09-11 00:48:13 +0400 |
commit | f4c303b8a799577fb9e06f520da777c36ec30116 (patch) | |
tree | 5da592e7e05385ddcf63d581726c8f50d7a9fa7c /mysys | |
parent | 952a778d23e8adaeaa29aa75e2cf30545cf0c959 (diff) | |
parent | 15526e4ed7f7f38c83382f6402b37a413e691620 (diff) | |
download | mariadb-git-f4c303b8a799577fb9e06f520da777c36ec30116.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/devel/im/default_patch/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/default.c | 6 |
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)++; } } |