diff options
| author | monty@nosik.monty.fi <> | 2006-11-22 14:11:36 +0200 |
|---|---|---|
| committer | monty@nosik.monty.fi <> | 2006-11-22 14:11:36 +0200 |
| commit | 89570bf966570ecce761e1fea2bb5d10db91f621 (patch) | |
| tree | bd11d4efaf1d6469e7f29237347f12cdf71e605a /mysys/default.c | |
| parent | 38a92caeb77c6b22eeac985530cfbfdc890c792d (diff) | |
| parent | 306b871d522b1fa744abf78acaafab2379a98401 (diff) | |
| download | mariadb-git-89570bf966570ecce761e1fea2bb5d10db91f621.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'mysys/default.c')
| -rw-r--r-- | mysys/default.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/default.c b/mysys/default.c index 863ebc37dbc..b3c6b8ed72a 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -488,7 +488,7 @@ static int search_default_file(Process_option_func opt_handler, my_bool have_ext= fn_ext(config_file)[0] != 0; const char **exts_to_use= have_ext ? empty_list : f_extensions; - for (ext= (char**) exts_to_use; *ext; *ext++) + for (ext= (char**) exts_to_use; *ext; ext++) { int error; if ((error= search_default_file_with_ext(opt_handler, handler_ctx, @@ -676,7 +676,7 @@ static int search_default_file_with_ext(Process_option_func opt_handler, ext= fn_ext(search_file->name); /* check extension */ - for (tmp_ext= (char**) f_extensions; *tmp_ext; *tmp_ext++) + for (tmp_ext= (char**) f_extensions; *tmp_ext; tmp_ext++) { if (!strcmp(ext, *tmp_ext)) break; @@ -869,7 +869,7 @@ void my_print_default_files(const char *conf_file) { for (dirs=default_directories ; *dirs; dirs++) { - for (ext= (char**) exts_to_use; *ext; *ext++) + for (ext= (char**) exts_to_use; *ext; ext++) { const char *pos; char *end; |