bk commit into 5.1 tree (ingo:1.2205)

[ingo]

Below is the list of changes that have just been committed into a local
5.1 repository of mydev. When mydev 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.2205 06/06/15 10:58:02 ingo@stripped +5 -0
  Merge mysql.com:/home/mydev/mysql-5.0-amerge
  into  mysql.com:/home/mydev/mysql-5.1-amerge

  sql/ha_myisammrg.h
    1.44 06/06/15 10:57:57 ingo@stripped +1 -3
    Manual merge

  mysql-test/t/lock_multi.test
    1.18 06/06/15 10:57:57 ingo@stripped +2 -1
    Manual merge

  mysql-test/t/merge.test
    1.42 06/06/15 10:52:08 ingo@stripped +0 -0
    Auto merged

  mysql-test/r/merge.result
    1.52 06/06/15 10:52:08 ingo@stripped +0 -0
    Auto merged

  mysql-test/r/lock_multi.result
    1.20 06/06/15 10:52:08 ingo@stripped +0 -0
    Auto merged

# 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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.1-amerge/RESYNC

--- 1.43/sql/ha_myisammrg.h	2006-06-04 17:52:09 +02:00
+++ 1.44/sql/ha_myisammrg.h	2006-06-15 10:57:57 +02:00
@@ -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
   {

--- 1.51/mysql-test/r/merge.result	2006-05-12 17:42:50 +02:00
+++ 1.52/mysql-test/r/merge.result	2006-06-15 10:52:08 +02:00
@@ -779,3 +779,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.41/mysql-test/t/merge.test	2006-05-12 17:42:50 +02:00
+++ 1.42/mysql-test/t/merge.test	2006-06-15 10:52:08 +02:00
@@ -393,4 +393,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

--- 1.17/mysql-test/t/lock_multi.test	2006-06-14 21:42:57 +02:00
+++ 1.18/mysql-test/t/lock_multi.test	2006-06-15 10:57:57 +02:00
@@ -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