diff options
| author | svoj@june.mysql.com <> | 2007-11-12 21:55:53 +0400 |
|---|---|---|
| committer | svoj@june.mysql.com <> | 2007-11-12 21:55:53 +0400 |
| commit | d03491e8f98dedda946e6a32bba63eb3b23d5ca3 (patch) | |
| tree | b9bb2c2184d286205ea8e70ab41f91e6c35e29e8 | |
| parent | 162d70cb024612dfea227dda095c18c184aa9d02 (diff) | |
| parent | 9799d6c479f86458b36cfd0382caa6852642f14f (diff) | |
| download | mariadb-git-d03491e8f98dedda946e6a32bba63eb3b23d5ca3.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.1-engines
| -rw-r--r-- | mysql-test/r/symlink.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/symlink.test | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result index 723674c1dcf..4eece9d5b5a 100644 --- a/mysql-test/r/symlink.result +++ b/mysql-test/r/symlink.result @@ -100,10 +100,10 @@ t1 CREATE TABLE `t1` ( ) 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'; +DATA DIRECTORY='TEST_DIR/master-data/mysql' +INDEX DIRECTORY='TEST_DIR/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) +ERROR HY000: Can't create/write to file 'TEST_DIR/master-data/mysql/user.MYI' (Errcode: 17) DROP TABLE t1; show create table t1; Table Create Table diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test index 7d6a3aa78c9..f339b29c83a 100644 --- a/mysql-test/t/symlink.test +++ b/mysql-test/t/symlink.test @@ -123,11 +123,11 @@ drop table t1; # # BUG#32111 - Security Breach via DATA/INDEX DIRECORY and RENAME TABLE # ---replace_result $MYSQL_TEST_DIR TEST_DIR +--replace_result $MYSQLTEST_VARDIR 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 +DATA DIRECTORY='$MYSQLTEST_VARDIR/master-data/mysql' +INDEX DIRECTORY='$MYSQLTEST_VARDIR/master-data/mysql'; +--replace_result $MYSQLTEST_VARDIR TEST_DIR --error 1 RENAME TABLE t1 TO user; DROP TABLE t1; |