Commit 43fb8633 authored by Mats Kindahl's avatar Mats Kindahl
Browse files

Bug #38360: BLACKHOLE replication with RBR is broken 

The Blackhole engine did not support row-based replication
since the delete_row(), update_row(), and the index and range
searching functions were not implemented.

This patch adds row-based replication support for the
Blackhole engine by implementing the two functions mentioned
above, and making the engine pretend that it has found the
correct row to delete or update when executed from the slave
SQL thread by implementing index and range searching functions.

It is necessary to only pretend this for the SQL thread, since
a SELECT executed on the Blackhole engine will otherwise never
return EOF, causing a livelock.
parent 969ea5ed

mysql-test/extra/binlog_tests/blackhole.test

+0 −9
Original line number Diff line number Diff line
@@ -139,15 +139,6 @@ drop table t1,t2,t3; 
#             table

#

CREATE TABLE t1(a INT) ENGINE=BLACKHOLE;

# NOTE: After exchanging open_ltable() by open_and_lock_tables() in

# handle_delayed_insert() to fix problems with MERGE tables (Bug#26379),

# problems with INSERT DELAYED and BLACKHOLE popped up. open_ltable()

# does not check if the binlogging capabilities of the statement and the

# table match. So the below used to succeed. But since INSERT DELAYED

# switches to row-based logging in mixed-mode and BLACKHOLE cannot do

# row-based logging, it could not really work. Until this problem is

# correctly fixed, we have that error here.

--error ER_BINLOG_LOGGING_IMPOSSIBLE

INSERT DELAYED INTO t1 VALUES(1);

DROP TABLE t1;

mysql-test/extra/rpl_tests/rpl_blackhole.test

0 → 100644
+19 −0
Original line number Diff line number Diff line 
connection slave;

let $before = query_get_value("SHOW MASTER STATUS", Position, 1);



--echo [on master]

connection master;

eval $statement;



--echo [on slave]

sync_slave_with_master;

--echo # Expect 0

SELECT COUNT(*) FROM t1;

let $after = query_get_value("SHOW MASTER STATUS", Position, 1);

let $something_written = `select $after - $before != 0`;

if ($something_written) {

  --echo >>> Something was written to binary log <<<

}

if (!$something_written) {

  --echo >>> Nothing was written to binary log <<<

}

mysql-test/suite/binlog/r/binlog_multi_engine.result

+5 −6
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2); 
UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c;

UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f;

ERROR HY000: Binary logging not possible. Message: Statement cannot be written atomically since more than one engine involved and at least one engine is self-logging

UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;

ERROR HY000: Binary logging not possible. Message: Statement cannot be written atomically since more than one engine involved and at least one engine is self-logging

TRUNCATE t1m;

TRUNCATE t1b;

TRUNCATE t1n;
@@ -68,20 +66,21 @@ RESET MASTER; 
SET SESSION BINLOG_FORMAT=ROW;

INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2);

INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2);

ERROR HY000: Binary logging not possible. Message: Row-based format required for this statement, but not allowed by this combination of engines

INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2);

UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c;

ERROR HY000: Binary logging not possible. Message: Row-based format required for this statement, but not allowed by this combination of engines

UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f;

ERROR HY000: Binary logging not possible. Message: Statement cannot be written atomically since more than one engine involved and at least one engine is self-logging

UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;

ERROR HY000: Binary logging not possible. Message: Row-based format required for this statement, but not allowed by this combination of engines

ERROR HY000: Binary logging not possible. Message: Statement cannot be written atomically since more than one engine involved and at least one engine is self-logging

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (test.t1m)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (test.t1b)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (test.t1n)

master-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)

mysql-test/suite/binlog/r/binlog_stm_blackhole.result

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ master-bin.000001 # Query # # use `test`; COMMIT 
drop table t1,t2,t3;

CREATE TABLE t1(a INT) ENGINE=BLACKHOLE;

INSERT DELAYED INTO t1 VALUES(1);

ERROR HY000: Binary logging not possible. Message: Row-based format required for this statement, but not allowed by this combination of engines

DROP TABLE t1;

CREATE TABLE t1(a INT, b INT) ENGINE=BLACKHOLE;

DELETE FROM t1 WHERE a=10;

mysql-test/suite/binlog/t/binlog_multi_engine.test

+1 −6
Original line number Diff line number Diff line
@@ -69,9 +69,6 @@ UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f; 


#UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f;



error ER_BINLOG_LOGGING_IMPOSSIBLE;

UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;



TRUNCATE t1m;

TRUNCATE t1b;

TRUNCATE t1n;
@@ -83,12 +80,10 @@ RESET MASTER; 
SET SESSION BINLOG_FORMAT=ROW;



INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2);

error ER_BINLOG_LOGGING_IMPOSSIBLE;



INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2);

INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2);



error ER_BINLOG_LOGGING_IMPOSSIBLE;

UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c;

error ER_BINLOG_LOGGING_IMPOSSIBLE;

UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f;