Merge pchardin@10.100.1.170:/home/bk/mysql-5.0

into mysql.com:/home/cps/mysql/trees/mysql-5.0

Merge pchardin@10.100.1.170:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
25f44eab · petr@mysql.com · c78b2d25 · 560a9083 · 25f44eab
Commit 25f44eab authored May 04, 2005 by petr@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

mysys/default.c mysys/default.c +2 -1

No files found.
--- 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)
  {