bzr commit into mysql-next-mr-bugfixing branch (aelkin:3303) Bug#54935 WL#2540

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/2a-23May/mysql-next-mr-bugfixing/ based on revid:aelkin@stripped

 3303 Andrei Elkin	2010-07-15
       bug#54935 few tests with explicit log pos stand in the way wl#2540 merging
      
      Deploying an assert about expected ROLLBACK query instead of asking question wait_for macro

    modified:
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
=== modified file 'mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test'
--- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test	2010-07-09 14:42:00 +0000
+++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test	2010-07-15 14:42:30 +0000
@@ -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;
 


Attachment: [text/bzr-bundle] bzr/[e-mail]