database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge 5.1-security => 5.5-security

Browse Source
This commit is contained in:
Kristofer Pettersson
2010-12-16 15:08:26 +01:00
parent 802fdecbfc 21da523f17
commit 8597a8b866
5 changed files with 82 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/sys_vars/r/secure_file_priv2.result Normal file
View File

@ -0,0 +1,6 @@
CREATE TABLE t1 (c1 INT);
LOAD DATA INFILE "t1.MYI" into table t1;
ERROR HY000: The MySQL server is running with the --secure-file-priv option so it cannot execute this statement
LOAD DATA INFILE "/test" into table t1;
ERROR HY000: The MySQL server is running with the --secure-file-priv option so it cannot execute this statement
DROP TABLE t1;

1
mysql-test/suite/sys_vars/t/secure_file_priv2-master.opt Normal file
View File

@ -0,0 +1 @@
--secure_file_priv=$SECURE_LOAD_PATH

23
mysql-test/suite/sys_vars/t/secure_file_priv2.test Normal file
View File

@ -0,0 +1,23 @@
#
# Bug58747 breaks secure_file_priv+not secure yet+still accesses other folders
#
CREATE TABLE t1 (c1 INT);
#
# Before the patch this statement failed with
# Linux:
# -> errno 13: 'Can't get stat of '
# Windows:
# -> Warning 1366 Incorrect integer value: '■■☺' for
# -> column 'c1' at row 1
# Now it should consistently fail with ER_OPTION_PREVENTS_STATEMENT
# on all platforms.
--error ER_OPTION_PREVENTS_STATEMENT
LOAD DATA INFILE "t1.MYI" into table t1;
#
# The following test makes the assuption that /test isn't a valid path in any
# operating system running the test suite.
--error ER_OPTION_PREVENTS_STATEMENT
LOAD DATA INFILE "/test" into table t1;
DROP TABLE t1;