diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-09 15:09:41 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-09 15:09:41 +0100 |
| commit | a15234bf4bf98d7833996284c033fc53a981f5d4 (patch) | |
| tree | d989b448854f9d59de5ca16b962414591c8a5b2e /mysql-test/suite/galera/r/galera_var_reject_queries.result | |
| parent | 9a6212008999da44b136605c1abf2cc9c7cc4b2c (diff) | |
| parent | e5e5877740f248de848219ee3a1d2881cd5c5b82 (diff) | |
| download | mariadb-git-a15234bf4bf98d7833996284c033fc53a981f5d4.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'mysql-test/suite/galera/r/galera_var_reject_queries.result')
| -rw-r--r-- | mysql-test/suite/galera/r/galera_var_reject_queries.result | 9 |
1 files changed, 7 insertions, 2 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 b95e5773830..1b2bc1c5e16 100644 --- a/mysql-test/suite/galera/r/galera_var_reject_queries.result +++ b/mysql-test/suite/galera/r/galera_var_reject_queries.result @@ -1,5 +1,10 @@ +<<<<<<< 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); connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1; connection node_1; @@ -7,14 +12,14 @@ SET SESSION wsrep_reject_queries = ALL; ERROR HY000: Variable 'wsrep_reject_queries' is a GLOBAL variable and should be set with SET GLOBAL SET GLOBAL wsrep_reject_queries = ALL; SELECT * FROM t1; -ERROR 08S01: WSREP has not yet prepared node for application use +Got one of the listed errors SET GLOBAL wsrep_reject_queries = ALL_KILL; connection node_1a; SELECT * FROM t1; Got one of the listed errors connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1; SELECT * FROM t1; -ERROR 08S01: WSREP has not yet prepared node for application use +Got one of the listed errors connection node_2; SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; VARIABLE_VALUE = 2 |