Commit 533cf795 authored by Mats Kindahl's avatar Mats Kindahl
Browse files

Manual merge of 5.1 into 5.1-rpl

parent 1f29c525

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

+14 −14
Original line number Diff line number Diff line
@@ -73,19 +73,19 @@ 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

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)

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

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

master-bin.000001	#	Query	#	#	COMMIT

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

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

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

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

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

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

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

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

mysqld-bin.000001	#	Query	#	#	BEGIN

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

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

mysqld-bin.000001	#	Write_rows	#	#	table_id: #

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

mysqld-bin.000001	#	Query	#	#	COMMIT

RESET MASTER;

DROP TABLE t1m, t1b, t1n;

mysql-test/suite/rpl/r/rpl_sp.result

+2 −2
Original line number Diff line number Diff line
@@ -555,11 +555,11 @@ end 
master-bin.000001	#	Query	1	#	use `mysqltest`; SELECT `mysqltest2`.`f1`()

set @@global.log_bin_trust_routine_creators= @old_log_bin_trust_routine_creators;

Warnings:

Warning	1287	The syntax 'log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use 'log_bin_trust_function_creators' instead

Warning	1287	The syntax '@@log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use '@@log_bin_trust_function_creators' instead

set @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators;

set @@global.log_bin_trust_routine_creators= @old_log_bin_trust_routine_creators;

Warnings:

Warning	1287	The syntax 'log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use 'log_bin_trust_function_creators' instead

Warning	1287	The syntax '@@log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use '@@log_bin_trust_function_creators' instead

set @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators;

drop database mysqltest;

drop database mysqltest2;