Commit 986679a2 authored by unknown's avatar unknown
Browse files

Fix for BUG#20649 "mixed replication mode does not work with INSERT DELAYED". 

The bug was that if the server was running in mixed binlogging mode,
and an INSERT DELAYED used some needing-row-based components like UUID(),
the server didn't binlog this row-based but statement-based, which
thus failed to insert correct data on the slave.
This changeset implements that when a delayed_insert thread is created,
if the server's global binlog mode is "mixed", that thread will use row-based.
This also fixes BUG#20633 "INSERT DELAYED RAND() or @user_var does not
replicate statement-based": we don't fix it in statement-based mode (would
require bookeeping of rand seeds and user variables used by each row),
but at least it will now work in mixed mode (as row-based will be used).
We re-enable rpl_switch_stm_row_mixed.test (so BUG#18590
which was about re-enabling this test, will be closed) to test the fixes.
Between when it was disabled and now, some good changes to row-based
binlogging (no generation of table map events for non-changed tables)
induce changes in the test's result file.


mysql-test/r/rpl_switch_stm_row_mixed.result:
  result update.
  Note that some pieces of binlog are gone, not due to my test but to changes
  to the row-based binlogging code (non-changed tables don't generate
  table map binlog events now) done while the test was disabled.
mysql-test/t/disabled.def:
  this test works now
mysql-test/t/rpl_switch_stm_row_mixed.test:
  testing fix to make INSERT DELAYED work in mixed mode
sql/sql_insert.cc:
  In mixed binlogging mode, the delayed_insert system thread now always
  uses row-based binlogging.
  This makes replication of INSERT DELAYED VALUES(RAND()) or VALUES(@a)
  work in mixed mode (it does not in statement-based).
parent d4350444

mysql-test/r/rpl_switch_stm_row_mixed.result

+17 −7
Original line number Diff line number Diff line
@@ -142,12 +142,20 @@ select foo3(); 
ERROR HY000: Cannot change the binary logging format inside a stored function or trigger

select * from t1 where a="alarm";

a

insert delayed into t2 values("delay_1_");

insert delayed into t2 values(concat("delay_2_",UUID()));

Warnings:

Warning	1265	Data truncated for column 'UUID()' at row 1

insert delayed into t2 values("delay_3_"),(concat("delay_4_",UUID())),("delay_5_");

Warnings:

Warning	1265	Data truncated for column 'UUID()' at row 2

insert delayed into t2 values("delay_6_");

select count(*) from t1;

count(*)

36

select count(*) from t2;

count(*)

1

7

select count(*) from t3;

count(*)

2
@@ -160,8 +168,6 @@ count(*) 
show binlog events from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	1	#	drop database if exists mysqltest1

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

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

master-bin.000001	#	Query	1	#	create database mysqltest1

master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE TABLE t1 (a varchar(100))

master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest1.t1)
@@ -178,10 +184,6 @@ master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t1) 
master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest1.t1)

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

master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest1.t1)

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

master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest1.t1)

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

master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t1 values("work")

master-bin.000001	#	User var	1	#	@`string`=_latin1 0x656D657267656E6379 COLLATE latin1_swedish_ci

master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t1 select @'string'
@@ -269,4 +271,12 @@ master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t1) 
master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest1.t1)

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

master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest1.t2)

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

master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest1.t2)

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

master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest1.t2)

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

master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest1.t2)

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

drop database mysqltest1;

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ rpl_ndb_ddl : BUG#18946 result file needs update + test needs to ch 
rpl_ndb_innodb2ndb       : Bug #19710  Cluster replication to partition table fails on DELETE FROM statement

#rpl_ndb_log              : BUG#18947 2006-03-21 tomas CRBR: order in binlog of create table and insert (on different table) not determ

rpl_ndb_myisam2ndb       : Bug #19710  Cluster replication to partition table fails on DELETE FROM statement

rpl_switch_stm_row_mixed : BUG#18590 2006-03-28 brian

rpl_row_blob_innodb      : BUG#18980 2006-04-10 kent    Test fails randomly

rpl_row_func003          : BUG#19074 2006-13-04 andrei  test failed

rpl_sp                   : BUG#16456 2006-02-16 jmiller

mysql-test/t/rpl_switch_stm_row_mixed.test

+7 −0
Original line number Diff line number Diff line
@@ -154,6 +154,13 @@ call foo2(); 
select foo3();

select * from t1 where a="alarm";



# Test that INSERT DELAYED works in mixed mode

insert delayed into t2 values("delay_1_");

insert delayed into t2 values(concat("delay_2_",UUID()));

insert delayed into t2 values("delay_3_"),(concat("delay_4_",UUID())),("delay_5_");

insert delayed into t2 values("delay_6_");

sleep 4; # time for the delayed insert to reach disk



# If you want to do manual testing of the mixed mode regarding UDFs (not

# testable automatically as quite platform- and compiler-dependent),

# you just need to set the variable below to 1, and to

sql/sql_insert.cc

+3 −0
Original line number Diff line number Diff line
@@ -1290,6 +1290,9 @@ class delayed_insert :public ilink { 
    thd.command=COM_DELAYED_INSERT;

    thd.lex->current_select= 0; 		// for my_message_sql

    thd.lex->sql_command= SQLCOM_INSERT;        // For innodb::store_lock()

#ifdef HAVE_ROW_BASED_REPLICATION

    thd.set_current_stmt_binlog_row_based_if_mixed();

#endif



    bzero((char*) &thd.net, sizeof(thd.net));		// Safety

    bzero((char*) &table_list, sizeof(table_list));	// Safety