diff options
author | petr@mysql.com <> | 2004-09-11 00:48:13 +0400 |
---|---|---|
committer | petr@mysql.com <> | 2004-09-11 00:48:13 +0400 |
commit | 974a13d0e2d16619a44f7d79b62127075d11837c (patch) | |
tree | 5da592e7e05385ddcf63d581726c8f50d7a9fa7c /mysys | |
parent | 37aae429e8cc9bcf2a393585947ea012fe63796f (diff) | |
parent | 998873c996dac01ca2e1d16b147fa1d1495ffab2 (diff) | |
download | mariadb-git-974a13d0e2d16619a44f7d79b62127075d11837c.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
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)++; } } |