mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 21:42:35 +01:00
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
This commit is contained in:
commit
a1321dff7e
1 changed files with 1 additions and 1 deletions
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue