database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge with 4.0

Browse Source
This commit is contained in:
jani@ua141d10.elisa.omakaista.fi
2004-11-12 20:38:58 +02:00
parent 4ffbe56644 76b8c8747d
commit fe0b00985f
4 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysys/default.c
View File

@@ -120,7 +120,7 @@ int load_defaults(const char *conf_file, const char **groups,
uint args_used=0;
int error= 0;
MEM_ROOT alloc;
char *ptr, **res, **ext;
char *ptr, **res;
DBUG_ENTER("load_defaults");
@@ -182,10 +182,9 @@ int load_defaults(const char *conf_file, const char **groups,
}
else if (dirname_length(conf_file))
{
for (ext= (char**) f_extensions; *ext; *ext++)
if ((error= search_default_file(&args, &alloc, NullS, conf_file,
&group)) < 0)
goto err;
if ((error= search_default_file(&args, &alloc, NullS, conf_file,
&group)) < 0)
goto err;
}
else
{