bug#54935

applying bundle made for next-mr-bugfixing to trunk-bugfixing branch of the bug

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;