Commit 4d582db8 authored by gluh@mysql.com/eagle.(none)'s avatar gluh@mysql.com/eagle.(none)
Browse files

test fix

parent 13bb7e0a

mysql-test/r/symlink.result

+4 −4
Original line number Diff line number Diff line
@@ -140,12 +140,12 @@ CREATE TABLE t1(a INT) 
DATA DIRECTORY='TEST_DIR/var/master-data/test';

ERROR HY000: Incorrect arguments to DATA DIRECORY

CREATE TABLE t1(a INT)

DATA DIRECTORY='/home/gluh/MySQL/Merge/4.1-opt/mysql-test/var/master-data/';

DATA DIRECTORY='TEST_DIR/var/master-data/';

ERROR HY000: Incorrect arguments to DATA DIRECORY

CREATE TABLE t1(a INT)

INDEX DIRECTORY='/home/gluh/MySQL/Merge/4.1-opt/mysql-test/var/master-data';

INDEX DIRECTORY='TEST_DIR/var/master-data';

ERROR HY000: Incorrect arguments to INDEX DIRECORY

CREATE TABLE t1(a INT)

INDEX DIRECTORY='/home/gluh/MySQL/Merge/4.1-opt/mysql-test/var/master-data_var';

ERROR HY000: Can't create/write to file '/home/gluh/MySQL/Merge/4.1-opt/mysql-test/var/master-data_var/t1.MYI' (Errcode: 2)

INDEX DIRECTORY='TEST_DIR/var/master-data_var';

ERROR HY000: Can't create/write to file 'TEST_DIR/var/master-data_var/t1.MYI' (Errcode: 2)

End of 4.1 tests

mysql-test/t/symlink.test

+3 −0
Original line number Diff line number Diff line
@@ -201,12 +201,15 @@ deallocate prepare stmt; 
--error 1210

eval CREATE TABLE t1(a INT)

DATA DIRECTORY='$MYSQL_TEST_DIR/var/master-data/test';

--replace_result $MYSQL_TEST_DIR TEST_DIR

--error 1210

eval CREATE TABLE t1(a INT)

DATA DIRECTORY='$MYSQL_TEST_DIR/var/master-data/';

--replace_result $MYSQL_TEST_DIR TEST_DIR

--error 1210

eval CREATE TABLE t1(a INT)

INDEX DIRECTORY='$MYSQL_TEST_DIR/var/master-data';

--replace_result $MYSQL_TEST_DIR TEST_DIR

--error 1

eval CREATE TABLE t1(a INT)

INDEX DIRECTORY='$MYSQL_TEST_DIR/var/master-data_var';