diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-09-29 14:16:23 +0300 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-09-29 14:16:23 +0300 |
| commit | 5983785ef4b04b865ea1d78c8d452642913a83f3 (patch) | |
| tree | f79e672485606b6da384195da6a4c1c6729ed362 /mysql-test/extra/binlog_tests | |
| parent | 5d2f79def9b67dd5400411070d47f8180ceb072b (diff) | |
| download | mariadb-git-5983785ef4b04b865ea1d78c8d452642913a83f3.tar.gz | |
WL#342 heartbeat
backporting from 6.0 code base to 5.1.
Diffstat (limited to 'mysql-test/extra/binlog_tests')
| -rw-r--r-- | mysql-test/extra/binlog_tests/binlog.test | 4 | ||||
| -rw-r--r-- | mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/extra/binlog_tests/binlog.test b/mysql-test/extra/binlog_tests/binlog.test index 5d898d41a54..08510d661e2 100644 --- a/mysql-test/extra/binlog_tests/binlog.test +++ b/mysql-test/extra/binlog_tests/binlog.test @@ -43,10 +43,10 @@ commit; drop table t1; --replace_column 2 # 5 # --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events in 'master-bin.000001' from 106; +show binlog events in 'master-bin.000001' from 107; --replace_column 2 # 5 # --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events in 'master-bin.000002' from 106; +show binlog events in 'master-bin.000002' from 107; # diff --git a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test index 5db79e4f848..da0b77fbc23 100644 --- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test +++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test @@ -323,12 +323,12 @@ let $MYSQLD_DATADIR= `select @@datadir`; # and does not make slave to stop) if (`select @@binlog_format = 'ROW'`) { - --exec $MYSQL_BINLOG --start-position=524 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output + --exec $MYSQL_BINLOG --start-position=525 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output } if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'`) { - --exec $MYSQL_BINLOG --start-position=555 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output + --exec $MYSQL_BINLOG --start-position=556 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output } --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR |