diff options
| author | unknown <svoj@june.mysql.com> | 2007-11-12 21:55:53 +0400 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2007-11-12 21:55:53 +0400 |
| commit | 423896aefdf669ddfc985ca0a7799514c8328e4f (patch) | |
| tree | b9bb2c2184d286205ea8e70ab41f91e6c35e29e8 /mysql-test/r/symlink.result | |
| parent | e1d98e8d51b3cd95d9ce4ac4afe56cd74ad4830b (diff) | |
| parent | 2aa5037c7ac3d94e16c310760ffa4b04ccdcc871 (diff) | |
| download | mariadb-git-423896aefdf669ddfc985ca0a7799514c8328e4f.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.1-engines
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
Diffstat (limited to 'mysql-test/r/symlink.result')
| -rw-r--r-- | mysql-test/r/symlink.result | 6 |
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 |