diff options
| -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 | ||||
| -rw-r--r-- | sql/ha_myisammrg.h | 2 |
4 files changed, 18 insertions, 2 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 diff --git a/sql/ha_myisammrg.h b/sql/ha_myisammrg.h index b67ec3dc204..d58a3523c26 100644 --- a/sql/ha_myisammrg.h +++ b/sql/ha_myisammrg.h @@ -38,7 +38,7 @@ class ha_myisammrg: public handler return (HA_REC_NOT_IN_SEQ | HA_AUTO_PART_KEY | HA_NO_TRANSACTIONS | HA_NULL_IN_KEY | HA_CAN_INDEX_BLOBS | HA_FILE_BASED | HA_CAN_INSERT_DELAYED | HA_ANY_INDEX_MAY_BE_UNIQUE | - HA_NO_COPY_ON_ALTER); + HA_CAN_BIT_FIELD | HA_NO_COPY_ON_ALTER); } ulong index_flags(uint inx, uint part, bool all_parts) const { |