mirror of
https://github.com/MariaDB/server.git
synced 2025-01-28 01:34:17 +01:00
Post-merge patch.
mysql-test/t/binlog_stm_mix_innodb_myisam.test: Position change sql/log_event.h: Event number change
This commit is contained in:
parent
2c86b5ad16
commit
85f7c6776b
2 changed files with 2 additions and 2 deletions
|
@ -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"))
|
||||
|
|
|
@ -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!
|
||||
|
|
Loading…
Add table
Reference in a new issue