diff options
| author | unknown <tnurnberg@mysql.com> | 2006-05-12 10:27:20 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@mysql.com> | 2006-05-12 10:27:20 +0200 |
| commit | 98912fb95c8cc84344063fcd9bdded8c9d86e582 (patch) | |
| tree | 8dab981ba0cfeef2555a11afd8d5ef84ea2b7515 /sql | |
| parent | 5c6d923f3095f5eca3abaa5277350bec90e4970c (diff) | |
| parent | ec83dd7c61f4e29122ecff278ca81b03bd51b271 (diff) | |
| download | mariadb-git-98912fb95c8cc84344063fcd9bdded8c9d86e582.tar.gz | |
Merge mysql.com:/home/mysql-4.1-10418
into mysql.com:/home/mysql-5.0-10418
mysql-test/t/outfile.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
mysql-test/r/func_str.result:
expect NULL rather than error if file given to load_file() doesn't exist
mysql-test/r/outfile.result:
expect NULL rather than error if file given to load_file() doesn't exist
mysql-test/t/func_str.test:
show that load_file() will return NULL rather than throw an error
if file doesn't exist
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
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)) |