diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-10-06 13:49:07 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-10-07 11:05:58 +0300 |
| commit | 96b4a5a6484148778facf95cd8b2be17f47c4da7 (patch) | |
| tree | d7aa2ba6673a996943842ab3d28bcd426a021d4f /mysql-test/suite/galera/r | |
| parent | a75813d46739f1e3aea9821b163c0ff1332a017e (diff) | |
| download | mariadb-git-96b4a5a6484148778facf95cd8b2be17f47c4da7.tar.gz | |
Fix galera_var_reject_queries test case
Diffstat (limited to 'mysql-test/suite/galera/r')
| -rw-r--r-- | mysql-test/suite/galera/r/galera_var_reject_queries.result | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/mysql-test/suite/galera/r/galera_var_reject_queries.result b/mysql-test/suite/galera/r/galera_var_reject_queries.result index 1b2bc1c5e16..33ee9262638 100644 --- a/mysql-test/suite/galera/r/galera_var_reject_queries.result +++ b/mysql-test/suite/galera/r/galera_var_reject_queries.result @@ -1,11 +1,6 @@ -<<<<<<< HEAD connection node_2; connection node_1; -||||||| merged common ancestors -======= -call mtr.add_suppression("WSREP has not yet prepared node for application use"); ->>>>>>> 10.3 -CREATE TABLE t1 (f1 INTEGER); +CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY) engine=innodb; connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1; connection node_1; SET SESSION wsrep_reject_queries = ALL; @@ -27,7 +22,7 @@ VARIABLE_VALUE = 2 INSERT INTO t1 VALUES (1); connect node_1c, 127.0.0.1, root, , test, $NODE_MYPORT_1; SET GLOBAL wsrep_reject_queries = NONE; -SELECT COUNT(*) = 1 FROM t1; -COUNT(*) = 1 +SELECT COUNT(*) AS EXPECT_1 FROM t1; +EXPECT_1 1 DROP TABLE t1; |