diff options
| author | hery.ramilison@oracle.com <> | 2011-07-06 01:13:50 +0200 |
|---|---|---|
| committer | MySQL Release Engineering <mysql-re_ww@oracle.com> | 2011-07-06 01:13:50 +0200 |
| commit | c74d844de30136c570c3bca089d1f2949d00603c (patch) | |
| tree | 31e14059cf5a1e5e8c1601a2488b98c4af1bfeb0 /sql/sql_load.cc | |
| parent | 3b69f27e59909e67fed27c4d728b96483188a663 (diff) | |
| parent | 1c810152963f770fae011b29ae30fbafbc516b23 (diff) | |
| download | mariadb-git-c74d844de30136c570c3bca089d1f2949d00603c.tar.gz | |
Merge from mysql-5.5.14-release
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index d133ed33072..1261568f212 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -398,8 +398,8 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, #if !defined(__WIN__) && ! defined(__NETWARE__) MY_STAT stat_info; - if (!my_stat(name,&stat_info,MYF(MY_WME))) - DBUG_RETURN(TRUE); + if (!my_stat(name, &stat_info, MYF(MY_WME))) + DBUG_RETURN(TRUE); // if we are not in slave thread, the file must be: if (!thd->slave_thread && @@ -407,11 +407,11 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, ((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); + my_error(ER_TEXTFILE_NOT_READABLE, MYF(0), name); + DBUG_RETURN(TRUE); } if ((stat_info.st_mode & S_IFIFO) == S_IFIFO) - is_fifo = 1; + is_fifo= 1; #endif if ((file= mysql_file_open(key_file_load, name, O_RDONLY, MYF(MY_WME))) < 0) |