diff options
| author | unknown <svoj@june.mysql.com> | 2007-11-12 21:54:04 +0400 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2007-11-12 21:54:04 +0400 |
| commit | 2aa5037c7ac3d94e16c310760ffa4b04ccdcc871 (patch) | |
| tree | 5aa522d085c53f46ea294e5e4466abd98a32e20c | |
| parent | c63fd4dd32154044c0fcca00d3ea0d5ddb614fee (diff) | |
| parent | 9f9ff4612083ba16d9199ed377dbd76e5395d6cb (diff) | |
| download | mariadb-git-2aa5037c7ac3d94e16c310760ffa4b04ccdcc871.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
| -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 8978eee89c3..833adbeb851 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 21c17cfb45e..7eaeaa00c0a 100644 --- a/mysql-test/t/symlink.test +++ b/mysql-test/t/symlink.test @@ -127,11 +127,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; |