Post-merge changes to make tests pass.

mysql-test/r/binlog_start_comment.result

-drop table if exists t1,t2;
-create table t1 (word varchar(20)) -- create table t1;
-create table t2 (word varchar(20)) -- create table t2;
-load data infile '../std_data_ln/words.dat' into table t1 -- load data to t1;
-insert into t2 values ("Ada");
-flush logs;
-select * from t2;
-word
-Ada
-flush logs;
-select * from t2;
-word
-Ada

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

@@ -125,7 +125,7 @@ Replicate_Ignore_Table
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
 Last_Errno	1364
-Last_Error	Could not execute Write_rows event on table test.t1_nodef; handler error <unknown>; the event's master log master-bin.000001, end_log_pos 2944
+Last_Error	Could not execute Write_rows event on table test.t1_nodef; handler error <unknown>; the event's master log master-bin.000001, end_log_pos 3692
 Skip_Counter	0
 Exec_Master_Log_Pos	#
 Relay_Log_Space	#
@@ -143,7 +143,7 @@ Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	0
 Last_IO_Error	
 Last_SQL_Errno	1364
-Last_SQL_Error	Could not execute Write_rows event on table test.t1_nodef; handler error <unknown>; the event's master log master-bin.000001, end_log_pos 2944
+Last_SQL_Error	Could not execute Write_rows event on table test.t1_nodef; handler error <unknown>; the event's master log master-bin.000001, end_log_pos 3692
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
 INSERT INTO t9 VALUES (2);

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

@@ -40,44 +40,6 @@ SELECT * FROM t1 ORDER BY n;
 t	n
 2004-01-01 00:00:00	5
 2004-06-11 09:39:02	6
-select * from t1;
-t
-2004-01-01 00:00:00
-2004-06-11 09:39:02
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
-/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
-DELIMITER /*!*/;
-ROLLBACK/*!*/;
-use test/*!*/;
-SET TIMESTAMP=100000000/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;
-SET @@session.sql_mode=0/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-create table t1 (t timestamp)
-/*!*/;
-SET TIMESTAMP=100000000/*!*/;
-create table t2 (t char(32))
-/*!*/;
-SET TIMESTAMP=100000000/*!*/;
-SET @@session.time_zone='Europe/Moscow'/*!*/;
-insert into t1 values ('20050101000000'), ('20050611093902')
-/*!*/;
-SET TIMESTAMP=100000000/*!*/;
-SET @@session.time_zone='UTC'/*!*/;
-insert into t1 values ('20040101000000'), ('20040611093902')
-/*!*/;
-SET TIMESTAMP=100000000/*!*/;
-delete from t1
-/*!*/;
-SET TIMESTAMP=100000000/*!*/;
-SET @@session.time_zone='Europe/Moscow'/*!*/;
-insert into t1 values ('20040101000000'), ('20040611093902')
-/*!*/;
-DELIMITER ;
-# End of log file
-ROLLBACK /* added by mysqlbinlog */;
-/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 delete from t1;
 set time_zone='UTC';
 load data infile '../std_data_ln/rpl_timezone2.dat' into table t1;

mysql-test/suite/rpl/t/rpl_row_sp005.test

@@ -86,11 +86,13 @@ connection master;
 CALL test.p1();
 let $wait_condition= SELECT COUNT(*) = 4 FROM t3;
 --source include/wait_condition.inc
+save_master_pos;
 SELECT * FROM test.t3 ORDER BY id3;
 
 let $message=< ---- Slave selects-- >;
 --source include/show_msg.inc
 connection slave;
+sync_with_master;
 SELECT * FROM test.t3 ORDER BY id3;
 
 connection master;

mysql-test/t/binlog_start_comment.test

-# Test case for bug#32205 Replaying statements from mysqlbinlog fails
-# with a syntax error, replicates fine
-
--- source include/have_log_bin.inc
---disable_warnings
-drop table if exists t1,t2;
---enable_warnings
-create table t1 (word varchar(20)) -- create table t1;
-create table t2 (word varchar(20)) -- create table t2;
-load data infile '../std_data_ln/words.dat' into table t1 -- load data to t1;
-insert into t2 values ("Ada");
-flush logs;
-select * from t2;
---exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 | $MYSQL
-flush logs;
-select * from t2;