diff options
| author | unknown <istruewing@stella.local> | 2008-03-14 14:03:47 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2008-03-14 14:03:47 +0100 |
| commit | 9fa2d50559383785c72656dcdffa878cc3563da9 (patch) | |
| tree | eff22a0b56e730c1e0946113822a7f9daba4f096 /mysql-test/t/symlink.test | |
| parent | e79249f81bbb7158fb263455e531bda4117b5fc9 (diff) | |
| download | mariadb-git-9fa2d50559383785c72656dcdffa878cc3563da9.tar.gz | |
Post-merge fix. Moved the symlink handling from sql_parse.cc here.
mysql-test/r/symlink.result:
Post-merge fix
mysql-test/t/symlink.test:
Post-merge fix
Diffstat (limited to 'mysql-test/t/symlink.test')
| -rw-r--r-- | mysql-test/t/symlink.test | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test index 5802e65df1e..1323451d984 100644 --- a/mysql-test/t/symlink.test +++ b/mysql-test/t/symlink.test @@ -126,6 +126,9 @@ drop table t1; --write_file $MYSQLTEST_VARDIR/tmp/t1.MYI EOF --replace_result $MYSQLTEST_VARDIR TEST_DIR +# If $MYSQLTEST_VARDIR is a symbolic link, the low level MyISAm error +# message contains the real path of $MYSQLTEST_VARDIR. Try to catch this. +--replace_regex /write to file '\/.*\/tmp/write to file 'TEST_DIR\/tmp/ --error 1 eval CREATE TABLE t1(a INT) DATA DIRECTORY='$MYSQLTEST_VARDIR/tmp' @@ -209,13 +212,13 @@ INDEX DIRECTORY='$MYSQLTEST_VARDIR/master-data/mysql'; eval CREATE TABLE t1(a INT) DATA DIRECTORY='$MYSQLTEST_VARDIR/master-data/test'; --replace_result $MYSQLTEST_VARDIR TEST_DIR +--error 1210 eval CREATE TABLE t1(a INT) DATA DIRECTORY='$MYSQLTEST_VARDIR/master-data/'; -DROP TABLE t1; --replace_result $MYSQLTEST_VARDIR TEST_DIR +--error 1210 eval CREATE TABLE t1(a INT) INDEX DIRECTORY='$MYSQLTEST_VARDIR/master-data'; -DROP TABLE t1; --replace_result $MYSQLTEST_VARDIR TEST_DIR --error 1 eval CREATE TABLE t1(a INT) |