diff options
| author | unknown <gluh@eagle.(none)> | 2008-02-29 16:58:20 +0400 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2008-02-29 16:58:20 +0400 |
| commit | 4460f5a5b115bece68762cb32456f823d4ab0267 (patch) | |
| tree | 2b8c38287b875b6e25890b06f7832e6b5dcb7e2e /mysql-test/t/symlink.test | |
| parent | fa9e35b48d1322b80cf3a8f6ffd4b2fde7f46c0c (diff) | |
| parent | be59a0ea7f6f7a4fc08e1da5888fecde28289194 (diff) | |
| download | mariadb-git-4460f5a5b115bece68762cb32456f823d4ab0267.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
mysql-test/t/symlink.test:
Auto merged
mysql-test/r/symlink.result:
after merge fix
Diffstat (limited to 'mysql-test/t/symlink.test')
| -rw-r--r-- | mysql-test/t/symlink.test | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test index ffe5cc76737..8878f9fc461 100644 --- a/mysql-test/t/symlink.test +++ b/mysql-test/t/symlink.test @@ -207,12 +207,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'; |