bk commit into 5.1 tree (mats:1.2533)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-29 22:32:28+02:00, mats@romeo.(none) +2 -0
  Post-merge patch.

  mysql-test/t/binlog_stm_mix_innodb_myisam.test@stripped, 2007-03-29 22:32:18+02:00, mats@romeo.(none) +1 -1
    Position change

  sql/log_event.h@stripped, 2007-03-29 22:32:19+02:00, mats@romeo.(none) +1 -1
    Event number change

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mats
# Host:	romeo.(none)
# Root:	/home/bk/w3464-mysql-5.1-new-rpl

--- 1.143/sql/log_event.h	2007-03-29 22:32:55 +02:00
+++ 1.144/sql/log_event.h	2007-03-29 22:32:55 +02:00
@@ -490,7 +490,7 @@
   /*
     Something out of the ordinary happened on the master
    */
-  INCIDENT_EVENT= 23,
+  INCIDENT_EVENT= 26,
 
   /*
     Add new events here - right above this comment!

--- 1.8/mysql-test/t/binlog_stm_mix_innodb_myisam.test	2007-03-29 22:32:55 +02:00
+++ 1.9/mysql-test/t/binlog_stm_mix_innodb_myisam.test	2007-03-29 22:32:55 +02:00
@@ -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"))