summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authormattiasj@mattiasj-laptop.(none) <>2007-11-12 22:40:43 +0100
committermattiasj@mattiasj-laptop.(none) <>2007-11-12 22:40:43 +0100
commitf5d1d682bc62ffc088a09fdb08f03c1c55e10a37 (patch)
treef91caed10a083e96e97c8169cfc44d0721be4844 /mysql-test/r
parent32d7dd8679401a341de883aa7d2acdbc80ab6a6a (diff)
parentd03491e8f98dedda946e6a32bba63eb3b23d5ca3 (diff)
downloadmariadb-git-f5d1d682bc62ffc088a09fdb08f03c1c55e10a37.tar.gz
Merge mattiasj@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-last_with_main
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/symlink.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
index 723674c1dcf..4eece9d5b5a 100644
--- a/mysql-test/r/symlink.result
+++ b/mysql-test/r/symlink.result
@@ -100,10 +100,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