Small fixes for merge.

mysql-test/include/not_embedded.inc

 -- require r/not_embedded.require
 disable_query_log;
-select version() like N'%embedded%' as 'have_embedded';
+select version() like '%embedded%' as 'have_embedded';
 enable_query_log;
 

mysql-test/lib/mtr_cases.pl

@@ -534,7 +534,7 @@ sub collect_one_test_case($$$$$$$) {
 	 ! ( $tinfo->{'binlog_format'} eq $::used_binlog_format ) )
     {
       $tinfo->{'skip'}= 1;
-      $tinfo->{'comment'}= "Not running with binlog format '$tinfo->{'binlog_format'}'";
+      $tinfo->{'comment'}= "Requiring binlog format '$tinfo->{'binlog_format'}'";
       return;
     }
 
@@ -599,7 +599,7 @@ our @tags=
 (
  ["include/have_innodb.inc", "innodb_test", 1],
  ["include/have_binlog_format_row.inc", "binlog_format", "row"],
- ["include/have_binlog_format_statement.inc", "binlog_format", "stmt"],
+ ["include/have_binlog_format_statement.inc", "binlog_format", "statement"],
  ["include/have_binlog_format_mixed.inc", "binlog_format", "mixed"],
  ["include/big_test.inc", "big_test", 1],
  ["include/have_debug.inc", "need_debug", 1],

mysql-test/r/binlog_statement_insert_delayed.result

@@ -3,13 +3,13 @@ set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
 insert delayed into t1 values (207);
 insert delayed into t1 values (null);
 insert delayed into t1 values (300);
-show binlog events from 102;
+show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam
-master-bin.000001	#	Query	1	#	use `test`; insert delayed into t1 values (207)
-master-bin.000001	#	Intvar	1	#	INSERT_ID=208
-master-bin.000001	#	Query	1	#	use `test`; insert delayed into t1 values (null)
-master-bin.000001	#	Query	1	#	use `test`; insert delayed into t1 values (300)
+master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam
+master-bin.000001	#	Query	#	#	use `test`; insert delayed into t1 values (207)
+master-bin.000001	#	Intvar	#	#	INSERT_ID=208
+master-bin.000001	#	Query	#	#	use `test`; insert delayed into t1 values (null)
+master-bin.000001	#	Query	#	#	use `test`; insert delayed into t1 values (300)
 insert delayed into t1 values (null),(null),(null),(null);
 insert delayed into t1 values (null),(null),(400),(null);
 11 == 11

sql/event_db_repository.cc

@@ -940,7 +940,7 @@ update_timing_fields_for_event(THD *thd,
 
   if (update_last_executed)
   {
-    TIME time;
+    MYSQL_TIME time;
     my_tz_UTC->gmt_sec_to_TIME(&time, last_executed);
 
     fields[ET_FIELD_LAST_EXECUTED]->set_notnull();

sql/log.cc

@@ -574,7 +574,7 @@ bool Log_to_csv_event_handler::
       lock_time may be truncated without warning here, if greater than
       839 hours (~35 days)
     */
-    TIME t;
+    MYSQL_TIME t;
     t.neg= 0;
 
     /* fill in query_time field */