Commit 8aa26289 authored by unknown's avatar unknown
Browse files

Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 

into  romeo.(none):/home/bk/fix-mysql-5.1-new-rpl
parents cd1eb672 a613b341

mysql-test/r/rpl_row_basic_11bugs.result

+21 −1
Original line number Diff line number Diff line
@@ -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

+21 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line 
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

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ 


let $type= 'INNODB' ;

let $extra_index= ;

-- source include/rpl_row_basic.inc

-- source extra/rpl_tests/rpl_row_basic.test