Merge 7.1->7.2

Author: frazerclement

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

@@ -113,7 +113,7 @@ server_id
 2
 4
 select
-count(1)
+@result:=count(1)
 from
 information_schema.global_status,
 mysql.ndb_apply_status
@@ -123,7 +123,7 @@ and
 variable_name='Ndb_slave_max_replicated_epoch'
     and
 variable_value = epoch;
-count(1)
+@result:=count(1)
 1
 Now make a new Cluster A change and see that the Max Replicated Epoch advances
 once it has propagated

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

@@ -184,7 +184,7 @@ insert into test.t1 values (3, "From the Sea");
 --echo New Slave server on Cluster A has loaded old Max-Replicated-Epoch
 select server_id from mysql.ndb_apply_status order by server_id;
 select
-    count(1)
+    @result:=count(1)
   from
     information_schema.global_status,
     mysql.ndb_apply_status
@@ -195,6 +195,73 @@ select
     and
     variable_value = epoch;
 
+# BEGIN TRANSIENT FAILURE DEBUGGING
+--disable_query_log
+--disable_result_log
+
+--let $res=query_get_value("SELECT @result AS r", r, 1)
+
+if (!$res)
+{
+  --echo I GOT PROBLEMS
+  --echo IF IN DOUBT, USE BRUTE FORCE
+  --enable_result_log
+  show variables like 'server_id';
+  show status like 'Ndb_slave_max_replicated_epoch';
+  select * from mysql.ndb_apply_status order by server_id;
+  select * from mysql.ndb_binlog_index;
+  SHOW SLAVE STATUS;
+  SHOW BINARY LOGS;
+  SHOW BINLOG EVENTS IN 'master-bin.000001';
+#  SHOW BINLOG EVENTS IN 'master-bin.000002';
+  let $MYSQLD_DATADIR= `select @@datadir;`;
+  --exec $MYSQL_BINLOG --verbose $MYSQLD_DATADIR/master-bin.000001
+#  --exec $MYSQL_BINLOG --verbose $MYSQLD_DATADIR/master-bin.000002
+  --connection master1
+  show variables like 'server_id';
+  show status like 'Ndb_slave_max_replicated_epoch';
+  select * from mysql.ndb_apply_status order by server_id;
+  select * from mysql.ndb_binlog_index;
+  SHOW SLAVE STATUS;
+  SHOW BINARY LOGS;
+  SHOW BINLOG EVENTS IN 'master-bin.000001';
+  SHOW BINLOG EVENTS IN 'master-bin.000002';
+  let $MYSQLD_DATADIR= `select @@datadir;`;
+  --exec $MYSQL_BINLOG --verbose $MYSQLD_DATADIR/master-bin.000001
+  --exec $MYSQL_BINLOG --verbose $MYSQLD_DATADIR/master-bin.000002
+  --connection slave
+  show variables like 'server_id';
+  show status like 'Ndb_slave_max_replicated_epoch';
+  select * from mysql.ndb_apply_status order by server_id;
+  select * from mysql.ndb_binlog_index;
+  SHOW SLAVE STATUS;
+  SHOW BINARY LOGS;
+  SHOW BINLOG EVENTS IN 'master-bin.000001';
+  SHOW BINLOG EVENTS IN 'master-bin.000002';
+  let $MYSQLD_DATADIR= `select @@datadir;`;
+  --exec $MYSQL_BINLOG --verbose $MYSQLD_DATADIR/master-bin.000001
+  --exec $MYSQL_BINLOG --verbose $MYSQLD_DATADIR/master-bin.000002
+  --connection slave1
+  show variables like 'server_id';
+  show status like 'Ndb_slave_max_replicated_epoch';
+  select * from mysql.ndb_apply_status order by server_id;
+  select * from mysql.ndb_binlog_index;
+  SHOW SLAVE STATUS;
+  SHOW BINARY LOGS;
+  SHOW BINLOG EVENTS IN 'master-bin.000001';
+#  SHOW BINLOG EVENTS IN 'master-bin.000002';
+  let $MYSQLD_DATADIR= `select @@datadir;`;
+  --exec $MYSQL_BINLOG --verbose $MYSQLD_DATADIR/master-bin.000001
+#  --exec $MYSQL_BINLOG --verbose $MYSQLD_DATADIR/master-bin.000002
+  --connection master
+  --disable_result_log
+}
+
+--enable_result_log
+--enable_query_log
+
+# END TRANSIENT FAILURE DEBUGGING
+
 --echo Now make a new Cluster A change and see that the Max Replicated Epoch advances
 --echo once it has propagated