rpl_parallel_multilevel2 can be 1 or 3 binlog groups

Author: grooverdan

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

@@ -47,18 +47,18 @@ include/sync_with_master_gtid.inc
 SELECT * FROM t1 ORDER BY a;
 a	b
 1	10
-SELECT variable_value - @group_commits FROM information_schema.global_status
-WHERE variable_name = 'binlog_group_commits';
-variable_value - @group_commits
-3
+SELECT IF((commits.variable_value - @group_commits) IN (1,3), "OK", "Not 1 or 3 groups"),
+((commits.variable_value - @group_commits) - (reason_usec.variable_value - @group_commit_reason_usec)) as diff
+FROM information_schema.global_status commits
+JOIN  information_schema.global_status reason_usec
+WHERE commits.variable_name = 'binlog_group_commits'
+ AND reason_usec.variable_name = 'binlog_group_commit_reason_usec';
+IF((commits.variable_value - @group_commits) IN (1,3), "OK", "Not 1 or 3 groups")	diff
+OK	0
 SELECT variable_value - @group_commit_reason_count FROM information_schema.global_status
 WHERE variable_name = 'binlog_group_commit_reason_count';
 variable_value - @group_commit_reason_count
 0
-SELECT variable_value - @group_commit_reason_usec FROM information_schema.global_status
-WHERE variable_name = 'binlog_group_commit_reason_usec';
-variable_value - @group_commit_reason_usec
-3
 SELECT variable_value - @group_commit_reason_transaction FROM information_schema.global_status
 WHERE variable_name = 'binlog_group_commit_reason_transaction';
 variable_value - @group_commit_reason_transaction

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

@@ -76,12 +76,14 @@ SELECT * FROM t1 ORDER BY a;
 
 # Measure status(es)
 --connection server_2
-SELECT variable_value - @group_commits FROM information_schema.global_status
- WHERE variable_name = 'binlog_group_commits';
+SELECT IF((commits.variable_value - @group_commits) IN (1,3), "OK", "Not 1 or 3 groups"),
+ ((commits.variable_value - @group_commits) - (reason_usec.variable_value - @group_commit_reason_usec)) as diff
+ FROM information_schema.global_status commits
+ JOIN  information_schema.global_status reason_usec
+ WHERE commits.variable_name = 'binlog_group_commits'
+ AND reason_usec.variable_name = 'binlog_group_commit_reason_usec';
 SELECT variable_value - @group_commit_reason_count FROM information_schema.global_status
  WHERE variable_name = 'binlog_group_commit_reason_count';
-SELECT variable_value - @group_commit_reason_usec FROM information_schema.global_status
- WHERE variable_name = 'binlog_group_commit_reason_usec';
 SELECT variable_value - @group_commit_reason_transaction FROM information_schema.global_status
  WHERE variable_name = 'binlog_group_commit_reason_transaction';
 SELECT variable_value - @group_commit_reason_immediate FROM information_schema.global_status