diff options
| author | unknown <monty@narttu.mysql.fi> | 2000-11-16 00:24:11 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2000-11-16 00:24:11 +0200 |
| commit | c7d2c59ceb4e3548eb74e5d8fba16e0f41ffc7d9 (patch) | |
| tree | 31119bae32d48d3c415144eb5aed588455eefa1a /sql/item_strfunc.cc | |
| parent | dcf4e49369d91b78ab73b9de038d2729afb3a2a6 (diff) | |
| parent | 9a846a52ae62f701c2d54d3f468e2ead393acf91 (diff) | |
| download | mariadb-git-c7d2c59ceb4e3548eb74e5d8fba16e0f41ffc7d9.tar.gz | |
merge
configure.in:
Auto merged
include/my_sys.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.h:
Auto merged
BitKeeper/etc/logging_ok:
Auto merged
Diffstat (limited to 'sql/item_strfunc.cc')
| -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 6b8b3762aa1..39bbdcaff1f 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1598,7 +1598,7 @@ String *Item_load_file::val_str(String *str) if (!(file_name= args[0]->val_str(str)) || !(current_thd->master_access & FILE_ACL) || - !my_stat(file_name->c_ptr(), &stat_info, MYF(MY_FAE))) + !my_stat(file_name->c_ptr(), &stat_info, MYF(MY_WME))) goto err; if (!(stat_info.st_mode & S_IROTH)) { |