diff options
| author | unknown <petr@mysql.com> | 2005-05-04 18:46:29 +0400 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2005-05-04 18:46:29 +0400 |
| commit | 655b068f3f23bb924165a133892809221611d222 (patch) | |
| tree | 45ed95329a189340b81e419463c4775d02b1665a /mysys/default.c | |
| parent | 0ba34998b38f16709b80fa58ba99a187a8ae7511 (diff) | |
| download | mariadb-git-655b068f3f23bb924165a133892809221611d222.tar.gz | |
fix --defaults-file and --defaults-extra-file broken by a wrong merge
Diffstat (limited to 'mysys/default.c')
| -rw-r--r-- | mysys/default.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/default.c b/mysys/default.c index a4ab6eb1939..e3a0b8a20ad 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -121,7 +121,8 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv, if (forced_extra_defaults) defaults_extra_file= strchr(forced_extra_defaults,'=')+1; - args_used+= (forced_default_file ? 1 : 0) + (forced_extra_defaults ? 1 : 0); + (*args_used)+= (forced_default_file ? 1 : 0) + + (forced_extra_defaults ? 1 : 0); if (forced_default_file) { |