diff options
author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-08-23 17:14:13 +0300 |
---|---|---|
committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-08-23 17:14:13 +0300 |
commit | e4ec889c21ef24fbdfef3d0a36828807241877da (patch) | |
tree | 41eb54838e6b6277cb02d0ec3cf7ec0866d78103 /mysql-test/suite/galera/r/galera_var_max_ws_rows.result | |
parent | d6d63f4844bf87adb6250d1b1d43e86feab9a5d0 (diff) | |
parent | 420cfe4efe72674d4291c0d5a46205ab70b6b91c (diff) | |
download | mariadb-git-e4ec889c21ef24fbdfef3d0a36828807241877da.tar.gz |
Merge remote-tracking branch 'wsrep/10.3_wsrep_api-26' into 10.4bb-10.4-galera-jantmp
Conflicts:
mysql-test/include/check-testcase.test
mysql-test/include/wait_until_connected_again.inc
mysql-test/suite/galera/disabled.def
mysql-test/suite/galera/r/MW-416.result
mysql-test/suite/galera/r/galera#500.result
mysql-test/suite/galera/r/galera_var_dirty_reads.result
mysql-test/suite/galera/t/MW-416.test
mysql-test/suite/galera/t/galera#500.test
sql/handler.cc
sql/item_strfunc.cc
sql/item_strfunc.h
sql/slave.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_connect.cc
sql/sql_insert.cc
sql/sql_parse.cc
sql/sql_plugin.cc
sql/sql_prepare.cc
sql/wsrep_applier.cc
sql/wsrep_mysqld.cc
sql/wsrep_mysqld.h
sql/wsrep_sst.cc
sql/wsrep_thd.cc
storage/innobase/handler/ha_innodb.cc
Diffstat (limited to 'mysql-test/suite/galera/r/galera_var_max_ws_rows.result')
-rw-r--r-- | mysql-test/suite/galera/r/galera_var_max_ws_rows.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/galera/r/galera_var_max_ws_rows.result b/mysql-test/suite/galera/r/galera_var_max_ws_rows.result index 6bf67a3fb60..16e868f0485 100644 --- a/mysql-test/suite/galera/r/galera_var_max_ws_rows.result +++ b/mysql-test/suite/galera/r/galera_var_max_ws_rows.result @@ -1,3 +1,5 @@ +connection node_2; +connection node_1; CREATE TABLE ten (f1 INTEGER) ENGINE=InnoDB; INSERT INTO ten VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); CREATE TABLE t1 (f1 INTEGER AUTO_INCREMENT PRIMARY KEY, f2 INTEGER) ENGINE=InnoDB; |