Bug#26414532: MYSQLRPLSYNC ERRORS OUT BECAUSE SLAVE IS USING

--SUPER-READ-ONLY OPTION

Post push fix to address test issue.

Author: Sujatha Sivakumar

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

@@ -3,11 +3,13 @@ Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
+include/rpl_reset.inc
 [connection slave]
 call mtr.add_suppression("You need to use --log-bin*");
 SET @saved_value_super= @@GLOBAL.super_read_only;
 SET @saved_value= @@GLOBAL.read_only;
 SET GLOBAL super_read_only= 1;
+include/assert.inc ['gtid_executed_compression_period global variable is set to 5']
 [connection master]
 CREATE TABLE t1(a INT) ENGINE=INNODB;
 INSERT INTO t1 VALUES(1);
@@ -17,7 +19,12 @@ INSERT INTO t1 VALUES(4);
 DROP TABLE t1;
 include/sync_slave_sql_with_master.inc
 #
-# Verify that gtid_executed table has MASTER_UUID:1:6
+# connection slave
+#
+include/assert.inc [committed gtids MASTER_UUID:1-6]
+#
+# Wait till gtid_executed table has one row and verify that
+# it is MASTER_UUID:1:6
 #
 SELECT * FROM mysql.gtid_executed;
 source_uuid	interval_start	interval_end

mysql-test/suite/rpl/t/rpl_gtid_compress_thd_ignore_super_read_only-slave.opt

@@ -1 +1 @@
---skip-log-bin --gtid_executed_compression_period=5
+--skip-log-bin --gtid_executed_compression_period=5 --log-slave-updates=false

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

@@ -33,12 +33,18 @@
 # to rerun it for every format.
 --source include/have_binlog_format_row.inc
 --source include/master-slave.inc
+# Clear gtid_executed table.
+--source include/rpl_reset.inc
 
 --source include/rpl_connection_slave.inc
 call mtr.add_suppression("You need to use --log-bin*");
 SET @saved_value_super= @@GLOBAL.super_read_only;
 SET @saved_value= @@GLOBAL.read_only;
 SET GLOBAL super_read_only= 1;
+--let $assert_cond = "[SELECT @@GLOBAL.gtid_executed_compression_period]" = 5
+--let $assert_text = 'gtid_executed_compression_period global variable is set to 5'
+--source include/assert.inc
+
 
 --source include/rpl_connection_master.inc
 --let $master_uuid= `SELECT @@GLOBAL.SERVER_UUID`
@@ -51,8 +57,18 @@ DROP TABLE t1;
 --source include/sync_slave_sql_with_master.inc
 
 --echo #
---echo # Verify that gtid_executed table has MASTER_UUID:1:6
+--echo # connection slave
+--echo #
+--let $assert_text= committed gtids MASTER_UUID:1-6
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$master_uuid:1-6"
+--source include/assert.inc
+
+--echo #
+--echo # Wait till gtid_executed table has one row and verify that
+--echo # it is MASTER_UUID:1:6
 --echo #
+let $wait_condition = SELECT count(*) = 1 FROM mysql.gtid_executed;
+--source include/wait_condition.inc
 --replace_result $master_uuid MASTER_UUID
 SELECT * FROM mysql.gtid_executed;