From 85f7c6776b0f2da322bacf07b878db3fdd453d83 Mon Sep 17 00:00:00 2001
From: unknown <mats@romeo.(none)>
Date: Thu, 29 Mar 2007 22:32:28 +0200
Subject: [PATCH] Post-merge patch.

mysql-test/t/binlog_stm_mix_innodb_myisam.test:
  Position change
sql/log_event.h:
  Event number change
---
 mysql-test/t/binlog_stm_mix_innodb_myisam.test | 2 +-
 sql/log_event.h                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/t/binlog_stm_mix_innodb_myisam.test b/mysql-test/t/binlog_stm_mix_innodb_myisam.test
index 72651c13be7..4069cda0406 100644
--- a/mysql-test/t/binlog_stm_mix_innodb_myisam.test
+++ b/mysql-test/t/binlog_stm_mix_innodb_myisam.test
@@ -12,7 +12,7 @@
 # ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction
 # and does not make slave to stop)
 flush logs;
---exec $MYSQL_BINLOG --start-position=555 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output
+--exec $MYSQL_BINLOG --start-position=556 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval select
 (@a:=load_file("$MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
diff --git a/sql/log_event.h b/sql/log_event.h
index 4fe315343f9..500f3533c92 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -490,7 +490,7 @@ enum Log_event_type
   /*
     Something out of the ordinary happened on the master
    */
-  INCIDENT_EVENT= 23,
+  INCIDENT_EVENT= 26,
 
   /*
     Add new events here - right above this comment!