From d1aba4edc03bb258e7667f575823b043e16bc5fb Mon Sep 17 00:00:00 2001 From: Mattias Jonsson Date: Thu, 10 Feb 2011 11:50:53 +0100 Subject: [PATCH] bug#59085 recommit --- sql/sql_load.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sql/sql_load.cc b/sql/sql_load.cc index e5e539b766a..a2d443fbbc8 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -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 (!thd->slave_thread && - !((stat_info.st_mode & S_IROTH) == S_IROTH && // readable by others - (stat_info.st_mode & S_IFLNK) != S_IFLNK && // and not a symlink - ((stat_info.st_mode & S_IFREG) == S_IFREG || - (stat_info.st_mode & S_IFIFO) == S_IFIFO))) + !((stat_info.st_mode & S_IFLNK) != S_IFLNK && // symlink + ((stat_info.st_mode & S_IFREG) == S_IFREG || // regular file + (stat_info.st_mode & S_IFIFO) == S_IFIFO))) // named pipe { my_error(ER_TEXTFILE_NOT_READABLE, MYF(0), name); DBUG_RETURN(TRUE);