diff options
| author | unknown <svoj@june.mysql.com> | 2007-11-12 15:16:00 +0400 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2007-11-12 15:16:00 +0400 |
| commit | c63fd4dd32154044c0fcca00d3ea0d5ddb614fee (patch) | |
| tree | d6db35fefc5e9feede999e66574f618f6b6ce3df /mysql-test | |
| parent | 85425773e8fc6d71625c7476349839b0d372fb5f (diff) | |
| parent | 88701b45a935016c31af3bd6817dd4ee4c7ccd37 (diff) | |
| download | mariadb-git-c63fd4dd32154044c0fcca00d3ea0d5ddb614fee.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
mysys/my_symlink2.c:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/symlink.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/symlink.test | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result index 18299bf4298..8978eee89c3 100644 --- a/mysql-test/r/symlink.result +++ b/mysql-test/r/symlink.result @@ -99,6 +99,12 @@ t1 CREATE TABLE `t1` ( `b` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; +CREATE TABLE t1(a INT) +DATA DIRECTORY='TEST_DIR/var/master-data/mysql' +INDEX DIRECTORY='TEST_DIR/var/master-data/mysql'; +RENAME TABLE t1 TO user; +ERROR HY000: Can't create/write to file 'TEST_DIR/var/master-data/mysql/user.MYI' (Errcode: 17) +DROP TABLE t1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test index 8c67a4c1048..21c17cfb45e 100644 --- a/mysql-test/t/symlink.test +++ b/mysql-test/t/symlink.test @@ -125,6 +125,18 @@ show create table t1; drop table t1; # +# BUG#32111 - Security Breach via DATA/INDEX DIRECORY and RENAME TABLE +# +--replace_result $MYSQL_TEST_DIR TEST_DIR +eval CREATE TABLE t1(a INT) +DATA DIRECTORY='$MYSQL_TEST_DIR/var/master-data/mysql' +INDEX DIRECTORY='$MYSQL_TEST_DIR/var/master-data/mysql'; +--replace_result $MYSQL_TEST_DIR TEST_DIR +--error 1 +RENAME TABLE t1 TO user; +DROP TABLE t1; + +# # Test specifying DATA DIRECTORY that is the same as what would normally # have been chosen. (Bug #8707) # |