From a613b341184df8a8d842c8e8d2da5d0ae32e27ef Mon Sep 17 00:00:00 2001
From: unknown <mats@romeo.(none)>
Date: Mon, 2 Oct 2006 13:38:06 +0200
Subject: [PATCH] BUG#22550 (Replication of BIT column failing): Adding test
 case.

mysql-test/extra/rpl_tests/rpl_row_basic.test:
  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:
  Result change
mysql-test/t/rpl_row_basic_11bugs.test:
  Adding test case for bug.
mysql-test/t/rpl_row_basic_2myisam.test:
  Moving test include file to extra/rpl_tests
mysql-test/t/rpl_row_basic_3innodb.test:
  Moving test include file to extra/rpl_tests
mysql-test/t/rpl_row_basic_7ndb.test:
  Moving test include file to extra/rpl_tests
---
 .../rpl_tests/rpl_row_basic.test}             |  0
 mysql-test/r/rpl_row_basic_11bugs.result      | 22 ++++++++++++++++++-
 mysql-test/t/rpl_row_basic_11bugs.test        | 22 ++++++++++++++++++-
 mysql-test/t/rpl_row_basic_2myisam.test       |  2 +-
 mysql-test/t/rpl_row_basic_3innodb.test       |  2 +-
 mysql-test/t/rpl_row_basic_7ndb.test          |  2 +-
 6 files changed, 45 insertions(+), 5 deletions(-)
 rename mysql-test/{include/rpl_row_basic.inc => extra/rpl_tests/rpl_row_basic.test} (100%)

diff --git a/mysql-test/include/rpl_row_basic.inc b/mysql-test/extra/rpl_tests/rpl_row_basic.test
similarity index 100%
rename from mysql-test/include/rpl_row_basic.inc
rename to mysql-test/extra/rpl_tests/rpl_row_basic.test
diff --git a/mysql-test/r/rpl_row_basic_11bugs.result b/mysql-test/r/rpl_row_basic_11bugs.result
index d768797717b..e49facd2d70 100644
--- a/mysql-test/r/rpl_row_basic_11bugs.result
+++ b/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
diff --git a/mysql-test/t/rpl_row_basic_11bugs.test b/mysql-test/t/rpl_row_basic_11bugs.test
index e636824284d..37bfd01e260 100644
--- a/mysql-test/t/rpl_row_basic_11bugs.test
+++ b/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;
diff --git a/mysql-test/t/rpl_row_basic_2myisam.test b/mysql-test/t/rpl_row_basic_2myisam.test
index 471f4d6dbc5..c2cef800ec8 100644
--- a/mysql-test/t/rpl_row_basic_2myisam.test
+++ b/mysql-test/t/rpl_row_basic_2myisam.test
@@ -1,3 +1,3 @@
 let $type= 'MYISAM' ;
 let $extra_index= ;
--- source include/rpl_row_basic.inc
+-- source extra/rpl_tests/rpl_row_basic.test
diff --git a/mysql-test/t/rpl_row_basic_3innodb.test b/mysql-test/t/rpl_row_basic_3innodb.test
index b97f1543cc3..89effc4b3bb 100644
--- a/mysql-test/t/rpl_row_basic_3innodb.test
+++ b/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
 
diff --git a/mysql-test/t/rpl_row_basic_7ndb.test b/mysql-test/t/rpl_row_basic_7ndb.test
index 464600c590a..1ec2fb333ae 100644
--- a/mysql-test/t/rpl_row_basic_7ndb.test
+++ b/mysql-test/t/rpl_row_basic_7ndb.test
@@ -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