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/r/symlink.result | |
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/r/symlink.result')
-rw-r--r-- | mysql-test/r/symlink.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result index f014a794dc7..8773d3ec6c0 100644 --- a/mysql-test/r/symlink.result +++ b/mysql-test/r/symlink.result @@ -149,14 +149,14 @@ 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/5.0-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/5.0-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/5.0-opt/mysql-test/var/master-data_var'; -ERROR HY000: Can't create/write to file '/home/gluh/MySQL/Merge/5.0-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 SET SESSION keep_files_on_create = TRUE; CREATE TABLE t1 (a INT) ENGINE MYISAM; |