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

into mysql.com:/home/my/mysql-5.0
This commit is contained in:
monty@mysql.com 2005-01-12 18:08:41 +02:00
commit a1321dff7e

View file

@ -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)
{ {