diff options
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 | 6 |
1 files changed, 6 insertions, 0 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 22e2e6d764a..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,4 +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; |