diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-05-04 15:59:00 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-05-04 15:59:00 +0300 |
| commit | 2da8ba6404bbba119d5d90575411978ace0f6ee6 (patch) | |
| tree | 1170e5b99f80f2a8c4b298847f3e50bf72ab7092 /sql/sql_load.cc | |
| parent | 01b68c51052514681287dd63e8e713742c42cd0c (diff) | |
| parent | b96d97fd7f25ad7570688cf38b10b4b77a648871 (diff) | |
| download | mariadb-git-2da8ba6404bbba119d5d90575411978ace0f6ee6.tar.gz | |
merge mysql-5.1-security->mysql-5.5-security
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 a2d443fbbc8..0805a1b9f50 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -397,8 +397,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 && @@ -406,11 +406,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) |