Commit c153522d authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 

into deer.(none):/home/hf/work/mysql-5.0.clean
parents 332b0609 5b067823

mysys/default.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

  {