diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2004-11-12 20:38:58 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2004-11-12 20:38:58 +0200 |
| commit | 75a4c71b67508c7b1390477a4a3a4a4aba120bbb (patch) | |
| tree | d351998dbbb6448d1c9c837ff4fa33e2687cce1c /mysys | |
| parent | 20d88eb76f4e5fea1acdb68b6d2ad86b59ba61f9 (diff) | |
| parent | c7b66f9ddefb95050c21a9938578a0f56d9dd0d0 (diff) | |
| download | mariadb-git-75a4c71b67508c7b1390477a4a3a4a4aba120bbb.tar.gz | |
Merge with 4.0
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/default.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mysys/default.c b/mysys/default.c index efeb1c2ce19..ea23bbb6693 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -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 { |