From 9f9ff4612083ba16d9199ed377dbd76e5395d6cb Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 12 Nov 2007 21:52:30 +0400 Subject: [PATCH] symlink.test, symlink.result: Use proper variable for test. mysql-test/t/symlink.test: Use proper variable for test. mysql-test/r/symlink.result: Use proper variable for test. --- mysql-test/r/symlink.result | 6 +++--- 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 81798b2dc20..32dc72b8219 100644 --- a/mysql-test/r/symlink.result +++ b/mysql-test/r/symlink.result @@ -91,10 +91,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 fb35bd3c130..40127a697ac 100644 --- a/mysql-test/t/symlink.test +++ b/mysql-test/t/symlink.test @@ -121,11 +121,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;