diff options
| author | hf@deer.(none) <> | 2003-09-26 15:40:26 +0500 |
|---|---|---|
| committer | hf@deer.(none) <> | 2003-09-26 15:40:26 +0500 |
| commit | 5f8e7fef2746ece1973116db739c6604cc156b21 (patch) | |
| tree | b80c6147c3a9929ec4e00bac55883c6d575ac2a4 /sql/item_strfunc.cc | |
| parent | d5d4923107a2f8d3455debfe6ab8b22b5793f6cf (diff) | |
| parent | ba8fa76fa20f400d8adfe2aa14231a682df9ba79 (diff) | |
| download | mariadb-git-5f8e7fef2746ece1973116db739c6604cc156b21.tar.gz | |
Merge
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 224e6dceec4..86efde096c5 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2279,7 +2279,9 @@ String *Item_load_file::val_str(String *str) DBUG_ENTER("load_file"); if (!(file_name= args[0]->val_str(str)) || +#ifndef NO_EMBEDDED_ACCESS_CHECKS !(current_thd->master_access & FILE_ACL) || +#endif !my_stat(file_name->c_ptr(), &stat_info, MYF(MY_WME))) goto err; if (!(stat_info.st_mode & S_IROTH)) |