1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post-merge patch.

Browse Source 
mysql-test/t/binlog_stm_mix_innodb_myisam.test:
  Position change
sql/log_event.h:
  Event number change
This commit is contained in:
unknown 2007-03-29 22:32:28 +02:00
parent 2c86b5ad16
commit 85f7c6776b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/binlog_stm_mix_innodb_myisam.test
View File

@ -12,7 +12,7 @@
# ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction # ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction
# and does not make slave to stop) # and does not make slave to stop)
flush logs; 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 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
eval select eval select
(@a:=load_file("$MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output")) (@a:=load_file("$MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))

2
sql/log_event.h
View File

@ -490,7 +490,7 @@ enum Log_event_type
/* /*
Something out of the ordinary happened on the master Something out of the ordinary happened on the master
*/ */
INCIDENT_EVENT= 23, INCIDENT_EVENT= 26,
/* /*
Add new events here - right above this comment! Add new events here - right above this comment!