Commit 85f7c677 authored by unknown's avatar unknown
Browse files

Post-merge patch. 


mysql-test/t/binlog_stm_mix_innodb_myisam.test:
  Position change
sql/log_event.h:
  Event number change
parent 2c86b5ad

mysql-test/t/binlog_stm_mix_innodb_myisam.test

+1 −1
Original line number Diff line number Diff line
@@ -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"))

sql/log_event.h

+1 −1
Original line number Diff line number Diff line
@@ -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!