Bug#21326745: ASSERTION FAILURE IN TEST RPL_GTID.RPL_SYNC_RELAY_LOG_INFO

 There are two types of assertion failures in test.
  1)In the test some operation is performed on master and
 on slave assertion is made whether the master_log_name
 and master_log_pos have got updated in mysql.slave_relay_log_info.
 The assertion is failng with the result that the master_log_file
 and position have not got synced since before the assertion is
 made the test doesn't guarantee whether the slave has synced it's
 IO_THREAD with the master.

  2) some times there is assertion failure in gtid_step_assert.inc.
 This file checks that n number of gtid's have been added since
 last call to gtid_executed was made. This assertion is failing
 since before the assertion is made the test doesn't guaratee
 whether the slave's IO_THREAD is in sync with the master.

 Fix: Replaced assert.inc with wait_condition.inc.
     Added sync_slave_io_with_master wherever necessary.

Author: Parveez Baig

mysql-test/extra/rpl_tests/rpl_sync_relay_log_info.inc

@@ -51,24 +51,28 @@ if ( `SELECT '$_storage_engine' <> 'INNODB' AND '$_storage_engine' <> 'MYISAM'`
 # 2 - Simple DDL
 --source include/rpl_connection_master.inc
 --eval CREATE TABLE t1 (c1 int PRIMARY KEY) ENGINE=$storage_engine
+--source include/sync_slave_io_with_master.inc
 --let $gtid_step_count= 1
 --source extra/rpl_tests/rpl_sync_relay_log_info_assert_pos.inc
 
 # 3 - Simple DML
 --source include/rpl_connection_master.inc
 INSERT INTO t1 VALUES (1);
+--source include/sync_slave_io_with_master.inc
 --let $gtid_step_count= 1
 --source extra/rpl_tests/rpl_sync_relay_log_info_assert_pos.inc
 
 # 4 - The master has flushed the binary log
 --source include/rpl_connection_master.inc
 FLUSH LOCAL BINARY LOGS;
+--source include/sync_slave_io_with_master.inc
 --let $gtid_step_count= 0
 --source extra/rpl_tests/rpl_sync_relay_log_info_assert_pos.inc
 
 # 5 - Simple DDL
 --source include/rpl_connection_master.inc
 DROP TABLE t1;
+--source include/sync_slave_io_with_master.inc
 --let $gtid_step_count= 1
 --source extra/rpl_tests/rpl_sync_relay_log_info_assert_pos.inc
 
@@ -172,6 +176,7 @@ SET DEBUG_SYNC= 'now SIGNAL continue_after_queue_event';
 # 18 - Simple DDL
 --source include/rpl_connection_master.inc
 DROP TABLE t1;
+--source include/sync_slave_io_with_master.inc
 --let $gtid_step_count= 1
 --source extra/rpl_tests/rpl_sync_relay_log_info_assert_pos.inc
 
@@ -181,6 +186,7 @@ if ($_storage_engine == "INNODB")
   # 19 - Simple DDL
   --source include/rpl_connection_master.inc
   --eval CREATE TABLE t1 (c1 int PRIMARY KEY) ENGINE=$storage_engine
+  --source include/sync_slave_io_with_master.inc
   --let $gtid_step_count= 1
   --source extra/rpl_tests/rpl_sync_relay_log_info_assert_pos.inc
 
@@ -256,6 +262,7 @@ if ($_storage_engine == "INNODB")
   # 25 - Simple DDL
   --source include/rpl_connection_master.inc
   DROP TABLE t1;
+  --source include/sync_slave_io_with_master.inc
   --let $gtid_step_count= 1
   --source extra/rpl_tests/rpl_sync_relay_log_info_assert_pos.inc
 }

mysql-test/extra/rpl_tests/rpl_sync_relay_log_info_assert_pos.inc

@@ -69,14 +69,14 @@ if ( $_rrli_expected == "N" )
 # If it was expected to be updated
 if ( $_rrli_expected == "U" )
 {
-  --let $assert_text= ($_rrli_subheader) SQL thread synced master binlog file
-  --let $assert_cond= [ SELECT Master_log_name = "$master_file" FROM mysql.slave_relay_log_info WHERE Channel_name = "" ]
-  --source include/assert.inc
+  --echo Wait until ($_rrli_subheader) SQL thread synced master binlog file
+  --let $wait_condition= SELECT Master_log_name = "$master_file" FROM mysql.slave_relay_log_info WHERE Channel_name = ""
+  --source include/wait_condition.inc
   --let $last_synced_master_file= $master_file
 
-  --let $assert_text= ($_rrli_subheader) SQL thread synced master binlog position
-  --let $assert_cond= [ SELECT Master_log_pos = "$master_pos" FROM mysql.slave_relay_log_info WHERE Channel_name = "" ]
-  --source include/assert.inc
+  --echo Wait until ($_rrli_subheader) SQL thread synced master binlog position
+  --let $wait_condition= SELECT Master_log_pos = "$master_pos" FROM mysql.slave_relay_log_info WHERE Channel_name = ""
+  --source include/wait_condition.inc
   --let $last_synced_master_pos= $master_pos
 }