bk commit into 5.1 tree (mats:1.2346) BUG#22550

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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@stripped, 2006-10-02 13:38:06+02:00, mats@romeo.(none) +6 -0
  BUG#22550 (Replication of BIT column failing):
  Adding test case.

  mysql-test/extra/rpl_tests/rpl_row_basic.test@stripped, 2006-10-02 10:41:33+02:00, mats@romeo.(none) +0 -0
    Rename: mysql-test/include/rpl_row_basic.inc -> mysql-test/extra/rpl_tests/rpl_row_basic.test

  mysql-test/r/rpl_row_basic_11bugs.result@stripped, 2006-10-02 13:38:00+02:00, mats@romeo.(none) +21 -1
    Result change

  mysql-test/t/rpl_row_basic_11bugs.test@stripped, 2006-10-02 13:38:00+02:00, mats@romeo.(none) +21 -1
    Adding test case for bug.

  mysql-test/t/rpl_row_basic_2myisam.test@stripped, 2006-10-02 13:38:00+02:00, mats@romeo.(none) +1 -1
    Moving test include file to extra/rpl_tests

  mysql-test/t/rpl_row_basic_3innodb.test@stripped, 2006-10-02 13:38:00+02:00, mats@romeo.(none) +1 -1
    Moving test include file to extra/rpl_tests

  mysql-test/t/rpl_row_basic_7ndb.test@stripped, 2006-10-02 13:38:00+02:00, mats@romeo.(none) +1 -1
    Moving test include file to extra/rpl_tests

# 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:	mats
# Host:	romeo.(none)
# Root:	/home/bk/fix-mysql-5.1-new-rpl

--- 1.1/mysql-test/t/rpl_row_basic_2myisam.test	2006-10-02 13:38:18 +02:00
+++ 1.2/mysql-test/t/rpl_row_basic_2myisam.test	2006-10-02 13:38:18 +02:00
@@ -1,3 +1,3 @@
 let $type= 'MYISAM' ;
 let $extra_index= ;
--- source include/rpl_row_basic.inc
+-- source extra/rpl_tests/rpl_row_basic.test

--- 1.1/mysql-test/t/rpl_row_basic_3innodb.test	2006-10-02 13:38:18 +02:00
+++ 1.2/mysql-test/t/rpl_row_basic_3innodb.test	2006-10-02 13:38:18 +02:00
@@ -2,5 +2,5 @@
 
 let $type= 'INNODB' ;
 let $extra_index= ;
--- source include/rpl_row_basic.inc
+-- source extra/rpl_tests/rpl_row_basic.test
 

--- 1.10/mysql-test/r/rpl_row_basic_11bugs.result	2006-10-02 13:38:18 +02:00
+++ 1.11/mysql-test/r/rpl_row_basic_11bugs.result	2006-10-02 13:38:18 +02:00
@@ -99,4 +99,24 @@
 7
 8
 9
-DROP TABLE t1;
+================ Test for BUG#22550 ================
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+CREATE TABLE t1 (a BIT(1), b INT) ENGINE=MYISAM;
+INSERT INTO t1 VALUES(1,2);
+SELECT HEX(a),b FROM t1;
+HEX(a)	b
+1	2
+SELECT HEX(a),b FROM t1;
+HEX(a)	b
+1	2
+UPDATE t1 SET a=0 WHERE b=2;
+SELECT HEX(a),b FROM t1;
+HEX(a)	b
+0	2
+SELECT HEX(a),b FROM t1;
+HEX(a)	b
+0	2

--- 1.9/mysql-test/t/rpl_row_basic_11bugs.test	2006-10-02 13:38:18 +02:00
+++ 1.10/mysql-test/t/rpl_row_basic_11bugs.test	2006-10-02 13:38:18 +02:00
@@ -93,4 +93,24 @@
 sync_slave_with_master;
 SELECT * FROM t1;
 
-DROP TABLE t1;
+# Bug#22550: Replication of BIT columns failing
+--echo ================ Test for BUG#22550 ================
+--disable_query_log
+--source include/master-slave-reset.inc
+--enable_query_log
+
+connection master;
+CREATE TABLE t1 (a BIT(1), b INT) ENGINE=MYISAM;
+sync_slave_with_master;
+
+connection master;
+INSERT INTO t1 VALUES(1,2);
+SELECT HEX(a),b FROM t1;
+sync_slave_with_master;
+SELECT HEX(a),b FROM t1;
+
+connection master;
+UPDATE t1 SET a=0 WHERE b=2;
+SELECT HEX(a),b FROM t1;
+sync_slave_with_master;
+SELECT HEX(a),b FROM t1;

--- 1.2/mysql-test/t/rpl_row_basic_7ndb.test	2006-10-02 13:38:18 +02:00
+++ 1.3/mysql-test/t/rpl_row_basic_7ndb.test	2006-10-02 13:38:18 +02:00
@@ -1,5 +1,5 @@
 -- source include/have_ndb.inc
 let $type= 'NDB' ;
 let $extra_index= ;
--- source include/rpl_row_basic.inc
+-- source extra/rpl_tests/rpl_row_basic.test
 -- source include/master-slave-end.inc