mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-21 07:45:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
into mysql.com:/home/cps/mysql/trees/mysql-5.0
This commit is contained in:
unknown 2005-05-04 19:35:33 +04:00
commit a001bb2b9d
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mysys/default.c
View file

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