After merge fix.

Adding "flush logs" to fix test failure.

mysql-test/extra/binlog_tests/ctype_ucs_binlog.test

@@ -14,6 +14,7 @@ show binlog events from 102;
 # more important than SHOW BINLOG EVENTS, mysqlbinlog (where we
 # absolutely need variables names to be quoted and strings to be
 # escaped).
+flush logs;
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 --exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 
 drop table t2;

mysql-test/r/binlog_row_ctype_ucs.result

@@ -7,6 +7,7 @@ show binlog events from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	102	Table_map	1	141	table_id: # (test.t2)
 master-bin.000001	141	Write_rows	1	231	table_id: # flags: STMT_END_F
+flush logs;
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;

mysql-test/r/binlog_stm_ctype_ucs.result

@@ -7,6 +7,7 @@ show binlog events from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	102	User var	1	142	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci
 master-bin.000001	142	Query	1	231	use `test`; insert into t2 values (@v)
+flush logs;
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;