diff options
| author | brian@zim.(none) <> | 2006-04-15 18:17:32 -0700 |
|---|---|---|
| committer | brian@zim.(none) <> | 2006-04-15 18:17:32 -0700 |
| commit | 5d1d27c0165c151fd73163fa7d9bce353d6f9687 (patch) | |
| tree | 4deb7a54227f30d8a5d4b647405eb100c0f8ab28 /sql/sql_load.cc | |
| parent | 53dce52086e38375f73bde3c5936ba381dc0c435 (diff) | |
| download | mariadb-git-5d1d27c0165c151fd73163fa7d9bce353d6f9687.tar.gz | |
Final patch to remove the last of the OS2 support.
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 599480e616c..bf8a6b8cfbe 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -294,7 +294,7 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, { (void) fn_format(name, ex->file_name, mysql_real_data_home, "", MY_RELATIVE_PATH | MY_UNPACK_FILENAME); -#if !defined(__WIN__) && !defined(OS2) && ! defined(__NETWARE__) +#if !defined(__WIN__) && ! defined(__NETWARE__) MY_STAT stat_info; if (!my_stat(name,&stat_info,MYF(MY_WME))) DBUG_RETURN(TRUE); @@ -302,9 +302,7 @@ bool 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 -#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))) { |