BUG#24801209: RPL_GTID.RPL_GTID_TEMP_TABLE FAILS SPORADICALLY ON PB2

              IN DIFF_TABLES.INC

Problem
-------

The MTR test rpl_gtid.rpl_gtid_temp_table fails sporadically on
pushbuild on perpush as well as weekly/daily runs due to diff-
erence in table contents between master and slave being reported
by "include/diff_tables.inc".

Analysis
--------

The issue seems to be caused because of missing synchronization point
between master and slave after the workload and before the master/slave
diff tables check.

Fix
---

Added a master/slave synchronization before table diff checks.

Author: Joao Gramacho

mysql-test/suite/rpl/r/rpl_gtid_temp_table.result

@@ -1211,6 +1211,8 @@ END;
 DELETE FROM non_trans_table2;
 Got one of the listed errors
 DROP TRIGGER trigger1;
+include/sync_slave_sql_with_master.inc
+[connection master]
 include/diff_tables.inc [master:trans_table1, slave:trans_table1]
 include/diff_tables.inc [master:trans_table2, slave:trans_table2]
 include/diff_tables.inc [master:non_trans_table1, slave:non_trans_table1]

mysql-test/suite/rpl/t/rpl_gtid_temp_table.test

@@ -75,6 +75,10 @@ INSERT INTO non_trans_table2 VALUES (1);
 --let $func_or_trig_body=CREATE TEMPORARY TABLE tt1(i INT) ENGINE=MyISAM; DROP TEMPORARY TABLE IF EXISTS tt1; INSERT INTO trans_table1 VALUES (12);
 --source extra/rpl_tests/rpl_gtid_temp_table_in_func_or_trigger.inc
 
+# Sync slave with master before checking diff tables
+--source include/sync_slave_sql_with_master.inc
+--source include/rpl_connection_master.inc
+
 # Test that all Slave tables are in sync with Master tables
 --let $diff_tables=master:trans_table1, slave:trans_table1
 --source include/diff_tables.inc