1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into mysql.com:/home/ram/work/5.0
This commit is contained in:
ramil@mysql.com 2005-05-07 20:25:58 +05:00
commit 3196a01039
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mysys/default.c
View File

@ -152,10 +152,15 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv,
} }
else if (defaults_extra_file) else if (defaults_extra_file)
{ {
if (search_default_file(func, func_ctx, NullS, if (search_default_file_with_ext(func, func_ctx, "", "",
defaults_extra_file) < 0) defaults_extra_file, 0) < 0)
goto err; /* Fatal error */ goto err; /* Fatal error */
if (error > 0)
{
fprintf(stderr, "Could not open required defaults file: %s\n",
defaults_extra_file);
goto err;
}
} }
} }
} }
@ -526,7 +531,7 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
} }
#endif #endif
if (!(fp= my_fopen(name, O_RDONLY, MYF(0)))) if (!(fp= my_fopen(name, O_RDONLY, MYF(0))))
return 0; /* Ignore wrong files */ return 1; /* Ignore wrong files */
while (fgets(buff, sizeof(buff) - 1, fp)) while (fgets(buff, sizeof(buff) - 1, fp))
{ {