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

Removed restriction not to be able use non regular files.

Browse Source
This commit is contained in:
unknown 2003-08-28 21:27:25 +03:00
parent b6d2a6ee09
commit 62c85c8951
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extra/my_print_defaults.c
View File

@ -143,6 +143,7 @@ int main(int argc, char **argv)
if (error == 1) if (error == 1)
fprintf(stderr, "WARNING: Defaults file '%s' not found!\n", fprintf(stderr, "WARNING: Defaults file '%s' not found!\n",
config_file); config_file);
/* This error is not available now. For the future */
if (error == 2) if (error == 2)
fprintf(stderr, "WARNING: Defaults file '%s' is not a regular file!\n", fprintf(stderr, "WARNING: Defaults file '%s' is not a regular file!\n",
config_file); config_file);

2
mysys/default.c
View File

@ -320,8 +320,6 @@ static int search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc,
name); name);
return 0; return 0;
} }
else if ((stat_info.st_mode & S_IFMT) != S_IFREG)
return 2;
} }
#endif #endif
if (!(fp = my_fopen(fn_format(name,name,"","",4),O_RDONLY,MYF(0)))) if (!(fp = my_fopen(fn_format(name,name,"","",4),O_RDONLY,MYF(0))))