diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-02-10 11:50:53 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-02-10 11:50:53 +0100 |
| commit | d1aba4edc03bb258e7667f575823b043e16bc5fb (patch) | |
| tree | f9039650ba6aebf31901ad614d66e2f2e044282a /sql/sql_load.cc | |
| parent | 91a2afcbcba8af28d2f10f80830b543654151556 (diff) | |
| download | mariadb-git-d1aba4edc03bb258e7667f575823b043e16bc5fb.tar.gz | |
bug#59085 recommit
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 7 |
1 files 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); |