diff options
| author | unknown <jani@rhols221.adsl.netsonic.fi> | 2003-08-28 21:27:25 +0300 |
|---|---|---|
| committer | unknown <jani@rhols221.adsl.netsonic.fi> | 2003-08-28 21:27:25 +0300 |
| commit | 62c85c8951e0ca9a0e8bb25837bb6bc0922db9d7 (patch) | |
| tree | d111f0ed50b7649312d6bf90ff6d096b4c5e4a3d | |
| parent | b6d2a6ee0925f4f4e153ca3e0156c9716760f9a1 (diff) | |
| download | mariadb-git-62c85c8951e0ca9a0e8bb25837bb6bc0922db9d7.tar.gz | |
Removed restriction not to be able use non regular files.
| -rw-r--r-- | extra/my_print_defaults.c | 1 | ||||
| -rw-r--r-- | mysys/default.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c index 41c26e73dff..07d6c0ca555 100644 --- a/extra/my_print_defaults.c +++ b/extra/my_print_defaults.c @@ -143,6 +143,7 @@ int main(int argc, char **argv) if (error == 1) fprintf(stderr, "WARNING: Defaults file '%s' not found!\n", config_file); + /* This error is not available now. For the future */ if (error == 2) fprintf(stderr, "WARNING: Defaults file '%s' is not a regular file!\n", config_file); diff --git a/mysys/default.c b/mysys/default.c index 2fadda6a2fe..d938bc4435f 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -320,8 +320,6 @@ static int search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, name); return 0; } - else if ((stat_info.st_mode & S_IFMT) != S_IFREG) - return 2; } #endif if (!(fp = my_fopen(fn_format(name,name,"","",4),O_RDONLY,MYF(0)))) |