diff options
| author | unknown <ingo@mysql.com> | 2006-06-15 10:58:02 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-06-15 10:58:02 +0200 |
| commit | 6bc9973183fd16c458e6532ed200c3c718d31326 (patch) | |
| tree | c535f394cd568fd89d1abd5fe9312e81e7698ddb /mysql-test | |
| parent | e8288ff926cfa2e4c635c88e706c921a6f7b9235 (diff) | |
| parent | 2dd1dc62462a9b7348d1c815acacddedb5a62d88 (diff) | |
| download | mariadb-git-6bc9973183fd16c458e6532ed200c3c718d31326.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.0-amerge
into mysql.com:/home/mydev/mysql-5.1-amerge
mysql-test/r/lock_multi.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysql-test/t/lock_multi.test:
Manual merge
sql/ha_myisammrg.h:
Manual merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/merge.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/lock_multi.test | 3 | ||||
| -rw-r--r-- | mysql-test/t/merge.test | 9 |
3 files changed, 17 insertions, 1 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 2f5f382028a..38ade38747e 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -779,3 +779,9 @@ insert into t1 values ("Monty"),("WAX"),("Walrus"); alter table t1 engine=MERGE; ERROR HY000: Table storage engine for 't1' doesn't have this option drop table t1; +create table t1 (b bit(1)); +create table t2 (b bit(1)); +create table tm (b bit(1)) engine = merge union = (t1,t2); +select * from tm; +b +drop table tm, t1, t2; diff --git a/mysql-test/t/lock_multi.test b/mysql-test/t/lock_multi.test index d0577d6f2f3..6ebcf595645 100644 --- a/mysql-test/t/lock_multi.test +++ b/mysql-test/t/lock_multi.test @@ -157,7 +157,7 @@ use test; # connection default; -# End of 5.0 tests +# # Bug#19815 - CREATE/RENAME/DROP DATABASE can deadlock on a global read lock # connect (con1,localhost,root,,); @@ -191,3 +191,4 @@ disconnect con2; --error ER_DB_DROP_EXISTS DROP DATABASE mysqltest_1; +# End of 5.0 tests diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 9fee4a03b81..c211ff2ac29 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -393,4 +393,13 @@ insert into t1 values ("Monty"),("WAX"),("Walrus"); alter table t1 engine=MERGE; drop table t1; +# +# BUG#19648 - Merge table does not work with bit types +# +create table t1 (b bit(1)); +create table t2 (b bit(1)); +create table tm (b bit(1)) engine = merge union = (t1,t2); +select * from tm; +drop table tm, t1, t2; + # End of 5.0 tests |