diff options
author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-07 20:17:55 +0400 |
---|---|---|
committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-07 20:17:55 +0400 |
commit | 9a2f98198903de89ab08ce7906e4307fe5ad50a9 (patch) | |
tree | 1cb84ff0f047fa8321330c5e4c52eca6424494de /sql/item_strfunc.cc | |
parent | 480a4852a01088cdc8638934f13469b6bf54effe (diff) | |
parent | 5b6ebdf086fe0506dc1d2cb70a95f9633fd7a782 (diff) | |
download | mariadb-git-9a2f98198903de89ab08ce7906e4307fe5ad50a9.tar.gz |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/t/explain.test
Text conflict in sql/net_serv.cc
Text conflict in sql/sp_head.cc
Text conflict in sql/sql_priv.h
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r-- | sql/item_strfunc.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 15ac6e24b16..61febb01e93 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -3192,8 +3192,7 @@ String *Item_load_file::val_str(String *str) MY_RELATIVE_PATH | MY_UNPACK_FILENAME); /* Read only allowed from within dir specified by secure_file_priv */ - if (opt_secure_file_priv && - strncmp(opt_secure_file_priv, path, strlen(opt_secure_file_priv))) + if (!is_secure_file_path(path)) goto err; if (!mysql_file_stat(key_file_loadfile, path, &stat_info, MYF(0))) |