diff options
| author | svoj@mysql.com/june.mysql.com <> | 2007-11-12 21:52:30 +0400 |
|---|---|---|
| committer | svoj@mysql.com/june.mysql.com <> | 2007-11-12 21:52:30 +0400 |
| commit | ed8f506d29dfdd6547db798dbc468e2ab205d045 (patch) | |
| tree | 05c3eb5dea74efee525b02729273c05c02056c03 | |
| parent | 40a78cd3900d72e76edf0e7d9b83b26f1a55811c (diff) | |
| download | mariadb-git-ed8f506d29dfdd6547db798dbc468e2ab205d045.tar.gz | |
symlink.test, symlink.result:
Use proper variable for test.
| -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 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; |