diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-02 18:50:14 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-02 18:50:14 +0300 |
| commit | 988b25cee10ba94e3137a1d636517577523ce4cb (patch) | |
| tree | 5c1a2630e01dc79cf5496ed561d050026dae416b /sql/sql_load.cc | |
| parent | e22de3a3f28416acf35f55c058c17504d2e6f3ab (diff) | |
| parent | 0eda48463ce9c60408515819f9d954fd48567d4f (diff) | |
| download | mariadb-git-988b25cee10ba94e3137a1d636517577523ce4cb.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sql_yacc.yy
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 8792969dfd5..b444e3db1f3 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -338,6 +338,7 @@ int 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(__NETWARE__) MY_STAT stat_info; if (!my_stat(name,&stat_info,MYF(MY_WME))) |