Commit ed8f506d authored by svoj@mysql.com/june.mysql.com's avatar svoj@mysql.com/june.mysql.com
Browse files

symlink.test, symlink.result: 

  Use proper variable for test.
parent 40a78cd3

mysql-test/r/symlink.result

+3 −3
Original line number Diff line number Diff line
@@ -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

mysql-test/t/symlink.test

+4 −4
Original line number Diff line number Diff line
@@ -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;