Bug#22084462:MYSQL TEST BINLOG.BINLOG_ROW_MIX_INNODB_MYISAM FAILS

Reason for failure:
The test case uses a subtest '/extra/binlog_tests/mix_innodb_myisam_binlog.test'.
Here,in the test for BUG#7947 section,it is creating some temporary tables using
connection 'con2' and then closing this connection and observing that the
'DROP TEMP TABLE' statements were properly binary logged.
It fails with a Result Content Mismatch because, on issuing the disconnection of
"con2", the test case does not wait until the server cleanup the thread for that
connection before updating the binary log events.

Fix:
Included include/assert_binlog_events.inc which waits for the binlog events and
also assert that the temporary tables were dropped.

'extra/binlog_tests/mix_innodb_myisam_binlog.test' subtest is used
in 'binlog_row_mix_innodb_myisam.test' and 'binlog_stm_mix_innodb_myisam.test'
Result files for both these tests('binlog_row_mix_innodb_myisam.result'
and 'binlog_stm_mix_innodb_myisam.result') are updated.

In include/assert_binlog_events.inc,the description of $slave_timeout
did not specify the unit of time.

Fix: Changed the decription in 'Usage' of assert_binlog_events.inc.

Author: Deepthi Eranti_Sreenivas

mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test

@@ -234,9 +234,20 @@ set autocommit=1;
 insert into t0 select GET_LOCK("lock1",null);
 set autocommit=0;
 create table t2 (n int) engine=innodb;
-insert into t2 values (3); 
+insert into t2 values (3);
+# Saving the binlog filename and position
+--source include/save_binlog_position.inc
 disconnect con2;
+# Wait until con2 disconnects
+--source include/wait_until_disconnected.inc
 connection con3;
+# Bug #22084462 - MYSQL TEST BINLOG.BINLOG_ROW_MIX_INNODB_MYISAM FAILS
+# Wait to ensure that drop temporary tables events
+# are present in binary log.
+--let $event_sequence= (Anonymous_)?Gtid # !Q(DROP.*TEMPORARY.*) # (Anonymous_)?Gtid # !Q(DROP.*TEMPORARY.*)
+--let $limit= 0,4
+--let $wait_for_binlog_events= 1
+--source include/assert_binlog_events.inc
 select get_lock("lock1",60);
 source include/show_binlog_events.inc;
 do release_lock("lock1");

mysql-test/include/assert_binlog_events.inc

@@ -116,7 +116,9 @@
 #     the expected events. The timeout is given by $slave_timeout.
 #
 #   $slave_timeout
-#     Timeout used if $wait_for_binlog_events is enabled.
+#     Default timeout used if $wait_for_binlog_events is enabled.
+#     The default timeout is 300 seconds. You can change the timeout by
+#     setting $slave_timeout. The unit for time is seconds.
 #
 #   $rpl_debug
 #     Print lots of debug info.
@@ -171,6 +173,7 @@ if ($wait_for_binlog_events)
 {
   --let $_abe_counter= 0
   --let $_abe_timeout= $slave_timeout
+  # Wait 300 seconds for binlog events
   if (!$_abe_timeout)
   {
     --let $_abe_timeout= 300

mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result

@@ -260,6 +260,8 @@ insert into t0 select GET_LOCK("lock1",null);
 set autocommit=0;
 create table t2 (n int) engine=innodb;
 insert into t2 values (3);
+include/save_binlog_position.inc
+include/assert_binlog_events.inc [(Anonymous_)?Gtid # !Q(DROP.*TEMPORARY.*) # (Anonymous_)?Gtid # !Q(DROP.*TEMPORARY.*)]
 select get_lock("lock1",60);
 get_lock("lock1",60)
 1

mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result

@@ -252,6 +252,8 @@ Note	1592	Unsafe statement written to the binary log using statement format sinc
 set autocommit=0;
 create table t2 (n int) engine=innodb;
 insert into t2 values (3);
+include/save_binlog_position.inc
+include/assert_binlog_events.inc [(Anonymous_)?Gtid # !Q(DROP.*TEMPORARY.*) # (Anonymous_)?Gtid # !Q(DROP.*TEMPORARY.*)]
 select get_lock("lock1",60);
 get_lock("lock1",60)
 1