summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
diff options
context:
space:
mode:
authortnurnberg@mysql.com <>2006-05-12 10:27:20 +0200
committertnurnberg@mysql.com <>2006-05-12 10:27:20 +0200
commitab69fac55d63425658510a6636605aff8df37640 (patch)
tree8dab981ba0cfeef2555a11afd8d5ef84ea2b7515 /sql/item_strfunc.cc
parentd1417ad55a1b1b53abdde1034ba3fd52599c8244 (diff)
parent133a5d17f790f5f4c930fa892e6cb5a00fcbe346 (diff)
downloadmariadb-git-ab69fac55d63425658510a6636605aff8df37640.tar.gz
Merge mysql.com:/home/mysql-4.1-10418
into mysql.com:/home/mysql-5.0-10418
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index a1743aa1181..ce9897afeed 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2579,7 +2579,7 @@ String *Item_load_file::val_str(String *str)
(void) fn_format(path, file_name->c_ptr(), mysql_real_data_home, "",
MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
- if (!my_stat(path, &stat_info, MYF(MY_WME)))
+ if (!my_stat(path, &stat_info, MYF(0)))
goto err;
if (!(stat_info.st_mode & S_IROTH))