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, 6 insertions, 2 deletions

diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test
index 8b8132df84a..331663dceb5 100644
--- a/mysql-test/t/multi_update.test
+++ b/mysql-test/t/multi_update.test
@@ -588,6 +588,7 @@ CREATE TABLE `t2` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
 
 # as the test is about to see erroed queries in binlog
+set @sav_binlog_format=  @@session.binlog_format;
 set @@session.binlog_format= mixed;
 
 
@@ -614,6 +615,7 @@ show master status /* there must be the UPDATE query event */;
 
 # cleanup bug#27716
 drop table t1, t2;
+set @@session.binlog_format= @sav_binlog_format;
 
 #
 # Bug #29136  	erred multi-delete on trans table does not rollback 
@@ -642,11 +644,13 @@ delete t3.* from t2,t3 where t2.a=t3.a;
 # check
 select count(*) from t1 /* must be 1 */;
 select count(*) from t3 /* must be 1 */;
-# the query must be in binlog (no surprise though)
-source include/show_binlog_events.inc;
 
 # cleanup bug#29136
 drop table t1, t2, t3;
 
+#
+# Add further tests from here
+#
+
 
 --echo end of tests