summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2021-09-22 08:30:05 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2021-09-22 08:30:05 +0300
commit74a6d45c849d6c318b1bdea69ff6acde00e7ee22 (patch)
treedcfa4c23f83c39f6f090b54e7545eaca64ee85b9
parent225564993972751e6db2ef510d3d0a29c2a037f6 (diff)
downloadmariadb-git-bb-10.7-galera.tar.gz
MDEV-26571 : galera_sr.GCF-627 MTR failed: Result length mismatchbb-10.7-galera
Test changes only: do not output mysql.wsrep_streaming_log contents.
-rw-r--r--mysql-test/suite/galera_sr/r/GCF-627.result12
-rw-r--r--mysql-test/suite/galera_sr/t/GCF-627.test8
2 files changed, 8 insertions, 12 deletions
diff --git a/mysql-test/suite/galera_sr/r/GCF-627.result b/mysql-test/suite/galera_sr/r/GCF-627.result
index 65d8c95ad08..7cd2ab63ff3 100644
--- a/mysql-test/suite/galera_sr/r/GCF-627.result
+++ b/mysql-test/suite/galera_sr/r/GCF-627.result
@@ -2,7 +2,6 @@ connection node_2;
connection node_1;
connection node_1;
CREATE TABLE t1 (f1 INTEGER, f2 VARCHAR(10)) ENGINE=InnoDB;
-CREATE TABLE t2 (f1 INTEGER);
SET SESSION wsrep_trx_fragment_size = 1;
SET AUTOCOMMIT=OFF;
START TRANSACTION;
@@ -16,9 +15,10 @@ connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
INSERT INTO t1 VALUES (2);
ERROR 42S02: Table 'test.t1' doesn't exist
connection node_1;
-SELECT * FROM mysql.wsrep_streaming_log;
-node_uuid trx_id seqno flags frag
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
+COUNT(*)
+0
connection node_2;
-SELECT * FROM mysql.wsrep_streaming_log;
-node_uuid trx_id seqno flags frag
-DROP TABLE t2;
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
+COUNT(*)
+0
diff --git a/mysql-test/suite/galera_sr/t/GCF-627.test b/mysql-test/suite/galera_sr/t/GCF-627.test
index ad351eb9da6..6990c12314d 100644
--- a/mysql-test/suite/galera_sr/t/GCF-627.test
+++ b/mysql-test/suite/galera_sr/t/GCF-627.test
@@ -1,9 +1,7 @@
--source include/galera_cluster.inc
---source include/have_innodb.inc
--connection node_1
CREATE TABLE t1 (f1 INTEGER, f2 VARCHAR(10)) ENGINE=InnoDB;
-CREATE TABLE t2 (f1 INTEGER);
SET SESSION wsrep_trx_fragment_size = 1;
SET AUTOCOMMIT=OFF;
@@ -25,11 +23,9 @@ INSERT INTO t1 VALUES (2);
--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log
--source include/wait_condition.inc
-SELECT * FROM mysql.wsrep_streaming_log;
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
--connection node_2
--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log
--source include/wait_condition.inc
-SELECT * FROM mysql.wsrep_streaming_log;
-
-DROP TABLE t2;
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;