summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-11-28 04:47:47 +0200
committermonty@donna.mysql.com <>2000-11-28 04:47:47 +0200
commit74e7ffe9872e74f3ac1ae4e93a2ef1b0d2c97c03 (patch)
treee3d40dd7c6a7e86bd2388da19d59d5a372bf7bb8 /sql/sql_load.cc
parentad2e43c7d6f4b7bbe5b92830ef11856c7d18b6b5 (diff)
downloadmariadb-git-74e7ffe9872e74f3ac1ae4e93a2ef1b0d2c97c03.tar.gz
New thr_alarm struct for better integration with OS2
Run bootstrap in separate thread Fix bug in FLUSH TABLES table_name
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index de6d006a80e..1cb042537fc 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -163,7 +163,9 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
// the file must be:
if (!((stat_info.st_mode & S_IROTH) == S_IROTH && // readable by others
+#ifndef __EMX__
(stat_info.st_mode & S_IFLNK) != S_IFLNK && // and not a symlink
+#endif
((stat_info.st_mode & S_IFREG) == S_IFREG ||
(stat_info.st_mode & S_IFIFO) == S_IFIFO)))
{