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/sql_class.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/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index f59ffd4d42f..914ef5c919a 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1917,8 +1917,7 @@ static File create_file(THD *thd, char *path, sql_exchange *exchange, else (void) fn_format(path, exchange->file_name, mysql_real_data_home, "", option); - if (opt_secure_file_priv && - strncmp(opt_secure_file_priv, path, strlen(opt_secure_file_priv))) + if (!is_secure_file_path(path)) { /* Write only allowed to dir or subdir specified by secure_file_priv */ my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--secure-file-priv"); |