manual merge for bug_29136, bug#29309.

mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test:
  manual merge from 5.0
mysql-test/r/innodb.result:
  results changed
mysql-test/r/multi_update.result:
  results changed
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  manual merge: results re-recorded
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  results changed
mysql-test/suite/manual/r/rpl_replication_delay.result:
  results recorded for 5.1
mysql-test/t/innodb.test:
  removing bug27716 regression test as one exists in binlog suite already.
mysql-test/t/multi_update.test:
  manual merge plus refining for execution in both binlog_format.
sql/log_event.cc:
  bloody manual merge;
  the fact that an event is artificial is encode with setting timestamp argument to zero.
  rli's last_master_timestamp won't be updated in stmt_done in such case.
sql/rpl_rli.cc:
  simulation and the real fixing code.
  Don't update last_master_timestamp with zero.
sql/sql_delete.cc:
  manual merge

1 files changed, 23 insertions, 8 deletions

diff --git a/mysql-test/suite/manual/r/rpl_replication_delay.result b/mysql-test/suite/manual/r/rpl_replication_delay.result
index 22447a30cba..a8fa6ce8265 100644
--- a/mysql-test/suite/manual/r/rpl_replication_delay.result
+++ b/mysql-test/suite/manual/r/rpl_replication_delay.result
@@ -11,7 +11,7 @@ Master_User	root
 Master_Port	9306
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	98
+Read_Master_Log_Pos	106
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -26,7 +26,7 @@ Replicate_Wild_Ignore_Table
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	98
+Exec_Master_Log_Pos	106
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -38,6 +38,11 @@ Master_SSL_Cert
 Master_SSL_Cipher	
 Master_SSL_Key	
 Seconds_Behind_Master	0
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
 drop table if exists t1;
 Warnings:
 Note	1051	Unknown table 't1'
@@ -52,7 +57,7 @@ Master_User	root
 Master_Port	9306
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	359
+Read_Master_Log_Pos	367
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -67,7 +72,7 @@ Replicate_Wild_Ignore_Table
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	271
+Exec_Master_Log_Pos	279
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -78,7 +83,12 @@ Master_SSL_CA_Path
 Master_SSL_Cert	
 Master_SSL_Cipher	
 Master_SSL_Key	
-Seconds_Behind_Master	10
+Seconds_Behind_Master	9
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
 unlock tables;
 flush logs /* this time rli->last_master_timestamp is not affected */;
 lock table t1 write;
@@ -90,7 +100,7 @@ Master_User	root
 Master_Port	9306
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	447
+Read_Master_Log_Pos	455
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -105,7 +115,7 @@ Replicate_Wild_Ignore_Table
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	359
+Exec_Master_Log_Pos	367
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -116,6 +126,11 @@ Master_SSL_CA_Path
 Master_SSL_Cert	
 Master_SSL_Cipher	
 Master_SSL_Key	
-Seconds_Behind_Master	6
+Seconds_Behind_Master	7
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
 unlock tables;
 drop table t1;