Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl

mysql-test/r/rpl_row_basic_11bugs.result

@@ -99,4 +99,24 @@ a
 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

mysql-test/t/rpl_row_basic_11bugs.test

@@ -93,4 +93,24 @@ INSERT INTO t1 VALUES (7),(8),(9);
 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;

mysql-test/t/rpl_row_basic_2myisam.test

 let $type= 'MYISAM' ;
 let $extra_index= ;
--- source include/rpl_row_basic.inc
+-- source extra/rpl_tests/rpl_row_basic.test

mysql-test/t/rpl_row_basic_3innodb.test

@@ -2,5 +2,5 @@
 
 let $type= 'INNODB' ;
 let $extra_index= ;
--- source include/rpl_row_basic.inc
+-- source extra/rpl_tests/rpl_row_basic.test
 

mysql-test/t/rpl_row_basic_7ndb.test

 -- 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