diff options
author | unknown <hf@deer.(none)> | 2005-01-12 20:05:32 +0400 |
---|---|---|
committer | unknown <hf@deer.(none)> | 2005-01-12 20:05:32 +0400 |
commit | c153522d354f69206861e9ce4abe5bcc7016f541 (patch) | |
tree | 7a2edebdfbc5a8cb708c4477b0f77357fc0ca68c /mysys | |
parent | 332b0609d9de4cfd24d59d2ac4107f0d86400e02 (diff) | |
parent | 5b0678232fcb576d7e7aa8f53fcfeec757507d42 (diff) | |
download | mariadb-git-c153522d354f69206861e9ce4abe5bcc7016f541.tar.gz |
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/default.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/default.c b/mysys/default.c index 0b3f830d476..73dca3b6c2f 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -119,7 +119,7 @@ static int search_files(const char *conf_file, int *argc, char ***argv, if (defaults_extra_file) defaults_extra_file= strchr(defaults_extra_file,'=')+1; - args_used+= (forced_default_file ? 1 : 0) + (defaults_extra_file ? 1 : 0); + (*args_used)+= (forced_default_file ? 1 : 0) + (defaults_extra_file ? 1 : 0); if (forced_default_file) { |