Post-merge fixes to make tests pass.

mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result:
  Result file change.

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

@@ -17,7 +17,7 @@ ROLLBACK/*!*/;
 use test/*!*/;
 SET TIMESTAMP=10000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;
+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
 /*!\C latin1 *//*!*/;