diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2010-07-16 21:25:38 +0300 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2010-07-16 21:25:38 +0300 |
| commit | 65ef0f418532a3b4ab19c8a08b7599e5517816ce (patch) | |
| tree | 502145dd74ae1e5a5909be39b4456fe08455014d /mysql-test/extra | |
| parent | 30e2c6f19be039f97af1770bd6e95e7527667b89 (diff) | |
| download | mariadb-git-65ef0f418532a3b4ab19c8a08b7599e5517816ce.tar.gz | |
bug#54935
applying bundle made for next-mr-bugfixing to trunk-bugfixing branch of the bug
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test | 8 |
1 files changed, 6 insertions, 2 deletions
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 414958414af..aaadda941fb 100644 --- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test +++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test @@ -322,9 +322,13 @@ connection con4; select get_lock("a",10); # wait for rollback to finish if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'`) { - --let $wait_binlog_event= ROLLBACK - --source include/wait_for_binlog_event.inc --let $binlog_rollback= query_get_value(SHOW BINLOG EVENTS, Pos, 7) + --let $binlog_query= query_get_value(SHOW BINLOG EVENTS, Info, 7) + if (`SELECT 'ROLLBACK' != '$binlog_query'`) { + --echo Wrong query from SHOW BINLOG EVENTS. Expected ROLLBACK, got '$binlog_query' + --source include/show_rpl_debug_info.inc + --die Wrong value for slave parameter + } } flush logs; |