summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2021-01-13 10:58:02 +0200
committerJan Lindström <jan.lindstrom@mariadb.com>2021-01-13 10:58:02 +0200
commit79086a5217bba5cb2a6da78a4a6be1bb0baf4a1e (patch)
tree999ea0b701540137deed41a877665423ee61c522
parent8de233af815f28d096ac4ff136525abc3ddc771d (diff)
downloadmariadb-git-bb-10.5-MDEV-24010.tar.gz
MDEV-24010 : galera_3nodes.GCF-354 MTR fails : WSREP has not yet prepared node for application usebb-10.5-MDEV-24010
Correct test.
-rw-r--r--mysql-test/suite/galera_3nodes/disabled.def1
-rw-r--r--mysql-test/suite/galera_3nodes/r/GCF-354.result7
-rw-r--r--mysql-test/suite/galera_3nodes/t/GCF-354.test7
3 files changed, 8 insertions, 7 deletions
diff --git a/mysql-test/suite/galera_3nodes/disabled.def b/mysql-test/suite/galera_3nodes/disabled.def
index d9b9df917d3..0e2706f2dc3 100644
--- a/mysql-test/suite/galera_3nodes/disabled.def
+++ b/mysql-test/suite/galera_3nodes/disabled.def
@@ -10,7 +10,6 @@
#
##############################################################################
-GCF-354 : MDEV-24010 galera_3nodes.GCF-354 MTR fails : WSREP has not yet prepared node for application use
galera_gtid_2_cluster : MDEV-23775 Galera test failure on galera_3nodes.galera_gtid_2_cluster
galera_ist_gcache_rollover : MDEV-23578 WSREP: exception caused by message: {v=0,t=1,ut=255,o=4,s=0,sr=0,as=1,f=6,src=50524cfe,srcvid=view_id(REG,50524cfe,4),insvid=view_id(UNKNOWN,00000000,0),ru=00000000,r=[-1,-1],fs=75,nl=(}
galera_slave_options_do :MDEV-8798
diff --git a/mysql-test/suite/galera_3nodes/r/GCF-354.result b/mysql-test/suite/galera_3nodes/r/GCF-354.result
index 1fa4265edcf..958c1d06538 100644
--- a/mysql-test/suite/galera_3nodes/r/GCF-354.result
+++ b/mysql-test/suite/galera_3nodes/r/GCF-354.result
@@ -6,13 +6,14 @@ connection node_1;
connection node_2;
connection node_3;
connection node_2;
-SET wsrep_on=OFF;
+SET SESSION wsrep_on=OFF;
DROP SCHEMA test;
connection node_3;
SET SESSION wsrep_on=OFF;
-CREATE TABLE test.t1 (f1 INTEGER) engine=innodb;
+CREATE TABLE test.t1 (f1 INTEGER NOT NULL PRIMARY KEY) engine=innodb;
connection node_1;
-CREATE TABLE test.t1 (f1 INTEGER) engine=innodb;
+CREATE TABLE test.t1 (f1 INTEGER NOT NULL PRIMARY KEY) engine=innodb;
+INSERT INTO test.t1 values (1);
SHOW STATUS LIKE 'wsrep_cluster_status';
Variable_name Value
wsrep_cluster_status Primary
diff --git a/mysql-test/suite/galera_3nodes/t/GCF-354.test b/mysql-test/suite/galera_3nodes/t/GCF-354.test
index d4e2bc095fa..ce0fd445f23 100644
--- a/mysql-test/suite/galera_3nodes/t/GCF-354.test
+++ b/mysql-test/suite/galera_3nodes/t/GCF-354.test
@@ -14,19 +14,20 @@
# 1. Create different inconsistencies on nodes 2 and 3
#
--connection node_2
-SET wsrep_on=OFF;
+SET SESSION wsrep_on=OFF;
DROP SCHEMA test;
--connection node_3
SET SESSION wsrep_on=OFF;
-CREATE TABLE test.t1 (f1 INTEGER) engine=innodb;
+CREATE TABLE test.t1 (f1 INTEGER NOT NULL PRIMARY KEY) engine=innodb;
#
# 2. The following should generate different errors on nodes 2 and 3 and
# trigger voting with 3 different votes. node_1 should remain alone
# in the cluster.
#
--connection node_1
-CREATE TABLE test.t1 (f1 INTEGER) engine=innodb;
+CREATE TABLE test.t1 (f1 INTEGER NOT NULL PRIMARY KEY) engine=innodb;
+INSERT INTO test.t1 values (1);
--let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
--source include/wait_condition.inc