Commit a1321dff authored by monty@mysql.com's avatar monty@mysql.com

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/my/mysql-5.0
parents 073a8881 dba173c4
...@@ -119,7 +119,7 @@ static int search_files(const char *conf_file, int *argc, char ***argv, ...@@ -119,7 +119,7 @@ static int search_files(const char *conf_file, int *argc, char ***argv,
if (defaults_extra_file) if (defaults_extra_file)
defaults_extra_file= strchr(defaults_extra_file,'=')+1; 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) if (forced_default_file)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment