2 files changed, 26 insertions, 24 deletions
diff --git a/mysql-test/suite/galera_sr/r/GCF-1008.result b/mysql-test/suite/galera_sr/r/GCF-1008.result
index 541ac3cddfb..f55f6f33f3e 100644
--- a/mysql-test/suite/galera_sr/r/GCF-1008.result
+++ b/mysql-test/suite/galera_sr/r/GCF-1008.result
@@ -13,26 +13,26 @@ connection node_2;
 COMMIT;
 connection node_2b;
 SET SESSION wsrep_sync_wait = 0;
-SELECT COUNT(*) = 0 FROM t1;
-COUNT(*) = 0
-1
+SELECT COUNT(*) AS EXPECT_0 FROM t1;
+EXPECT_0
+0
 connection node_1;
 SET SESSION wsrep_sync_wait = 0;
 SET SESSION wsrep_trx_fragment_size = 1;
-SELECT COUNT(*) = 1 FROM t1;
-COUNT(*) = 1
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
+EXPECT_1
 1
 REPLACE INTO t1 VALUES (1,'y');
 connection node_2b;
-SELECT COUNT(*) = 0 FROM t1;
-COUNT(*) = 0
-1
+SELECT COUNT(*) AS EXPECT_0 FROM t1;
+EXPECT_0
+0
 connection node_2a;
 SET GLOBAL wsrep_provider_options = 'signal=before_local_commit_monitor_enter';
 SET GLOBAL wsrep_provider_options = 'dbug=';
 connection node_2;
-SELECT COUNT(*) = 1 FROM t1;
-COUNT(*) = 1
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
+EXPECT_1
 1
 DROP TABLE t1;
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(255)) ENGINE=InnoDB;
@@ -46,25 +46,25 @@ connection node_2;
 COMMIT;
 connection node_2b;
 SET SESSION wsrep_sync_wait = 0;
-SELECT COUNT(*) = 0 FROM t1;
-COUNT(*) = 0
-1
+SELECT COUNT(*) AS EXPECT_0 FROM t1;
+EXPECT_0
+0
 connection node_1;
 SET SESSION wsrep_sync_wait = 0;
 SET SESSION wsrep_trx_fragment_size = 1;
-SELECT COUNT(*) = 1 FROM t1;
-COUNT(*) = 1
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
+EXPECT_1
 1
 REPLACE INTO t1 VALUES (1,'y');
 connection node_2b;
-SELECT COUNT(*) = 0 FROM t1;
-COUNT(*) = 0
-1
+SELECT COUNT(*) AS EXPECT_0 FROM t1;
+EXPECT_0
+0
 connection node_2a;
 SET GLOBAL wsrep_provider_options = 'signal=before_certify_apply_monitor_enter';
 SET GLOBAL wsrep_provider_options = 'dbug=';
 connection node_2;
-SELECT COUNT(*) = 1 FROM t1;
-COUNT(*) = 1
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
+EXPECT_1
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/t/GCF-1008.inc b/mysql-test/suite/galera_sr/t/GCF-1008.inc
index 69245b3a91f..a6351243516 100644
--- a/mysql-test/suite/galera_sr/t/GCF-1008.inc
+++ b/mysql-test/suite/galera_sr/t/GCF-1008.inc
@@ -14,16 +14,16 @@ INSERT INTO t1 VALUES (1, 'x');
 --connection node_2b
 --sleep 1
 SET SESSION wsrep_sync_wait = 0;
-SELECT COUNT(*) = 0 FROM t1;
+SELECT COUNT(*) AS EXPECT_0 FROM t1;
 
 --connection node_1
 SET SESSION wsrep_sync_wait = 0;
 SET SESSION wsrep_trx_fragment_size = 1;
-SELECT COUNT(*) = 1 FROM t1;
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
 REPLACE INTO t1 VALUES (1,'y');
 
 --connection node_2b
-SELECT COUNT(*) = 0 FROM t1;
+SELECT COUNT(*) AS EXPECT_0 FROM t1;
 
 --connection node_2a
 --source include/galera_signal_sync_point.inc
@@ -31,6 +31,8 @@ SELECT COUNT(*) = 0 FROM t1;
 
 --connection node_2
 --reap
-SELECT COUNT(*) = 1 FROM t1;
+--let $wait_condition = SELECT COUNT(*) = 1 FROM t1;
+--source include/wait_condition.inc
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
 
 DROP TABLE t1;