MDEV-23617 : galera_sr.galera_sr_rollback_retry MTR failed: 1213: Dea…

…dlock found when trying to get lock

Add corrected wait_condition to wait until rows are in streaming
replication log.

mysql-test/suite/galera_sr/r/galera_sr_rollback_retry.result

@@ -11,10 +11,11 @@ INSERT INTO t1 VALUES (3);
 INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
 connection node_2;
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 connection node_1;
 ROLLBACK;
 connection node_2;
+SELECT * FROM t1;
+f1
 SET AUTOCOMMIT=OFF;
 START TRANSACTION;
 INSERT INTO t1 VALUES (1);
@@ -23,11 +24,11 @@ INSERT INTO t1 VALUES (3);
 INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
 COMMIT;
-SELECT COUNT(*) = 5 FROM t1;
-COUNT(*) = 5
-1
+SELECT COUNT(*) AS EXPECT_5 FROM t1;
+EXPECT_5
+5
 connection node_1;
-SELECT COUNT(*) = 5 FROM t1;
-COUNT(*) = 5
-1
+SELECT COUNT(*) AS EXPECT_5 FROM t1;
+EXPECT_5
+5
 DROP TABLE t1;

mysql-test/suite/galera_sr/t/galera_sr_rollback_retry.test

@@ -19,8 +19,7 @@ INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
 
 --connection node_2
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
---let $wait_condition = SELECT COUNT(*) > 0 FROM t1;
+--let $wait_condition = SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log
 --source include/wait_condition.inc
 
 --connection node_1
@@ -33,6 +32,7 @@ ROLLBACK;
 --connection node_2
 --let $wait_condition = SELECT COUNT(*) = 0 FROM t1;
 --source include/wait_condition.inc
+SELECT * FROM t1;
 
 #
 # It should be possible to reissue the same transaction against node #2
@@ -47,9 +47,11 @@ INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
 COMMIT;
 
-SELECT COUNT(*) = 5 FROM t1;
+SELECT COUNT(*) AS EXPECT_5 FROM t1;
 
 --connection node_1
-SELECT COUNT(*) = 5 FROM t1;
+--let $wait_condition = SELECT COUNT(*) = 5 FROM t1;
+--source include/wait_condition.inc
+SELECT COUNT(*) AS EXPECT_5 FROM t1;
 
 DROP TABLE t1;