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

bug#59085 recommit

Browse Source
This commit is contained in:
Mattias Jonsson 2011-02-10 11:50:53 +01:00
parent 91a2afcbcb
commit d1aba4edc0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_load.cc
View File

@ -402,10 +402,9 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
// if we are not in slave thread, the file must be: // if we are not in slave thread, the file must be:
if (!thd->slave_thread && if (!thd->slave_thread &&
!((stat_info.st_mode & S_IROTH) == S_IROTH && // readable by others !((stat_info.st_mode & S_IFLNK) != S_IFLNK && // symlink
(stat_info.st_mode & S_IFLNK) != S_IFLNK && // and not a symlink ((stat_info.st_mode & S_IFREG) == S_IFREG || // regular file
((stat_info.st_mode & S_IFREG) == S_IFREG || (stat_info.st_mode & S_IFIFO) == S_IFIFO))) // named pipe
(stat_info.st_mode & S_IFIFO) == S_IFIFO)))
{ {
my_error(ER_TEXTFILE_NOT_READABLE, MYF(0), name); my_error(ER_TEXTFILE_NOT_READABLE, MYF(0), name);
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);