From 3bc1cd58dd0a9b7458fc5c27f0cb65f2a95ca559 Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Fri, 24 Oct 2008 14:51:06 +0200 Subject: [PATCH] Manual merge of 5.1 into 5.1-rpl --- .../suite/binlog/r/binlog_multi_engine.result | 28 +++++++++---------- mysql-test/suite/rpl/r/rpl_sp.result | 4 +-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mysql-test/suite/binlog/r/binlog_multi_engine.result b/mysql-test/suite/binlog/r/binlog_multi_engine.result index 281e8785a8d..caae5f55d13 100644 --- a/mysql-test/suite/binlog/r/binlog_multi_engine.result +++ b/mysql-test/suite/binlog/r/binlog_multi_engine.result @@ -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 ; 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; diff --git a/mysql-test/suite/rpl/r/rpl_sp.result b/mysql-test/suite/rpl/r/rpl_sp.result index d1420d59af3..4a8a4050c02 100644 --- a/mysql-test/suite/rpl/r/rpl_sp.result +++ b/mysql-test/suite/rpl/r/rpl_sp.result @@ -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;