bk commit into 5.0 tree (acurtis:1.2130) BUG#19648

[antony]

Below is the list of changes that have just been committed into a local
5.0 repository of antony. When antony does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2130 06/05/30 17:10:53 acurtis@stripped +3 -0
  Bug#19648
    "Merge table does not work with bit types"
     MERGE should have HA_CAN_BIT_FIELD feature bit set or else table row is
     formatted incorrectly.

  sql/ha_myisammrg.h
    1.41 06/05/30 17:10:50 acurtis@stripped +2 -1
    Bug#19648
      Must have HA_CAN_BIT_FIELD for BIT type support

  mysql-test/t/merge.test
    1.41 06/05/30 17:10:50 acurtis@stripped +9 -0
    Bug#19648
      Test for fix

  mysql-test/r/merge.result
    1.48 06/05/30 17:10:50 acurtis@stripped +6 -0
    Bug#19648
      Test for fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	acurtis
# Host:	localhost.(none)
# Root:	/home/antony/work2/p2-bug19648.3

--- 1.40/sql/ha_myisammrg.h	2005-07-19 11:21:01 -07:00
+++ 1.41/sql/ha_myisammrg.h	2006-05-30 17:10:50 -07:00
@@ -37,7 +37,8 @@ class ha_myisammrg: public handler
   {
     return (HA_REC_NOT_IN_SEQ | HA_AUTO_PART_KEY | HA_READ_RND_SAME |
 	    HA_NULL_IN_KEY | HA_CAN_INDEX_BLOBS | HA_FILE_BASED |
-            HA_CAN_INSERT_DELAYED | HA_ANY_INDEX_MAY_BE_UNIQUE);
+            HA_CAN_INSERT_DELAYED | HA_ANY_INDEX_MAY_BE_UNIQUE |
+            HA_CAN_BIT_FIELD);
   }
   ulong index_flags(uint inx, uint part, bool all_parts) const
   {

--- 1.47/mysql-test/r/merge.result	2006-05-09 13:31:42 -07:00
+++ 1.48/mysql-test/r/merge.result	2006-05-30 17:10:50 -07:00
@@ -776,3 +776,9 @@ insert into t1 values ("Monty"),("WAX"),
 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;

--- 1.40/mysql-test/t/merge.test	2006-05-09 13:31:42 -07:00
+++ 1.41/mysql-test/t/merge.test	2006-05-30 17:10:50 -07:00
@@ -390,4 +390,13 @@ insert into t1 values ("Monty"),("WAX"),
 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