Bug#36475850 ndb_rpl_log_updates and ndb_rpl_log_updates_filter fails in

PB2

Test does not wait for data changes to be replicated before performing
validations. The only wait is for own server to binlog the changes and
that does not mean it has been replicated to the other clusters.

Fix by waiting for DDL and DML changes to propagate through the
replication topology before  performing validations. Remove wait for own
server to binlog.

Removed fix for ndb_rpl_log_updates_filter as part of backporting.

Change-Id: Iad4ed872453bfa1cfcdcbbaf5127e77f47a249a0
(cherry picked from commit eabdbb8e70c9df9c56cf90fcf6f00ed0f9b2c851)

Author: blaudden

mysql-test/suite/ndb_rpl/r/ndb_rpl_log_updates.result

@@ -18,19 +18,19 @@ include/rpl_connect.inc [creating replica.7]
 [connection source.1]
 CREATE TABLE t1 (k INT PRIMARY KEY, c CHAR) ENGINE = NDB;
 INSERT INTO t1 VALUES (1, 'a');
-# Wait for ndb_binlog thread...
+# Sync the replication topology (propagates the table to all clusters)
+include/rpl/sync.inc
 [connection source.2]
 INSERT INTO t1 VALUES (2, 'b');
-# Wait for ndb_binlog thread...
 [connection source.4]
 SET sql_log_bin= OFF;
 INSERT INTO t1 VALUES (3, 'c');
 SET sql_log_bin= ON;
 INSERT INTO t1 VALUES (4, 'd');
-# Wait for ndb_binlog thread...
 [connection source.5]
 INSERT INTO t1 VALUES (5, 'e');
-# Wait for ndb_binlog thread...
+# Sync the replication topology (propagates the data changes)
+include/rpl/sync.inc
 [connection replica.3]
 SELECT * FROM t1 ORDER BY k;
 k	c

mysql-test/suite/ndb_rpl/t/ndb_rpl_log_updates.test

@@ -45,25 +45,29 @@
 --source include/rpl_connection.inc
 CREATE TABLE t1 (k INT PRIMARY KEY, c CHAR) ENGINE = NDB;
 INSERT INTO t1 VALUES (1, 'a');
---source suite/ndb/include/ndb_binlog_wait_own_changes.inc
+
+--echo # Sync the replication topology (propagates the table to all clusters)
+--let $use_gtids=0
+--source include/rpl_sync.inc
 
 --let $rpl_connection_name= source.2
 --source include/rpl_connection.inc
 INSERT INTO t1 VALUES (2, 'b');
---source suite/ndb/include/ndb_binlog_wait_own_changes.inc
 
 --let $rpl_connection_name= source.4
 --source include/rpl_connection.inc
 SET sql_log_bin= OFF;
 INSERT INTO t1 VALUES (3, 'c');
 SET sql_log_bin= ON;
 INSERT INTO t1 VALUES (4, 'd');
---source suite/ndb/include/ndb_binlog_wait_own_changes.inc
 
 --let $rpl_connection_name= source.5
 --source include/rpl_connection.inc
 INSERT INTO t1 VALUES (5, 'e');
---source suite/ndb/include/ndb_binlog_wait_own_changes.inc
+
+--echo # Sync the replication topology (propagates the data changes)
+--let $use_gtids=0
+--source include/rpl_sync.inc
 
 # Verify replica.3
 --let $rpl_connection_name= replica.3