diff options
| author | unknown <svoj@june.mysql.com> | 2007-06-14 16:19:47 +0500 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2007-06-14 16:19:47 +0500 |
| commit | e1f5ce69b93301b152f475b9adc7264f25bb0148 (patch) | |
| tree | 62434a3505fd48583ab8a1af0774274ba59e1143 /mysql-test/r/merge.result | |
| parent | 5f26429db469128d189488fa161aedeb4eb7090a (diff) | |
| parent | 5bc3eb2e1183dc5f73b007d48a509793cceb19f1 (diff) | |
| download | mariadb-git-e1f5ce69b93301b152f475b9adc7264f25bb0148.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
mysql-test/r/merge.result:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/merge.result')
| -rw-r--r-- | mysql-test/r/merge.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 76667829864..bb4fc654b38 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -852,8 +852,8 @@ SELECT * FROM tm1; ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist CHECK TABLE tm1; Table Op Msg_type Msg_text -test.tm1 check Error Table './test/t1' is differently defined or of non-MyISAM type or doesn't exist -test.tm1 check Error Table './test/t2' is differently defined or of non-MyISAM type or doesn't exist +test.tm1 check Error Table 'test.t1' is differently defined or of non-MyISAM type or doesn't exist +test.tm1 check Error Table 'test.t2' is differently defined or of non-MyISAM type or doesn't exist test.tm1 check Error Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist test.tm1 check error Corrupt CREATE TABLE t1(a INT); @@ -861,7 +861,7 @@ SELECT * FROM tm1; ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist CHECK TABLE tm1; Table Op Msg_type Msg_text -test.tm1 check Error Table './test/t2' is differently defined or of non-MyISAM type or doesn't exist +test.tm1 check Error Table 'test.t2' is differently defined or of non-MyISAM type or doesn't exist test.tm1 check Error Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist test.tm1 check error Corrupt CREATE TABLE t2(a BLOB); @@ -869,7 +869,7 @@ SELECT * FROM tm1; ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist CHECK TABLE tm1; Table Op Msg_type Msg_text -test.tm1 check Error Table './test/t2' is differently defined or of non-MyISAM type or doesn't exist +test.tm1 check Error Table 'test.t2' is differently defined or of non-MyISAM type or doesn't exist test.tm1 check Error Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist test.tm1 check error Corrupt ALTER TABLE t2 MODIFY a INT; |