diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2009-05-13 23:39:35 +0500 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2009-05-13 23:39:35 +0500 |
| commit | d0128f5ec0a487e0d658a8b00bc5e13601b71f5c (patch) | |
| tree | 139e9fc198e71809d84699543ac759d699c4d44c /sql/item_strfunc.cc | |
| parent | 272c17d1dfc80c7b55b9c2dd491b18bdbc7ab724 (diff) | |
| parent | 80fdebafa87d324d90c1229933a480a64fa8a513 (diff) | |
| download | mariadb-git-d0128f5ec0a487e0d658a8b00bc5e13601b71f5c.tar.gz | |
Auto-merge.
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 267036e4a3d..501b7e85080 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2943,7 +2943,7 @@ String *Item_load_file::val_str(String *str) ) goto err; - (void) fn_format(path, file_name->c_ptr(), mysql_real_data_home, "", + (void) fn_format(path, file_name->c_ptr_safe(), mysql_real_data_home, "", MY_RELATIVE_PATH | MY_UNPACK_FILENAME); /* Read only allowed from within dir specified by secure_file_priv */ @@ -2969,7 +2969,7 @@ String *Item_load_file::val_str(String *str) } if (tmp_value.alloc(stat_info.st_size)) goto err; - if ((file = my_open(file_name->c_ptr(), O_RDONLY, MYF(0))) < 0) + if ((file = my_open(file_name->ptr(), O_RDONLY, MYF(0))) < 0) goto err; if (my_read(file, (uchar*) tmp_value.ptr(), stat_info.st_size, MYF(MY_NABP))) { |