- commits - lists.mariadb.org

[Commits] be5017909d8: MDEV-17801: Galera test failure on galera_var_reject_queries
by jan 22 Nov '18

22 Nov '18

revision-id: be5017909d8b158b5f8e522643fb94585c67ca38 (mariadb-10.2.19-18-gbe5017909d8) parent(s): 669a8de455007e68d4eb7942171edaaad3cb1d6c author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-22 16:30:20 +0200 message: MDEV-17801: Galera test failure on galera_var_reject_queries Problem was that controlling connection i.e. connection that executed the query SET GLOBAL wsrep_reject_queries = ALL_KILL; was also killed but server would try to send result from that query to controlling connection resulting a assertion mysqld: /home/jan/mysql/10.2-sst/include/mysql/psi/mysql_socket.h:738: inline_mysql_socket_send: Assertion `mysql_socket.fd != -1' failed. as socket was closed when controlling connection was closed. wsrep_close_client_connections() Do not close controlling connection and instead of wsrep_close_thread() we do now soft kill by THD::awake wsrep_reject_queries_update() Call wsrep_close_client_connections using current thd. --- .../galera/r/galera_var_reject_queries.result | 1 - .../suite/galera/t/galera_var_reject_queries.test | 7 +++++-- sql/wsrep_mysqld.cc | 22 +++++++++++++++++++--- sql/wsrep_mysqld.h | 4 ++-- sql/wsrep_var.cc | 3 ++- 5 files changed, 28 insertions(+), 9 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 98380238fcb..caf98566595 100644 --- a/mysql-test/suite/galera/r/galera_var_reject_queries.result +++ b/mysql-test/suite/galera/r/galera_var_reject_queries.result @@ -7,7 +7,6 @@ SET GLOBAL wsrep_reject_queries = ALL; SELECT * FROM t1; ERROR 08S01: WSREP has not yet prepared node for application use SET GLOBAL wsrep_reject_queries = ALL_KILL; -ERROR HY000: Lost connection to MySQL server during query connection node_1a; SELECT * FROM t1; Got one of the listed errors diff --git a/mysql-test/suite/galera/t/galera_var_reject_queries.test b/mysql-test/suite/galera/t/galera_var_reject_queries.test index 6859855c35f..8b80c04e3be 100644 --- a/mysql-test/suite/galera/t/galera_var_reject_queries.test +++ b/mysql-test/suite/galera/t/galera_var_reject_queries.test @@ -18,8 +18,11 @@ SET GLOBAL wsrep_reject_queries = ALL; --error ER_UNKNOWN_COM_ERROR SELECT * FROM t1; -# Lost connection ---error 2013 +# +# Original behavior was lost connection, +# but since 10.1, we allow controlling connection to remain alive +# +--error 0,2013 SET GLOBAL wsrep_reject_queries = ALL_KILL; --connection node_1a diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index da5042ee16d..aa9a5460049 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -2270,7 +2270,7 @@ int wsrep_wait_committing_connections_close(int wait_time) } -void wsrep_close_client_connections(my_bool wait_to_end) +void wsrep_close_client_connections(my_bool wait_to_end, THD *except_caller_thd) { /* First signal all threads that it's time to die @@ -2292,6 +2292,12 @@ void wsrep_close_client_connections(my_bool wait_to_end) if (!is_client_connection(tmp)) continue; + if (tmp == except_caller_thd) + { + DBUG_ASSERT(is_client_connection(tmp)); + continue; + } + if (is_replaying_connection(tmp)) { tmp->set_killed(KILL_CONNECTION); @@ -2303,7 +2309,16 @@ void wsrep_close_client_connections(my_bool wait_to_end) continue; WSREP_DEBUG("closing connection %lld", (longlong) tmp->thread_id); - wsrep_close_thread(tmp); + + /* + instead of wsrep_close_thread() we do now soft kill by THD::awake + */ + mysql_mutex_lock(&tmp->LOCK_thd_data); + + tmp->awake(KILL_CONNECTION); + + mysql_mutex_unlock(&tmp->LOCK_thd_data); + } mysql_mutex_unlock(&LOCK_thread_count); @@ -2321,7 +2336,8 @@ void wsrep_close_client_connections(my_bool wait_to_end) #ifndef __bsdi__ // Bug in BSDI kernel if (is_client_connection(tmp) && !abort_replicated(tmp) && - !is_replaying_connection(tmp)) + !is_replaying_connection(tmp) && + tmp != except_caller_thd) { WSREP_INFO("killing local connection: %lld", (longlong) tmp->thread_id); close_connection(tmp,0); diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 7f0308e10bf..5ea5fbf3bcc 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -160,7 +160,6 @@ extern "C" query_id_t wsrep_thd_query_id(THD *thd); extern "C" query_id_t wsrep_thd_wsrep_last_query_id(THD *thd); extern "C" void wsrep_thd_set_wsrep_last_query_id(THD *thd, query_id_t id); -extern void wsrep_close_client_connections(my_bool wait_to_end); extern int wsrep_wait_committing_connections_close(int wait_time); extern void wsrep_close_applier(THD *thd); extern void wsrep_wait_appliers_close(THD *thd); @@ -313,7 +312,8 @@ void thd_binlog_trx_reset(THD * thd); typedef void (*wsrep_thd_processor_fun)(THD *); pthread_handler_t start_wsrep_THD(void *arg); int wsrep_wait_committing_connections_close(int wait_time); -void wsrep_close_client_connections(my_bool wait_to_end); +extern void wsrep_close_client_connections(my_bool wait_to_end, + THD *except_caller_thd = NULL); void wsrep_close_applier(THD *thd); void wsrep_close_applier_threads(int count); void wsrep_wait_appliers_close(THD *thd); diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index bac19832ebb..60b4cb6c11a 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -428,7 +428,8 @@ bool wsrep_reject_queries_update(sys_var *self, THD* thd, enum_var_type type) WSREP_INFO("Rejecting client queries due to manual setting"); break; case WSREP_REJECT_ALL_KILL: - wsrep_close_client_connections(FALSE); + /* close all client connections, but this one */ + wsrep_close_client_connections(FALSE, thd); WSREP_INFO("Rejecting client queries and killing connections due to manual setting"); break; default:

1 0

[Commits] 67165e62bcc: MDEV-15522: Change galera suite MTR tests to use mariabackup instead of xtrabackup
by jan 22 Nov '18

22 Nov '18

revision-id: 67165e62bcc40243c4e5ce275ca6a41faa6d8bb5 (mariadb-10.2.19-28-g67165e62bcc) parent(s): b193eb9beea80b1f80dcbc01f507dc62c8b77874 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-22 10:22:00 +0200 message: MDEV-15522: Change galera suite MTR tests to use mariabackup instead of xtrabackup Disable galera_3nodes tests using xtrabackup. --- mysql-test/suite/galera_3nodes/disabled.def | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/galera_3nodes/disabled.def b/mysql-test/suite/galera_3nodes/disabled.def index a9b9b00b40c..e640baebf7d 100644 --- a/mysql-test/suite/galera_3nodes/disabled.def +++ b/mysql-test/suite/galera_3nodes/disabled.def @@ -1,3 +1,4 @@ galera_slave_options_do :MDEV-8798 galera_slave_options_ignore : MDEV-8798 - +galera_innobackupex_backup : xtrabackup is deprecated +galera_ipv6_xtrabackup-v2 : xtrabackup is deprecated

1 0

[Commits] b193eb9beea: MDEV-15522: Change galera suite MTR tests to use mariabackup instead of xtrabackup
by jan 22 Nov '18

22 Nov '18

revision-id: b193eb9beea80b1f80dcbc01f507dc62c8b77874 (mariadb-10.2.19-27-gb193eb9beea) parent(s): ed26a338f5808787d1586b012c10f8d32d6e0b2e author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-22 10:17:58 +0200 message: MDEV-15522: Change galera suite MTR tests to use mariabackup instead of xtrabackup Disable galera tests using xtrabackup. --- mysql-test/suite/galera/disabled.def | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index e48d1e1db09..8c67ab3f3d8 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -42,3 +42,10 @@ galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replica galera_wan : MDEV-17259: Test failure on galera.galera_wan galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb galera_drop_database : test +galera_autoinc_sst_xtrabackup : xtrabackup is deprecated +galera_ist_xtrabackup-v2 : xtrabackup is deprecated +galera_sst_xtrabackup-v2_data_dir : xtrabackup is deprecated +galera_sst_xtrabackup-v2_encrypt_with_key : xtrabackup is deprecated +galera_sst_xtrabackup-v2-options : xtrabackup is deprecated +galera_ist_innodb_flush_logs : xtrabackup is deprecated +galera_sst_xtrabackup-v2 : xtrabackup is deprecated

1 0

[Commits] ed26a338f58: MDEV-17771: Add Galera ist and sst tests using mariabackup
by jan 22 Nov '18

22 Nov '18

revision-id: ed26a338f5808787d1586b012c10f8d32d6e0b2e (mariadb-10.2.19-26-ged26a338f58) parent(s): 8872a01540844cc7d86ec1419ab985eed61866c9 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-22 10:16:58 +0200 message: MDEV-17771: Add Galera ist and sst tests using mariabackup Record result files for 10.2. --- .../galera/r/galera_autoinc_sst_mariabackup.result | 11 +++++++++ .../galera/r/galera_ist_mariabackup,debug.rdiff | 17 +++++++++++--- .../suite/galera/r/galera_ist_mariabackup.result | 26 ++++++++++++++++++++++ ...a_ist_mariabackup_innodb_flush_logs,debug.rdiff | 17 +++++++++++--- ...galera_ist_mariabackup_innodb_flush_logs.result | 8 +++++++ .../galera/r/galera_sst_mariabackup,debug.rdiff | 4 ++-- .../r/galera_sst_mariabackup_table_options.result | 4 ++++ mysql-test/suite/galera/r/partition.result | 3 +++ .../t/galera_sst_mariabackup_table_options.test | 10 +++++++++ 9 files changed, 92 insertions(+), 8 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_autoinc_sst_mariabackup.result b/mysql-test/suite/galera/r/galera_autoinc_sst_mariabackup.result index 228d7c6f041..d0fac1e3d14 100644 --- a/mysql-test/suite/galera/r/galera_autoinc_sst_mariabackup.result +++ b/mysql-test/suite/galera/r/galera_autoinc_sst_mariabackup.result @@ -1,3 +1,4 @@ +connection node_1; CREATE TABLE t1 (f1 INTEGER PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB; CREATE PROCEDURE p1 () BEGIN @@ -9,12 +10,21 @@ COMMIT; END WHILE; END| CALL p1();; +connection node_2; CALL p1();; +connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2; +connection node_2a; Killing server ... INSERT INTO t1 VALUES (DEFAULT); +connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1; +connection node_1a; INSERT INTO t1 VALUES (DEFAULT); +connection node_1; Got one of the listed errors +connection node_2; Got one of the listed errors +connection node_1a; +connection node_2a; count_equal 1 CALL mtr.add_suppression("WSREP: Action message in non-primary configuration from member 0"); @@ -24,6 +34,7 @@ VARIABLE_VALUE SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; VARIABLE_VALUE = 2 1 +connection node_1a; SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; VARIABLE_VALUE 2 diff --git a/mysql-test/suite/galera/r/galera_ist_mariabackup,debug.rdiff b/mysql-test/suite/galera/r/galera_ist_mariabackup,debug.rdiff index 1c787cd2fef..9684e290778 100644 --- a/mysql-test/suite/galera/r/galera_ist_mariabackup,debug.rdiff +++ b/mysql-test/suite/galera/r/galera_ist_mariabackup,debug.rdiff @@ -1,11 +1,12 @@ ---- r/galera_ist_mariabackup.result 2018-11-19 15:15:21.093874145 +0200 -+++ r/galera_ist_mariabackup.reject 2018-11-19 16:25:52.220523327 +0200 -@@ -259,3 +259,100 @@ +--- r/galera_ist_mariabackup.result 2018-11-21 22:30:21.968817468 +0200 ++++ r/galera_ist_mariabackup.reject 2018-11-22 09:16:27.832601754 +0200 +@@ -285,3 +285,111 @@ DROP TABLE t1; COMMIT; SET AUTOCOMMIT=ON; +Performing State Transfer on a server that has been killed and restarted +while a DDL was in progress on it ++connection node_1; +CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; +SET AUTOCOMMIT=OFF; +START TRANSACTION; @@ -14,6 +15,7 @@ +INSERT INTO t1 VALUES ('node1_committed_before'); +INSERT INTO t1 VALUES ('node1_committed_before'); +INSERT INTO t1 VALUES ('node1_committed_before'); ++connection node_2; +START TRANSACTION; +INSERT INTO t1 VALUES ('node2_committed_before'); +INSERT INTO t1 VALUES ('node2_committed_before'); @@ -22,9 +24,12 @@ +INSERT INTO t1 VALUES ('node2_committed_before'); +COMMIT; +SET GLOBAL debug_dbug = 'd,sync.alter_opened_table'; ++connection node_1; +ALTER TABLE t1 ADD COLUMN f2 INTEGER; ++connection node_2; +SET wsrep_sync_wait = 0; +Killing server ... ++connection node_1; +SET AUTOCOMMIT=OFF; +START TRANSACTION; +INSERT INTO t1 (f1) VALUES ('node1_committed_during'); @@ -39,6 +44,7 @@ +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); ++connect node_1a_galera_st_kill_slave_ddl, 127.0.0.1, root, , test, $NODE_MYPORT_1; +SET AUTOCOMMIT=OFF; +START TRANSACTION; +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); @@ -46,7 +52,9 @@ +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); ++connection node_2; +Performing --wsrep-recover ... ++connection node_2; +Starting server ... +Using --wsrep-start-position when starting mysqld ... +SET AUTOCOMMIT=OFF; @@ -57,6 +65,7 @@ +INSERT INTO t1 (f1) VALUES ('node2_committed_after'); +INSERT INTO t1 (f1) VALUES ('node2_committed_after'); +COMMIT; ++connection node_1; +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); @@ -71,6 +80,7 @@ +INSERT INTO t1 (f1) VALUES ('node1_committed_after'); +INSERT INTO t1 (f1) VALUES ('node1_committed_after'); +COMMIT; ++connection node_1a_galera_st_kill_slave_ddl; +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); @@ -88,6 +98,7 @@ +1 +COMMIT; +SET AUTOCOMMIT=ON; ++connection node_1; +SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; +COUNT(*) = 2 +1 diff --git a/mysql-test/suite/galera/r/galera_ist_mariabackup.result b/mysql-test/suite/galera/r/galera_ist_mariabackup.result index 099d944d491..8a7c02ab1b6 100644 --- a/mysql-test/suite/galera/r/galera_ist_mariabackup.result +++ b/mysql-test/suite/galera/r/galera_ist_mariabackup.result @@ -1,4 +1,7 @@ +connection node_1; +connection node_2; Performing State Transfer on a server that has been temporarily disconnected +connection node_1; CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; SET AUTOCOMMIT=OFF; START TRANSACTION; @@ -8,6 +11,7 @@ INSERT INTO t1 VALUES ('node1_committed_before'); INSERT INTO t1 VALUES ('node1_committed_before'); INSERT INTO t1 VALUES ('node1_committed_before'); COMMIT; +connection node_2; SET AUTOCOMMIT=OFF; START TRANSACTION; INSERT INTO t1 VALUES ('node2_committed_before'); @@ -18,6 +22,7 @@ INSERT INTO t1 VALUES ('node2_committed_before'); COMMIT; Unloading wsrep provider ... SET GLOBAL wsrep_provider = 'none'; +connection node_1; SET AUTOCOMMIT=OFF; START TRANSACTION; INSERT INTO t1 VALUES ('node1_committed_during'); @@ -32,6 +37,7 @@ INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); +connect node_1a_galera_st_disconnect_slave, 127.0.0.1, root, , test, $NODE_MYPORT_1; SET AUTOCOMMIT=OFF; START TRANSACTION; INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); @@ -39,6 +45,7 @@ INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); +connection node_2; Loading wsrep provider ... SET AUTOCOMMIT=OFF; START TRANSACTION; @@ -48,6 +55,7 @@ INSERT INTO t1 VALUES ('node2_committed_after'); INSERT INTO t1 VALUES ('node2_committed_after'); INSERT INTO t1 VALUES ('node2_committed_after'); COMMIT; +connection node_1; INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); @@ -62,6 +70,7 @@ INSERT INTO t1 VALUES ('node1_committed_after'); INSERT INTO t1 VALUES ('node1_committed_after'); INSERT INTO t1 VALUES ('node1_committed_after'); COMMIT; +connection node_1a_galera_st_disconnect_slave; INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); @@ -76,6 +85,7 @@ COUNT(*) = 0 1 COMMIT; SET AUTOCOMMIT=ON; +connection node_1; SELECT COUNT(*) = 35 FROM t1; COUNT(*) = 35 1 @@ -86,6 +96,7 @@ DROP TABLE t1; COMMIT; SET AUTOCOMMIT=ON; Performing State Transfer on a server that has been shut down cleanly and restarted +connection node_1; CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; SET AUTOCOMMIT=OFF; START TRANSACTION; @@ -95,6 +106,7 @@ INSERT INTO t1 VALUES ('node1_committed_before'); INSERT INTO t1 VALUES ('node1_committed_before'); INSERT INTO t1 VALUES ('node1_committed_before'); COMMIT; +connection node_2; SET AUTOCOMMIT=OFF; START TRANSACTION; INSERT INTO t1 VALUES ('node2_committed_before'); @@ -104,6 +116,7 @@ INSERT INTO t1 VALUES ('node2_committed_before'); INSERT INTO t1 VALUES ('node2_committed_before'); COMMIT; Shutting down server ... +connection node_1; SET AUTOCOMMIT=OFF; START TRANSACTION; INSERT INTO t1 VALUES ('node1_committed_during'); @@ -118,6 +131,7 @@ INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); +connect node_1a_galera_st_shutdown_slave, 127.0.0.1, root, , test, $NODE_MYPORT_1; SET AUTOCOMMIT=OFF; START TRANSACTION; INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); @@ -125,6 +139,7 @@ INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); +connection node_2; Starting server ... SET AUTOCOMMIT=OFF; START TRANSACTION; @@ -134,6 +149,7 @@ INSERT INTO t1 VALUES ('node2_committed_after'); INSERT INTO t1 VALUES ('node2_committed_after'); INSERT INTO t1 VALUES ('node2_committed_after'); COMMIT; +connection node_1; INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); @@ -148,6 +164,7 @@ INSERT INTO t1 VALUES ('node1_committed_after'); INSERT INTO t1 VALUES ('node1_committed_after'); INSERT INTO t1 VALUES ('node1_committed_after'); COMMIT; +connection node_1a_galera_st_shutdown_slave; INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); @@ -162,6 +179,7 @@ COUNT(*) = 0 1 COMMIT; SET AUTOCOMMIT=ON; +connection node_1; SELECT COUNT(*) = 35 FROM t1; COUNT(*) = 35 1 @@ -172,6 +190,7 @@ DROP TABLE t1; COMMIT; SET AUTOCOMMIT=ON; Performing State Transfer on a server that has been killed and restarted +connection node_1; CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; SET AUTOCOMMIT=OFF; START TRANSACTION; @@ -181,6 +200,7 @@ INSERT INTO t1 VALUES ('node1_committed_before'); INSERT INTO t1 VALUES ('node1_committed_before'); INSERT INTO t1 VALUES ('node1_committed_before'); COMMIT; +connection node_2; SET AUTOCOMMIT=OFF; START TRANSACTION; INSERT INTO t1 VALUES ('node2_committed_before'); @@ -190,6 +210,7 @@ INSERT INTO t1 VALUES ('node2_committed_before'); INSERT INTO t1 VALUES ('node2_committed_before'); COMMIT; Killing server ... +connection node_1; SET AUTOCOMMIT=OFF; START TRANSACTION; INSERT INTO t1 VALUES ('node1_committed_during'); @@ -204,6 +225,7 @@ INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); +connect node_1a_galera_st_kill_slave, 127.0.0.1, root, , test, $NODE_MYPORT_1; SET AUTOCOMMIT=OFF; START TRANSACTION; INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); @@ -211,6 +233,7 @@ INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); +connection node_2; Performing --wsrep-recover ... Starting server ... Using --wsrep-start-position when starting mysqld ... @@ -222,6 +245,7 @@ INSERT INTO t1 VALUES ('node2_committed_after'); INSERT INTO t1 VALUES ('node2_committed_after'); INSERT INTO t1 VALUES ('node2_committed_after'); COMMIT; +connection node_1; INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); @@ -236,6 +260,7 @@ INSERT INTO t1 VALUES ('node1_committed_after'); INSERT INTO t1 VALUES ('node1_committed_after'); INSERT INTO t1 VALUES ('node1_committed_after'); COMMIT; +connection node_1a_galera_st_kill_slave; INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); @@ -250,6 +275,7 @@ COUNT(*) = 0 1 COMMIT; SET AUTOCOMMIT=ON; +connection node_1; SELECT COUNT(*) = 35 FROM t1; COUNT(*) = 35 1 diff --git a/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs,debug.rdiff b/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs,debug.rdiff index d85d3bdad75..792f98b4427 100644 --- a/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs,debug.rdiff +++ b/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs,debug.rdiff @@ -1,11 +1,12 @@ ---- r/galera_ist_mariabackup_innodb_flush_logs.result 2018-11-19 15:21:15.429784085 +0200 -+++ r/galera_ist_mariabackup_innodb_flush_logs.reject 2018-11-19 16:27:43.100491616 +0200 -@@ -86,3 +86,100 @@ +--- r/galera_ist_mariabackup_innodb_flush_logs.result 2018-11-21 21:34:20.157054441 +0200 ++++ r/galera_ist_mariabackup_innodb_flush_logs.reject 2018-11-22 09:16:16.824604445 +0200 +@@ -94,3 +94,111 @@ DROP TABLE t1; COMMIT; SET AUTOCOMMIT=ON; +Performing State Transfer on a server that has been killed and restarted +while a DDL was in progress on it ++connection node_1; +CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; +SET AUTOCOMMIT=OFF; +START TRANSACTION; @@ -14,6 +15,7 @@ +INSERT INTO t1 VALUES ('node1_committed_before'); +INSERT INTO t1 VALUES ('node1_committed_before'); +INSERT INTO t1 VALUES ('node1_committed_before'); ++connection node_2; +START TRANSACTION; +INSERT INTO t1 VALUES ('node2_committed_before'); +INSERT INTO t1 VALUES ('node2_committed_before'); @@ -22,9 +24,12 @@ +INSERT INTO t1 VALUES ('node2_committed_before'); +COMMIT; +SET GLOBAL debug_dbug = 'd,sync.alter_opened_table'; ++connection node_1; +ALTER TABLE t1 ADD COLUMN f2 INTEGER; ++connection node_2; +SET wsrep_sync_wait = 0; +Killing server ... ++connection node_1; +SET AUTOCOMMIT=OFF; +START TRANSACTION; +INSERT INTO t1 (f1) VALUES ('node1_committed_during'); @@ -39,6 +44,7 @@ +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); ++connect node_1a_galera_st_kill_slave_ddl, 127.0.0.1, root, , test, $NODE_MYPORT_1; +SET AUTOCOMMIT=OFF; +START TRANSACTION; +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); @@ -46,7 +52,9 @@ +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); ++connection node_2; +Performing --wsrep-recover ... ++connection node_2; +Starting server ... +Using --wsrep-start-position when starting mysqld ... +SET AUTOCOMMIT=OFF; @@ -57,6 +65,7 @@ +INSERT INTO t1 (f1) VALUES ('node2_committed_after'); +INSERT INTO t1 (f1) VALUES ('node2_committed_after'); +COMMIT; ++connection node_1; +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); @@ -71,6 +80,7 @@ +INSERT INTO t1 (f1) VALUES ('node1_committed_after'); +INSERT INTO t1 (f1) VALUES ('node1_committed_after'); +COMMIT; ++connection node_1a_galera_st_kill_slave_ddl; +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); @@ -88,6 +98,7 @@ +1 +COMMIT; +SET AUTOCOMMIT=ON; ++connection node_1; +SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; +COUNT(*) = 2 +1 diff --git a/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs.result b/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs.result index e3bf407ddaa..7813b5a58fc 100644 --- a/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs.result +++ b/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs.result @@ -1,4 +1,5 @@ Performing State Transfer on a server that has been killed and restarted +connection node_1; CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; SET AUTOCOMMIT=OFF; START TRANSACTION; @@ -8,6 +9,7 @@ INSERT INTO t1 VALUES ('node1_committed_before'); INSERT INTO t1 VALUES ('node1_committed_before'); INSERT INTO t1 VALUES ('node1_committed_before'); COMMIT; +connection node_2; SET AUTOCOMMIT=OFF; START TRANSACTION; INSERT INTO t1 VALUES ('node2_committed_before'); @@ -17,6 +19,7 @@ INSERT INTO t1 VALUES ('node2_committed_before'); INSERT INTO t1 VALUES ('node2_committed_before'); COMMIT; Killing server ... +connection node_1; SET AUTOCOMMIT=OFF; START TRANSACTION; INSERT INTO t1 VALUES ('node1_committed_during'); @@ -31,6 +34,7 @@ INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); +connect node_1a_galera_st_kill_slave, 127.0.0.1, root, , test, $NODE_MYPORT_1; SET AUTOCOMMIT=OFF; START TRANSACTION; INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); @@ -38,6 +42,7 @@ INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); +connection node_2; Performing --wsrep-recover ... Starting server ... Using --wsrep-start-position when starting mysqld ... @@ -49,6 +54,7 @@ INSERT INTO t1 VALUES ('node2_committed_after'); INSERT INTO t1 VALUES ('node2_committed_after'); INSERT INTO t1 VALUES ('node2_committed_after'); COMMIT; +connection node_1; INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); INSERT INTO t1 VALUES ('node1_to_be_committed_after'); @@ -63,6 +69,7 @@ INSERT INTO t1 VALUES ('node1_committed_after'); INSERT INTO t1 VALUES ('node1_committed_after'); INSERT INTO t1 VALUES ('node1_committed_after'); COMMIT; +connection node_1a_galera_st_kill_slave; INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); @@ -77,6 +84,7 @@ COUNT(*) = 0 1 COMMIT; SET AUTOCOMMIT=ON; +connection node_1; SELECT COUNT(*) = 35 FROM t1; COUNT(*) = 35 1 diff --git a/mysql-test/suite/galera/r/galera_sst_mariabackup,debug.rdiff b/mysql-test/suite/galera/r/galera_sst_mariabackup,debug.rdiff index 8b091eb370a..819bcba7cac 100644 --- a/mysql-test/suite/galera/r/galera_sst_mariabackup,debug.rdiff +++ b/mysql-test/suite/galera/r/galera_sst_mariabackup,debug.rdiff @@ -1,5 +1,5 @@ ---- galera_sst_mariabackup.result -+++ galera_sst_mariabackup,debug.reject +--- r/galera_sst_mariabackup.result 2018-11-21 16:50:35.766982279 +0200 ++++ r/galera_sst_mariabackup.reject 2018-11-22 09:20:10.344408266 +0200 @@ -286,5 +286,113 @@ DROP TABLE t1; COMMIT; diff --git a/mysql-test/suite/galera/r/galera_sst_mariabackup_table_options.result b/mysql-test/suite/galera/r/galera_sst_mariabackup_table_options.result index 6d30a6231eb..9180ed5e421 100644 --- a/mysql-test/suite/galera/r/galera_sst_mariabackup_table_options.result +++ b/mysql-test/suite/galera/r/galera_sst_mariabackup_table_options.result @@ -1,3 +1,5 @@ +connection node_1; +connection node_2; Performing State Transfer on a server that starts from a clean var directory This is accomplished by shutting down node #2 and removing its var directory before restarting it connection node_1; @@ -991,3 +993,5 @@ COMMIT; DROP TABLE t1,t2,t3,t4,t5,t6,t7,t8,t9; COMMIT; SET AUTOCOMMIT=ON; +disconnect node_2; +disconnect node_1; diff --git a/mysql-test/suite/galera/r/partition.result b/mysql-test/suite/galera/r/partition.result index eb0806bdba8..bdf6df25589 100644 --- a/mysql-test/suite/galera/r/partition.result +++ b/mysql-test/suite/galera/r/partition.result @@ -118,6 +118,7 @@ connection node_1; SET GLOBAL wsrep_load_data_splitting = ON; CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2; +connection node_2; SELECT COUNT(*) FROM t1; COUNT(*) 20002 @@ -129,6 +130,7 @@ connection node_1; SET GLOBAL wsrep_load_data_splitting = ON; CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2; +connection node_2; SELECT COUNT(*) FROM t1; COUNT(*) 101 @@ -141,6 +143,7 @@ connection node_1; SET GLOBAL wsrep_load_data_splitting = OFF; CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2; +connection node_2; SELECT COUNT(*) FROM t1; COUNT(*) 20002 diff --git a/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test b/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test index 61cef44135b..267ec9ce681 100644 --- a/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test +++ b/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test @@ -1,8 +1,14 @@ --source include/big_test.inc --source include/galera_cluster.inc --source include/innodb_encrypt_tables.inc +--source include/innodb_page_size_small.inc --source include/have_mariabackup.inc +# Save original auto_increment_offset values. +--let $node_1=node_1 +--let $node_2=node_2 +--source include/auto_increment_offset_save.inc + --echo Performing State Transfer on a server that starts from a clean var directory --echo This is accomplished by shutting down node #2 and removing its var directory before restarting it @@ -216,3 +222,7 @@ COMMIT; DROP TABLE t1,t2,t3,t4,t5,t6,t7,t8,t9; COMMIT; SET AUTOCOMMIT=ON; + +# Restore original auto_increment_offset values. +--source include/auto_increment_offset_restore.inc +--source include/galera_end.inc

1 0

[Commits] 06063e8a41b: Merge remote-tracking branch 'origin/10.1' into 10.2
by jan 21 Nov '18

21 Nov '18

revision-id: 06063e8a41b8165dd822ffee9e431eef491d70f9 (mariadb-10.2.19-14-g06063e8a41b) parent(s): b86e18cb44fd4ab42c08e4b7aae1b7e131a3ea46 8324e5e84dc786b2d4a07d7798f26ddea239159e author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-21 16:59:11 +0200 message: Merge remote-tracking branch 'origin/10.1' into 10.2 .../include/innodb_encrypt_tables.combinations | 14 + mysql-test/include/innodb_encrypt_tables.inc | 4 + mysql-test/suite/galera/disabled.def | 1 - .../galera/r/galera_autoinc_sst_mariabackup.result | 36 + .../galera/r/galera_ist_mariabackup,debug.rdiff | 103 +++ .../suite/galera/r/galera_ist_mariabackup.result | 261 ++++++ ...a_ist_mariabackup_innodb_flush_logs,debug.rdiff | 103 +++ ...galera_ist_mariabackup_innodb_flush_logs.result | 88 ++ .../galera_sst_mariabackup_encrypt_with_key.result | 3 + .../r/galera_sst_mariabackup_table_options.result | 985 +++++++++++++++++++++ .../r/galera_sst_mysqldump_with_key,debug.rdiff | 106 +++ .../galera/r/galera_sst_mysqldump_with_key.result | 97 -- .../galera_sst_xtrabackup-v2_data_dir,debug.rdiff | 103 +++ mysql-test/suite/galera/r/partition.result | 18 +- .../galera/t/galera_autoinc_sst_mariabackup.cnf | 12 + .../galera/t/galera_autoinc_sst_mariabackup.test | 96 ++ .../suite/galera/t/galera_ist_mariabackup.cnf | 12 + .../suite/galera/t/galera_ist_mariabackup.test | 16 + .../t/galera_ist_mariabackup_innodb_flush_logs.cnf | 14 + .../galera_ist_mariabackup_innodb_flush_logs.test | 12 + .../t/galera_sst_mariabackup_encrypt_with_key.cnf | 12 + .../t/galera_sst_mariabackup_encrypt_with_key.test | 14 + .../t/galera_sst_mariabackup_table_options.cnf | 16 + .../t/galera_sst_mariabackup_table_options.opt | 2 + .../t/galera_sst_mariabackup_table_options.test | 218 +++++ mysql-test/suite/galera/t/partition.test | 14 +- 26 files changed, 2250 insertions(+), 110 deletions(-) diff --cc mysql-test/suite/galera/disabled.def index a8cb9bbafbf,94256dd88d7..e48d1e1db09 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@@ -27,18 -27,9 +27,17 @@@ galera_ssl_upgrade : MDEV-13549 Galera galera.MW-329 : wsrep_local_replays not stable MW-416 : MDEV-13549 Galera test failures MW-388 : MDEV-13549 Galera test failures +galera.MW-44 : MDEV-15809 Test failure on galera.MW-44 +galera.galera_pc_ignore_sb : MDEV-15811 Test failure on galera_pc_ignore_sb +galera_kill_applier : race condition at the start of the test +galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read transfer status +pxc-421: Lock timeout exceeded galera_sst_mysqldump_with_key : MDEV-16890 Galera test failure +galera.galera_binlog_stmt_autoinc : MDEV-17106 Test failure on galera.galera_binlog_stmt_autoinc +galera.galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl +galera.galera_var_node_address : MDEV-17151 Galera test failure on galera.galera_var_node_address galera_binlog_stmt_autoinc: MDEV-17106 Test failure on galera.galera_binlog_stmt_autoinc galera_gc_fc_limit : MDEV-17061 Test failure on galera.galera_gc_fc_limit - partition : MDEV-13881 galera.partition failed in buildbot with wrong result galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion galera_wan : MDEV-17259: Test failure on galera.galera_wan galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb diff --cc mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result index 02dde169911,bdf3844f2c5..3de446fec32 --- a/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result +++ b/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result @@@ -204,120 -183,12 +204,23 @@@ COUNT(*) = DROP TABLE t1; COMMIT; SET AUTOCOMMIT=ON; - Performing State Transfer on a server that has been killed and restarted - while a DDL was in progress on it +connection node_1; - CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 VALUES ('node1_committed_before'); - INSERT INTO t1 VALUES ('node1_committed_before'); - INSERT INTO t1 VALUES ('node1_committed_before'); - INSERT INTO t1 VALUES ('node1_committed_before'); - INSERT INTO t1 VALUES ('node1_committed_before'); +connection node_2; - START TRANSACTION; - INSERT INTO t1 VALUES ('node2_committed_before'); - INSERT INTO t1 VALUES ('node2_committed_before'); - INSERT INTO t1 VALUES ('node2_committed_before'); - INSERT INTO t1 VALUES ('node2_committed_before'); - INSERT INTO t1 VALUES ('node2_committed_before'); - COMMIT; - SET GLOBAL debug_dbug = 'd,sync.alter_opened_table'; +connection node_1; - ALTER TABLE t1 ADD COLUMN f2 INTEGER; +connection node_2; - SET wsrep_sync_wait = 0; - Killing server ... +connection node_1; - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - COMMIT; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); +connect node_1a_galera_st_kill_slave_ddl, 127.0.0.1, root, , test, $NODE_MYPORT_1; - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); +connection node_2; - Performing --wsrep-recover ... +connection node_2; - Starting server ... - Using --wsrep-start-position when starting mysqld ... - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - COMMIT; +connection node_1; - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - COMMIT; - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - COMMIT; +connection node_1a_galera_st_kill_slave_ddl; - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - ROLLBACK; - SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; - COUNT(*) = 2 - 1 - SELECT COUNT(*) = 35 FROM t1; - COUNT(*) = 35 - 1 - SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; - COUNT(*) = 0 - 1 - COMMIT; - SET AUTOCOMMIT=ON; +connection node_1; - SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; - COUNT(*) = 2 - 1 - SELECT COUNT(*) = 35 FROM t1; - COUNT(*) = 35 - 1 - SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; - COUNT(*) = 0 - 1 - DROP TABLE t1; - COMMIT; - SET AUTOCOMMIT=ON; - SET GLOBAL debug_dbug = $debug_orig; +connection node_1; CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query"); DROP USER sst; +connection node_2; CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query"); CALL mtr.add_suppression("InnoDB: Error: Table \"mysql\"\\.\"innodb_index_stats\" not found"); -CALL mtr.add_suppression("InnoDB: New log files created"); -CALL mtr.add_suppression("InnoDB: Creating foreign key constraint system tables"); CALL mtr.add_suppression("Can't open and lock time zone table"); CALL mtr.add_suppression("Can't open and lock privilege tables"); CALL mtr.add_suppression("Info table is not ready to be used"); diff --cc mysql-test/suite/galera/r/partition.result index 3835de514aa,6b0868aab3e..bdf6df25589 --- a/mysql-test/suite/galera/r/partition.result +++ b/mysql-test/suite/galera/r/partition.result @@@ -118,10 -109,9 +118,10 @@@ connection node_1 SET GLOBAL wsrep_load_data_splitting = ON; CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2; +connection node_2; - SELECT COUNT(*) = 20002 FROM t1; - COUNT(*) = 20002 - 1 + SELECT COUNT(*) FROM t1; + COUNT(*) + 20002 wsrep_last_committed_diff 1 DROP TABLE t1; @@@ -130,10 -119,9 +130,10 @@@ connection node_1 SET GLOBAL wsrep_load_data_splitting = ON; CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2; +connection node_2; - SELECT COUNT(*) = 101 FROM t1; - COUNT(*) = 101 - 1 + SELECT COUNT(*) FROM t1; + COUNT(*) + 101 wsrep_last_committed_diff 1 DROP TABLE t1; @@@ -143,10 -130,9 +143,10 @@@ connection node_1 SET GLOBAL wsrep_load_data_splitting = OFF; CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2; +connection node_2; - SELECT COUNT(*) = 20002 FROM t1; - COUNT(*) = 20002 - 1 + SELECT COUNT(*) FROM t1; + COUNT(*) + 20002 wsrep_last_committed_diff 1 DROP TABLE t1;

1 0

[Commits] ec4152ea2b0: Merge remote-tracking branch 'origin/10.1' into 10.4
by jan 21 Nov '18

21 Nov '18

revision-id: ec4152ea2b01da7ddd1baacd7acd0da71451462a (mariadb-10.4.0-31-gec4152ea2b0) parent(s): 9fdb8c59eb297c6acb15345ae732678d0d8ee838 8324e5e84dc786b2d4a07d7798f26ddea239159e author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-21 16:57:48 +0200 message: Merge remote-tracking branch 'origin/10.1' into 10.4 .../include/innodb_encrypt_tables.combinations | 14 + mysql-test/include/innodb_encrypt_tables.inc | 4 + mysql-test/suite/galera/disabled.def | 1 - .../galera/r/galera_autoinc_sst_mariabackup.result | 36 + .../galera/r/galera_ist_mariabackup,debug.rdiff | 103 +++ .../suite/galera/r/galera_ist_mariabackup.result | 261 ++++++ ...a_ist_mariabackup_innodb_flush_logs,debug.rdiff | 103 +++ ...galera_ist_mariabackup_innodb_flush_logs.result | 88 ++ .../galera_sst_mariabackup_encrypt_with_key.result | 3 + .../r/galera_sst_mariabackup_table_options.result | 985 +++++++++++++++++++++ .../r/galera_sst_mysqldump_with_key,debug.rdiff | 106 +++ .../galera/r/galera_sst_mysqldump_with_key.result | 97 -- .../galera_sst_xtrabackup-v2_data_dir,debug.rdiff | 103 +++ mysql-test/suite/galera/r/partition.result | 18 +- .../galera/t/galera_autoinc_sst_mariabackup.cnf | 12 + .../galera/t/galera_autoinc_sst_mariabackup.test | 96 ++ .../suite/galera/t/galera_ist_mariabackup.cnf | 12 + .../suite/galera/t/galera_ist_mariabackup.test | 16 + .../t/galera_ist_mariabackup_innodb_flush_logs.cnf | 14 + .../galera_ist_mariabackup_innodb_flush_logs.test | 12 + .../t/galera_sst_mariabackup_encrypt_with_key.cnf | 12 + .../t/galera_sst_mariabackup_encrypt_with_key.test | 14 + .../t/galera_sst_mariabackup_table_options.cnf | 16 + .../t/galera_sst_mariabackup_table_options.opt | 2 + .../t/galera_sst_mariabackup_table_options.test | 218 +++++ mysql-test/suite/galera/t/partition.test | 14 +- 26 files changed, 2250 insertions(+), 110 deletions(-) diff --cc mysql-test/suite/galera/disabled.def index e84832458a3,94256dd88d7..2413be80356 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@@ -24,27 -24,12 +24,26 @@@ galera_gcache_recover : MDEV-13549 Gale galera_gcache_recover_full_gcache : MDEV-13549 Galera test failures galera_gcache_recover_manytrx : MDEV-13549 Galera test failures galera_ssl_upgrade : MDEV-13549 Galera test failures -galera.MW-329 : wsrep_local_replays not stable +MW-329 : wsrep_local_replays not stable MW-416 : MDEV-13549 Galera test failures MW-388 : MDEV-13549 Galera test failures +MW-44 : MDEV-15809 Test failure on galera.MW-44 +galera_pc_ignore_sb : MDEV-15811 Test failure on galera_pc_ignore_sb +galera_kill_applier : race condition at the start of the test +galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read transfer status +pxc-421: Lock timeout exceeded galera_sst_mysqldump_with_key : MDEV-16890 Galera test failure +galera_sst_xtrabackup-v2-options : Failed to read uuid:seqno and wsrep_gtid_domain_id from joiner script +MW-328C : Timeouts +galera_gcs_fc_limit : Timeouts +pool_of_threads: WSREP has not yet prepared node for application use +galera_var_innodb_disallow_writes : Timeout +MW-336 : nondeterministic wsrep_thread_count +galera_binlog_stmt_autoinc : MDEV-17106 Test failure on galera.galera_binlog_stmt_autoinc +galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl +galera_var_node_address : MDEV-17151 Galera test failure on galera.galera_var_node_address galera_binlog_stmt_autoinc: MDEV-17106 Test failure on galera.galera_binlog_stmt_autoinc galera_gc_fc_limit : MDEV-17061 Test failure on galera.galera_gc_fc_limit - partition : MDEV-13881 galera.partition failed in buildbot with wrong result galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion galera_wan : MDEV-17259: Test failure on galera.galera_wan galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb diff --cc mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result index 02dde169911,bdf3844f2c5..3de446fec32 --- a/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result +++ b/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result @@@ -204,120 -183,12 +204,23 @@@ COUNT(*) = DROP TABLE t1; COMMIT; SET AUTOCOMMIT=ON; - Performing State Transfer on a server that has been killed and restarted - while a DDL was in progress on it +connection node_1; - CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 VALUES ('node1_committed_before'); - INSERT INTO t1 VALUES ('node1_committed_before'); - INSERT INTO t1 VALUES ('node1_committed_before'); - INSERT INTO t1 VALUES ('node1_committed_before'); - INSERT INTO t1 VALUES ('node1_committed_before'); +connection node_2; - START TRANSACTION; - INSERT INTO t1 VALUES ('node2_committed_before'); - INSERT INTO t1 VALUES ('node2_committed_before'); - INSERT INTO t1 VALUES ('node2_committed_before'); - INSERT INTO t1 VALUES ('node2_committed_before'); - INSERT INTO t1 VALUES ('node2_committed_before'); - COMMIT; - SET GLOBAL debug_dbug = 'd,sync.alter_opened_table'; +connection node_1; - ALTER TABLE t1 ADD COLUMN f2 INTEGER; +connection node_2; - SET wsrep_sync_wait = 0; - Killing server ... +connection node_1; - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - COMMIT; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); +connect node_1a_galera_st_kill_slave_ddl, 127.0.0.1, root, , test, $NODE_MYPORT_1; - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); +connection node_2; - Performing --wsrep-recover ... +connection node_2; - Starting server ... - Using --wsrep-start-position when starting mysqld ... - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - COMMIT; +connection node_1; - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - COMMIT; - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - COMMIT; +connection node_1a_galera_st_kill_slave_ddl; - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - ROLLBACK; - SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; - COUNT(*) = 2 - 1 - SELECT COUNT(*) = 35 FROM t1; - COUNT(*) = 35 - 1 - SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; - COUNT(*) = 0 - 1 - COMMIT; - SET AUTOCOMMIT=ON; +connection node_1; - SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; - COUNT(*) = 2 - 1 - SELECT COUNT(*) = 35 FROM t1; - COUNT(*) = 35 - 1 - SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; - COUNT(*) = 0 - 1 - DROP TABLE t1; - COMMIT; - SET AUTOCOMMIT=ON; - SET GLOBAL debug_dbug = $debug_orig; +connection node_1; CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query"); DROP USER sst; +connection node_2; CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query"); CALL mtr.add_suppression("InnoDB: Error: Table \"mysql\"\\.\"innodb_index_stats\" not found"); -CALL mtr.add_suppression("InnoDB: New log files created"); -CALL mtr.add_suppression("InnoDB: Creating foreign key constraint system tables"); CALL mtr.add_suppression("Can't open and lock time zone table"); CALL mtr.add_suppression("Can't open and lock privilege tables"); CALL mtr.add_suppression("Info table is not ready to be used"); diff --cc mysql-test/suite/galera/r/partition.result index 3835de514aa,6b0868aab3e..bdf6df25589 --- a/mysql-test/suite/galera/r/partition.result +++ b/mysql-test/suite/galera/r/partition.result @@@ -118,10 -109,9 +118,10 @@@ connection node_1 SET GLOBAL wsrep_load_data_splitting = ON; CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2; +connection node_2; - SELECT COUNT(*) = 20002 FROM t1; - COUNT(*) = 20002 - 1 + SELECT COUNT(*) FROM t1; + COUNT(*) + 20002 wsrep_last_committed_diff 1 DROP TABLE t1; @@@ -130,10 -119,9 +130,10 @@@ connection node_1 SET GLOBAL wsrep_load_data_splitting = ON; CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2; +connection node_2; - SELECT COUNT(*) = 101 FROM t1; - COUNT(*) = 101 - 1 + SELECT COUNT(*) FROM t1; + COUNT(*) + 101 wsrep_last_committed_diff 1 DROP TABLE t1; @@@ -143,10 -130,9 +143,10 @@@ connection node_1 SET GLOBAL wsrep_load_data_splitting = OFF; CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2; +connection node_2; - SELECT COUNT(*) = 20002 FROM t1; - COUNT(*) = 20002 - 1 + SELECT COUNT(*) FROM t1; + COUNT(*) + 20002 wsrep_last_committed_diff 1 DROP TABLE t1;

1 0

[Commits] 09296664bc6: Merge branch 'bb-10.2-galera' into 10.2
by jan 21 Nov '18

21 Nov '18

revision-id: 09296664bc6ae628f8b5b7c42d6ca2bf80bb7c1f (mariadb-10.2.19-15-g09296664bc6) parent(s): 8c10ac093e119609f0018b396e1dbb8dedb9247d 8872a01540844cc7d86ec1419ab985eed61866c9 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-21 16:00:41 +0200 message: Merge branch 'bb-10.2-galera' into 10.2 .../suite/galera/r/galera_sst_mariabackup_table_options.result | 8 ++++++++ 1 file changed, 8 insertions(+)

1 0

[Commits] 8c10ac093e1: Merge remote-tracking branch 'origin/10.1' into 10.2
by jan 21 Nov '18

21 Nov '18

revision-id: 8c10ac093e119609f0018b396e1dbb8dedb9247d (mariadb-10.2.19-14-g8c10ac093e1) parent(s): b86e18cb44fd4ab42c08e4b7aae1b7e131a3ea46 8324e5e84dc786b2d4a07d7798f26ddea239159e author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-21 15:58:07 +0200 message: Merge remote-tracking branch 'origin/10.1' into 10.2 .../include/innodb_encrypt_tables.combinations | 14 + mysql-test/include/innodb_encrypt_tables.inc | 4 + mysql-test/suite/galera/disabled.def | 1 - .../galera/r/galera_autoinc_sst_mariabackup.result | 36 + .../galera/r/galera_ist_mariabackup,debug.rdiff | 103 +++ .../suite/galera/r/galera_ist_mariabackup.result | 261 ++++++ ...a_ist_mariabackup_innodb_flush_logs,debug.rdiff | 103 +++ ...galera_ist_mariabackup_innodb_flush_logs.result | 88 ++ .../galera_sst_mariabackup_encrypt_with_key.result | 3 + .../r/galera_sst_mariabackup_table_options.result | 985 +++++++++++++++++++++ .../r/galera_sst_mysqldump_with_key,debug.rdiff | 106 +++ .../galera/r/galera_sst_mysqldump_with_key.result | 97 -- .../galera_sst_xtrabackup-v2_data_dir,debug.rdiff | 103 +++ mysql-test/suite/galera/r/partition.result | 18 +- .../galera/t/galera_autoinc_sst_mariabackup.cnf | 12 + .../galera/t/galera_autoinc_sst_mariabackup.test | 96 ++ .../suite/galera/t/galera_ist_mariabackup.cnf | 12 + .../suite/galera/t/galera_ist_mariabackup.test | 16 + .../t/galera_ist_mariabackup_innodb_flush_logs.cnf | 14 + .../galera_ist_mariabackup_innodb_flush_logs.test | 12 + .../t/galera_sst_mariabackup_encrypt_with_key.cnf | 12 + .../t/galera_sst_mariabackup_encrypt_with_key.test | 14 + .../t/galera_sst_mariabackup_table_options.cnf | 16 + .../t/galera_sst_mariabackup_table_options.opt | 2 + .../t/galera_sst_mariabackup_table_options.test | 218 +++++ mysql-test/suite/galera/t/partition.test | 14 +- 26 files changed, 2250 insertions(+), 110 deletions(-) diff --cc mysql-test/suite/galera/disabled.def index a8cb9bbafbf,94256dd88d7..e48d1e1db09 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@@ -27,18 -27,9 +27,17 @@@ galera_ssl_upgrade : MDEV-13549 Galera galera.MW-329 : wsrep_local_replays not stable MW-416 : MDEV-13549 Galera test failures MW-388 : MDEV-13549 Galera test failures +galera.MW-44 : MDEV-15809 Test failure on galera.MW-44 +galera.galera_pc_ignore_sb : MDEV-15811 Test failure on galera_pc_ignore_sb +galera_kill_applier : race condition at the start of the test +galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read transfer status +pxc-421: Lock timeout exceeded galera_sst_mysqldump_with_key : MDEV-16890 Galera test failure +galera.galera_binlog_stmt_autoinc : MDEV-17106 Test failure on galera.galera_binlog_stmt_autoinc +galera.galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl +galera.galera_var_node_address : MDEV-17151 Galera test failure on galera.galera_var_node_address galera_binlog_stmt_autoinc: MDEV-17106 Test failure on galera.galera_binlog_stmt_autoinc galera_gc_fc_limit : MDEV-17061 Test failure on galera.galera_gc_fc_limit - partition : MDEV-13881 galera.partition failed in buildbot with wrong result galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion galera_wan : MDEV-17259: Test failure on galera.galera_wan galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb diff --cc mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result index 02dde169911,bdf3844f2c5..3de446fec32 --- a/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result +++ b/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result @@@ -204,120 -183,12 +204,23 @@@ COUNT(*) = DROP TABLE t1; COMMIT; SET AUTOCOMMIT=ON; - Performing State Transfer on a server that has been killed and restarted - while a DDL was in progress on it +connection node_1; - CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 VALUES ('node1_committed_before'); - INSERT INTO t1 VALUES ('node1_committed_before'); - INSERT INTO t1 VALUES ('node1_committed_before'); - INSERT INTO t1 VALUES ('node1_committed_before'); - INSERT INTO t1 VALUES ('node1_committed_before'); +connection node_2; - START TRANSACTION; - INSERT INTO t1 VALUES ('node2_committed_before'); - INSERT INTO t1 VALUES ('node2_committed_before'); - INSERT INTO t1 VALUES ('node2_committed_before'); - INSERT INTO t1 VALUES ('node2_committed_before'); - INSERT INTO t1 VALUES ('node2_committed_before'); - COMMIT; - SET GLOBAL debug_dbug = 'd,sync.alter_opened_table'; +connection node_1; - ALTER TABLE t1 ADD COLUMN f2 INTEGER; +connection node_2; - SET wsrep_sync_wait = 0; - Killing server ... +connection node_1; - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - COMMIT; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); +connect node_1a_galera_st_kill_slave_ddl, 127.0.0.1, root, , test, $NODE_MYPORT_1; - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); +connection node_2; - Performing --wsrep-recover ... +connection node_2; - Starting server ... - Using --wsrep-start-position when starting mysqld ... - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - COMMIT; +connection node_1; - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - COMMIT; - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - COMMIT; +connection node_1a_galera_st_kill_slave_ddl; - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - ROLLBACK; - SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; - COUNT(*) = 2 - 1 - SELECT COUNT(*) = 35 FROM t1; - COUNT(*) = 35 - 1 - SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; - COUNT(*) = 0 - 1 - COMMIT; - SET AUTOCOMMIT=ON; +connection node_1; - SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; - COUNT(*) = 2 - 1 - SELECT COUNT(*) = 35 FROM t1; - COUNT(*) = 35 - 1 - SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; - COUNT(*) = 0 - 1 - DROP TABLE t1; - COMMIT; - SET AUTOCOMMIT=ON; - SET GLOBAL debug_dbug = $debug_orig; +connection node_1; CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query"); DROP USER sst; +connection node_2; CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query"); CALL mtr.add_suppression("InnoDB: Error: Table \"mysql\"\\.\"innodb_index_stats\" not found"); -CALL mtr.add_suppression("InnoDB: New log files created"); -CALL mtr.add_suppression("InnoDB: Creating foreign key constraint system tables"); CALL mtr.add_suppression("Can't open and lock time zone table"); CALL mtr.add_suppression("Can't open and lock privilege tables"); CALL mtr.add_suppression("Info table is not ready to be used"); diff --cc mysql-test/suite/galera/r/partition.result index 3835de514aa,6b0868aab3e..bdf6df25589 --- a/mysql-test/suite/galera/r/partition.result +++ b/mysql-test/suite/galera/r/partition.result @@@ -118,10 -109,9 +118,10 @@@ connection node_1 SET GLOBAL wsrep_load_data_splitting = ON; CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2; +connection node_2; - SELECT COUNT(*) = 20002 FROM t1; - COUNT(*) = 20002 - 1 + SELECT COUNT(*) FROM t1; + COUNT(*) + 20002 wsrep_last_committed_diff 1 DROP TABLE t1; @@@ -130,10 -119,9 +130,10 @@@ connection node_1 SET GLOBAL wsrep_load_data_splitting = ON; CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2; +connection node_2; - SELECT COUNT(*) = 101 FROM t1; - COUNT(*) = 101 - 1 + SELECT COUNT(*) FROM t1; + COUNT(*) + 101 wsrep_last_committed_diff 1 DROP TABLE t1; @@@ -143,10 -130,9 +143,10 @@@ connection node_1 SET GLOBAL wsrep_load_data_splitting = OFF; CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2; +connection node_2; - SELECT COUNT(*) = 20002 FROM t1; - COUNT(*) = 20002 - 1 + SELECT COUNT(*) FROM t1; + COUNT(*) + 20002 wsrep_last_committed_diff 1 DROP TABLE t1;

1 0

[Commits] a504c9f7105: Fix result.
by jan 21 Nov '18

21 Nov '18

revision-id: a504c9f7105dfe3d4953b7f13a5738627c18634d (mariadb-10.2.19-16-ga504c9f7105) parent(s): a08ced69bfe42203ac4673ba2718fe17e5f427c0 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-21 14:36:35 +0200 message: Fix result. --- .../suite/galera/r/galera_sst_mariabackup_table_options.result | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mysql-test/suite/galera/r/galera_sst_mariabackup_table_options.result b/mysql-test/suite/galera/r/galera_sst_mariabackup_table_options.result index f55a926d4de..6d30a6231eb 100644 --- a/mysql-test/suite/galera/r/galera_sst_mariabackup_table_options.result +++ b/mysql-test/suite/galera/r/galera_sst_mariabackup_table_options.result @@ -1,5 +1,6 @@ Performing State Transfer on a server that starts from a clean var directory This is accomplished by shutting down node #2 and removing its var directory before restarting it +connection node_1; CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; CREATE TABLE t2 (f1 CHAR(255)) ENGINE=InnoDB PAGE_COMPRESSED=1; CREATE TABLE t3 (f1 CHAR(255)) ENGINE=InnoDB PAGE_COMPRESSED=1 ENCRYPTED=NO; @@ -57,6 +58,7 @@ insert into t1 values ('node1_committed_before'); insert into t1 values ('node1_committed_before'); insert into t1 values ('node1_committed_before'); COMMIT; +connection node_2; SET AUTOCOMMIT=OFF; START TRANSACTION; insert into t9 values ('node2_committed_before'); @@ -106,6 +108,7 @@ insert into t1 values ('node2_committed_before'); insert into t1 values ('node2_committed_before'); COMMIT; Shutting down server ... +connection node_1; Cleaning var directory ... SET AUTOCOMMIT=OFF; START TRANSACTION; @@ -201,6 +204,7 @@ insert into t1 values ('node1_to_be_committed_after'); insert into t1 values ('node1_to_be_committed_after'); insert into t1 values ('node1_to_be_committed_after'); insert into t1 values ('node1_to_be_committed_after'); +connect node_1a_galera_st_clean_slave, 127.0.0.1, root, , test, $NODE_MYPORT_1; SET AUTOCOMMIT=OFF; START TRANSACTION; insert into t9 values ('node1_to_be_rollbacked_after'); @@ -248,10 +252,12 @@ insert into t1 values ('node1_to_be_rollbacked_after'); insert into t1 values ('node1_to_be_rollbacked_after'); insert into t1 values ('node1_to_be_rollbacked_after'); insert into t1 values ('node1_to_be_rollbacked_after'); +connection node_2; Starting server ... SET AUTOCOMMIT=OFF; START TRANSACTION; COMMIT; +connection node_1; insert into t9 values ('node1_to_be_committed_after'); insert into t9 values ('node1_to_be_committed_after'); insert into t9 values ('node1_to_be_committed_after'); @@ -346,6 +352,7 @@ insert into t1 values ('node1_committed_after'); insert into t1 values ('node1_committed_after'); insert into t1 values ('node1_committed_after'); COMMIT; +connection node_1a_galera_st_clean_slave; ROLLBACK; SELECT COUNT(*) FROM t1; COUNT(*) @@ -664,6 +671,7 @@ node1_committed_after node1_committed_after COMMIT; SET AUTOCOMMIT=ON; +connection node_1; SELECT COUNT(*) FROM t1; COUNT(*) 30

1 0

[Commits] e78249590b8: Merge remote-tracking branch 'origin/10.1' into 10.2
by jan 21 Nov '18

21 Nov '18

revision-id: e78249590b8230fe3224caf35ec8a302d7915c7c (mariadb-10.2.19-14-ge78249590b8) parent(s): b86e18cb44fd4ab42c08e4b7aae1b7e131a3ea46 41fa9a598655a15b423a7453eba5acaf5bd5d324 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-21 13:54:45 +0200 message: Merge remote-tracking branch 'origin/10.1' into 10.2 mysql-test/suite/galera/disabled.def | 6 +- .../galera/r/galera_autoinc_sst_mariabackup.result | 47 ++++ .../galera/r/galera_ist_mariabackup,debug.rdiff | 114 ++++++++ .../suite/galera/r/galera_ist_mariabackup.result | 287 +++++++++++++++++++++ ...a_ist_mariabackup_innodb_flush_logs,debug.rdiff | 114 ++++++++ ...galera_ist_mariabackup_innodb_flush_logs.result | 96 +++++++ .../galera_sst_mariabackup_encrypt_with_key.result | 3 + .../r/galera_sst_mysqldump_with_key,debug.rdiff | 106 ++++++++ .../galera/r/galera_sst_mysqldump_with_key.result | 108 -------- mysql-test/suite/galera/r/partition.result | 18 +- .../galera/t/galera_autoinc_sst_mariabackup.cnf | 12 + .../galera/t/galera_autoinc_sst_mariabackup.test | 96 +++++++ .../suite/galera/t/galera_ist_mariabackup.cnf | 12 + .../suite/galera/t/galera_ist_mariabackup.test | 16 ++ .../t/galera_ist_mariabackup_innodb_flush_logs.cnf | 14 + .../galera_ist_mariabackup_innodb_flush_logs.test | 12 + .../t/galera_sst_mariabackup_encrypt_with_key.cnf | 12 + .../t/galera_sst_mariabackup_encrypt_with_key.test | 14 + mysql-test/suite/galera/t/partition.test | 14 +- 19 files changed, 980 insertions(+), 121 deletions(-) diff --cc mysql-test/suite/galera/disabled.def index a8cb9bbafbf,94256dd88d7..10b0a0fdb98 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@@ -27,19 -27,10 +27,23 @@@ galera_ssl_upgrade : MDEV-13549 Galera galera.MW-329 : wsrep_local_replays not stable MW-416 : MDEV-13549 Galera test failures MW-388 : MDEV-13549 Galera test failures +galera.MW-44 : MDEV-15809 Test failure on galera.MW-44 +galera.galera_pc_ignore_sb : MDEV-15811 Test failure on galera_pc_ignore_sb +galera_kill_applier : race condition at the start of the test +galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read transfer status +pxc-421: Lock timeout exceeded galera_sst_mysqldump_with_key : MDEV-16890 Galera test failure +galera.galera_binlog_stmt_autoinc : MDEV-17106 Test failure on galera.galera_binlog_stmt_autoinc +galera.galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl +galera.galera_var_node_address : MDEV-17151 Galera test failure on galera.galera_var_node_address galera_binlog_stmt_autoinc: MDEV-17106 Test failure on galera.galera_binlog_stmt_autoinc galera_gc_fc_limit : MDEV-17061 Test failure on galera.galera_gc_fc_limit - partition : MDEV-13881 galera.partition failed in buildbot with wrong result galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion galera_wan : MDEV-17259: Test failure on galera.galera_wan galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb galera_drop_database : test ++galera_sst_xtrabackup-v2_data_dir : xtrabackup is deprecated ++galera_sst_xtrabackup-v2_encrypt_with_key : xtrabackup is deprecated ++galera_sst_xtrabackup-v2-options : xtrabackup is deprecated ++galera_sst_xtrabackup-v2 : xtrabackup is deprecated ++galera_autoinc_sst_xtrabackup : xtrabackup is deprecated diff --cc mysql-test/suite/galera/r/galera_autoinc_sst_mariabackup.result index 00000000000,228d7c6f041..d0fac1e3d14 mode 000000,100644..100644 --- a/mysql-test/suite/galera/r/galera_autoinc_sst_mariabackup.result +++ b/mysql-test/suite/galera/r/galera_autoinc_sst_mariabackup.result @@@ -1,0 -1,36 +1,47 @@@ ++connection node_1; + CREATE TABLE t1 (f1 INTEGER PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB; + CREATE PROCEDURE p1 () + BEGIN + DECLARE x INT DEFAULT 1; + DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END; + WHILE 1 DO + INSERT INTO t1 VALUES (DEFAULT); + COMMIT; + END WHILE; + END| + CALL p1();; ++connection node_2; + CALL p1();; ++connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2; ++connection node_2a; + Killing server ... + INSERT INTO t1 VALUES (DEFAULT); ++connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1; ++connection node_1a; + INSERT INTO t1 VALUES (DEFAULT); ++connection node_1; + Got one of the listed errors ++connection node_2; + Got one of the listed errors ++connection node_1a; ++connection node_2a; + count_equal + 1 + CALL mtr.add_suppression("WSREP: Action message in non-primary configuration from member 0"); + SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; + VARIABLE_VALUE + 2 + SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; + VARIABLE_VALUE = 2 + 1 ++connection node_1a; + SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; + VARIABLE_VALUE + 2 + SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; + VARIABLE_VALUE = 2 + 1 + DROP PROCEDURE p1; + DROP TABLE t1; + CALL mtr.add_suppression("gcs_caused\$\$ returned -1 \$Operation not permitted\$"); + CALL mtr.add_suppression("WSREP: Action message in non-primary configuration from member 0"); diff --cc mysql-test/suite/galera/r/galera_ist_mariabackup,debug.rdiff index 00000000000,1c787cd2fef..23d2e52e196 mode 000000,100644..100644 --- a/mysql-test/suite/galera/r/galera_ist_mariabackup,debug.rdiff +++ b/mysql-test/suite/galera/r/galera_ist_mariabackup,debug.rdiff @@@ -1,0 -1,103 +1,114 @@@ ---- r/galera_ist_mariabackup.result 2018-11-19 15:15:21.093874145 +0200 -+++ r/galera_ist_mariabackup.reject 2018-11-19 16:25:52.220523327 +0200 -@@ -259,3 +259,100 @@ ++--- r/galera_ist_mariabackup.result 2018-11-21 08:59:49.349536948 +0200 +++++ r/galera_ist_mariabackup.reject 2018-11-21 13:29:54.520133456 +0200 ++@@ -285,3 +285,111 @@ + DROP TABLE t1; + COMMIT; + SET AUTOCOMMIT=ON; + +Performing State Transfer on a server that has been killed and restarted + +while a DDL was in progress on it +++connection node_1; + +CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; + +SET AUTOCOMMIT=OFF; + +START TRANSACTION; + +INSERT INTO t1 VALUES ('node1_committed_before'); + +INSERT INTO t1 VALUES ('node1_committed_before'); + +INSERT INTO t1 VALUES ('node1_committed_before'); + +INSERT INTO t1 VALUES ('node1_committed_before'); + +INSERT INTO t1 VALUES ('node1_committed_before'); +++connection node_2; + +START TRANSACTION; + +INSERT INTO t1 VALUES ('node2_committed_before'); + +INSERT INTO t1 VALUES ('node2_committed_before'); + +INSERT INTO t1 VALUES ('node2_committed_before'); + +INSERT INTO t1 VALUES ('node2_committed_before'); + +INSERT INTO t1 VALUES ('node2_committed_before'); + +COMMIT; + +SET GLOBAL debug_dbug = 'd,sync.alter_opened_table'; +++connection node_1; + +ALTER TABLE t1 ADD COLUMN f2 INTEGER; +++connection node_2; + +SET wsrep_sync_wait = 0; + +Killing server ... +++connection node_1; + +SET AUTOCOMMIT=OFF; + +START TRANSACTION; + +INSERT INTO t1 (f1) VALUES ('node1_committed_during'); + +INSERT INTO t1 (f1) VALUES ('node1_committed_during'); + +INSERT INTO t1 (f1) VALUES ('node1_committed_during'); + +INSERT INTO t1 (f1) VALUES ('node1_committed_during'); + +INSERT INTO t1 (f1) VALUES ('node1_committed_during'); + +COMMIT; + +START TRANSACTION; + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); +++connect node_1a_galera_st_kill_slave_ddl, 127.0.0.1, root, , test, $NODE_MYPORT_1; + +SET AUTOCOMMIT=OFF; + +START TRANSACTION; + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); +++connection node_2; + +Performing --wsrep-recover ... +++connection node_2; + +Starting server ... + +Using --wsrep-start-position when starting mysqld ... + +SET AUTOCOMMIT=OFF; + +START TRANSACTION; + +INSERT INTO t1 (f1) VALUES ('node2_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node2_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node2_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node2_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node2_committed_after'); + +COMMIT; +++connection node_1; + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +COMMIT; + +SET AUTOCOMMIT=OFF; + +START TRANSACTION; + +INSERT INTO t1 (f1) VALUES ('node1_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_committed_after'); + +COMMIT; +++connection node_1a_galera_st_kill_slave_ddl; + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +ROLLBACK; + +SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; + +COUNT(*) = 2 + +1 + +SELECT COUNT(*) = 35 FROM t1; + +COUNT(*) = 35 + +1 + +SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; + +COUNT(*) = 0 + +1 + +COMMIT; + +SET AUTOCOMMIT=ON; +++connection node_1; + +SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; + +COUNT(*) = 2 + +1 + +SELECT COUNT(*) = 35 FROM t1; + +COUNT(*) = 35 + +1 + +SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; + +COUNT(*) = 0 + +1 + +DROP TABLE t1; + +COMMIT; + +SET AUTOCOMMIT=ON; + +SET GLOBAL debug_dbug = $debug_orig; diff --cc mysql-test/suite/galera/r/galera_ist_mariabackup.result index 00000000000,099d944d491..8a7c02ab1b6 mode 000000,100644..100644 --- a/mysql-test/suite/galera/r/galera_ist_mariabackup.result +++ b/mysql-test/suite/galera/r/galera_ist_mariabackup.result @@@ -1,0 -1,261 +1,287 @@@ ++connection node_1; ++connection node_2; + Performing State Transfer on a server that has been temporarily disconnected ++connection node_1; + CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_committed_before'); + INSERT INTO t1 VALUES ('node1_committed_before'); + INSERT INTO t1 VALUES ('node1_committed_before'); + INSERT INTO t1 VALUES ('node1_committed_before'); + INSERT INTO t1 VALUES ('node1_committed_before'); + COMMIT; ++connection node_2; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + COMMIT; + Unloading wsrep provider ... + SET GLOBAL wsrep_provider = 'none'; ++connection node_1; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_committed_during'); + INSERT INTO t1 VALUES ('node1_committed_during'); + INSERT INTO t1 VALUES ('node1_committed_during'); + INSERT INTO t1 VALUES ('node1_committed_during'); + INSERT INTO t1 VALUES ('node1_committed_during'); + COMMIT; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); ++connect node_1a_galera_st_disconnect_slave, 127.0.0.1, root, , test, $NODE_MYPORT_1; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); ++connection node_2; + Loading wsrep provider ... + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node2_committed_after'); + INSERT INTO t1 VALUES ('node2_committed_after'); + INSERT INTO t1 VALUES ('node2_committed_after'); + INSERT INTO t1 VALUES ('node2_committed_after'); + INSERT INTO t1 VALUES ('node2_committed_after'); + COMMIT; ++connection node_1; + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + COMMIT; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_committed_after'); + INSERT INTO t1 VALUES ('node1_committed_after'); + INSERT INTO t1 VALUES ('node1_committed_after'); + INSERT INTO t1 VALUES ('node1_committed_after'); + INSERT INTO t1 VALUES ('node1_committed_after'); + COMMIT; ++connection node_1a_galera_st_disconnect_slave; + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + ROLLBACK; + SELECT COUNT(*) = 35 FROM t1; + COUNT(*) = 35 + 1 + SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; + COUNT(*) = 0 + 1 + COMMIT; + SET AUTOCOMMIT=ON; ++connection node_1; + SELECT COUNT(*) = 35 FROM t1; + COUNT(*) = 35 + 1 + SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; + COUNT(*) = 0 + 1 + DROP TABLE t1; + COMMIT; + SET AUTOCOMMIT=ON; + Performing State Transfer on a server that has been shut down cleanly and restarted ++connection node_1; + CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_committed_before'); + INSERT INTO t1 VALUES ('node1_committed_before'); + INSERT INTO t1 VALUES ('node1_committed_before'); + INSERT INTO t1 VALUES ('node1_committed_before'); + INSERT INTO t1 VALUES ('node1_committed_before'); + COMMIT; ++connection node_2; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + COMMIT; + Shutting down server ... ++connection node_1; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_committed_during'); + INSERT INTO t1 VALUES ('node1_committed_during'); + INSERT INTO t1 VALUES ('node1_committed_during'); + INSERT INTO t1 VALUES ('node1_committed_during'); + INSERT INTO t1 VALUES ('node1_committed_during'); + COMMIT; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); ++connect node_1a_galera_st_shutdown_slave, 127.0.0.1, root, , test, $NODE_MYPORT_1; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); ++connection node_2; + Starting server ... + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node2_committed_after'); + INSERT INTO t1 VALUES ('node2_committed_after'); + INSERT INTO t1 VALUES ('node2_committed_after'); + INSERT INTO t1 VALUES ('node2_committed_after'); + INSERT INTO t1 VALUES ('node2_committed_after'); + COMMIT; ++connection node_1; + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + COMMIT; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_committed_after'); + INSERT INTO t1 VALUES ('node1_committed_after'); + INSERT INTO t1 VALUES ('node1_committed_after'); + INSERT INTO t1 VALUES ('node1_committed_after'); + INSERT INTO t1 VALUES ('node1_committed_after'); + COMMIT; ++connection node_1a_galera_st_shutdown_slave; + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + ROLLBACK; + SELECT COUNT(*) = 35 FROM t1; + COUNT(*) = 35 + 1 + SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; + COUNT(*) = 0 + 1 + COMMIT; + SET AUTOCOMMIT=ON; ++connection node_1; + SELECT COUNT(*) = 35 FROM t1; + COUNT(*) = 35 + 1 + SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; + COUNT(*) = 0 + 1 + DROP TABLE t1; + COMMIT; + SET AUTOCOMMIT=ON; + Performing State Transfer on a server that has been killed and restarted ++connection node_1; + CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_committed_before'); + INSERT INTO t1 VALUES ('node1_committed_before'); + INSERT INTO t1 VALUES ('node1_committed_before'); + INSERT INTO t1 VALUES ('node1_committed_before'); + INSERT INTO t1 VALUES ('node1_committed_before'); + COMMIT; ++connection node_2; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + COMMIT; + Killing server ... ++connection node_1; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_committed_during'); + INSERT INTO t1 VALUES ('node1_committed_during'); + INSERT INTO t1 VALUES ('node1_committed_during'); + INSERT INTO t1 VALUES ('node1_committed_during'); + INSERT INTO t1 VALUES ('node1_committed_during'); + COMMIT; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); ++connect node_1a_galera_st_kill_slave, 127.0.0.1, root, , test, $NODE_MYPORT_1; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); ++connection node_2; + Performing --wsrep-recover ... + Starting server ... + Using --wsrep-start-position when starting mysqld ... + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node2_committed_after'); + INSERT INTO t1 VALUES ('node2_committed_after'); + INSERT INTO t1 VALUES ('node2_committed_after'); + INSERT INTO t1 VALUES ('node2_committed_after'); + INSERT INTO t1 VALUES ('node2_committed_after'); + COMMIT; ++connection node_1; + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + COMMIT; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_committed_after'); + INSERT INTO t1 VALUES ('node1_committed_after'); + INSERT INTO t1 VALUES ('node1_committed_after'); + INSERT INTO t1 VALUES ('node1_committed_after'); + INSERT INTO t1 VALUES ('node1_committed_after'); + COMMIT; ++connection node_1a_galera_st_kill_slave; + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + ROLLBACK; + SELECT COUNT(*) = 35 FROM t1; + COUNT(*) = 35 + 1 + SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; + COUNT(*) = 0 + 1 + COMMIT; + SET AUTOCOMMIT=ON; ++connection node_1; + SELECT COUNT(*) = 35 FROM t1; + COUNT(*) = 35 + 1 + SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; + COUNT(*) = 0 + 1 + DROP TABLE t1; + COMMIT; + SET AUTOCOMMIT=ON; diff --cc mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs,debug.rdiff index 00000000000,d85d3bdad75..bda006e9aed mode 000000,100644..100644 --- a/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs,debug.rdiff +++ b/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs,debug.rdiff @@@ -1,0 -1,103 +1,114 @@@ ---- r/galera_ist_mariabackup_innodb_flush_logs.result 2018-11-19 15:21:15.429784085 +0200 -+++ r/galera_ist_mariabackup_innodb_flush_logs.reject 2018-11-19 16:27:43.100491616 +0200 -@@ -86,3 +86,100 @@ ++--- r/galera_ist_mariabackup_innodb_flush_logs.result 2018-11-21 09:00:28.081526942 +0200 +++++ r/galera_ist_mariabackup_innodb_flush_logs.reject 2018-11-21 13:30:56.432119642 +0200 ++@@ -94,3 +94,111 @@ + DROP TABLE t1; + COMMIT; + SET AUTOCOMMIT=ON; + +Performing State Transfer on a server that has been killed and restarted + +while a DDL was in progress on it +++connection node_1; + +CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; + +SET AUTOCOMMIT=OFF; + +START TRANSACTION; + +INSERT INTO t1 VALUES ('node1_committed_before'); + +INSERT INTO t1 VALUES ('node1_committed_before'); + +INSERT INTO t1 VALUES ('node1_committed_before'); + +INSERT INTO t1 VALUES ('node1_committed_before'); + +INSERT INTO t1 VALUES ('node1_committed_before'); +++connection node_2; + +START TRANSACTION; + +INSERT INTO t1 VALUES ('node2_committed_before'); + +INSERT INTO t1 VALUES ('node2_committed_before'); + +INSERT INTO t1 VALUES ('node2_committed_before'); + +INSERT INTO t1 VALUES ('node2_committed_before'); + +INSERT INTO t1 VALUES ('node2_committed_before'); + +COMMIT; + +SET GLOBAL debug_dbug = 'd,sync.alter_opened_table'; +++connection node_1; + +ALTER TABLE t1 ADD COLUMN f2 INTEGER; +++connection node_2; + +SET wsrep_sync_wait = 0; + +Killing server ... +++connection node_1; + +SET AUTOCOMMIT=OFF; + +START TRANSACTION; + +INSERT INTO t1 (f1) VALUES ('node1_committed_during'); + +INSERT INTO t1 (f1) VALUES ('node1_committed_during'); + +INSERT INTO t1 (f1) VALUES ('node1_committed_during'); + +INSERT INTO t1 (f1) VALUES ('node1_committed_during'); + +INSERT INTO t1 (f1) VALUES ('node1_committed_during'); + +COMMIT; + +START TRANSACTION; + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); +++connect node_1a_galera_st_kill_slave_ddl, 127.0.0.1, root, , test, $NODE_MYPORT_1; + +SET AUTOCOMMIT=OFF; + +START TRANSACTION; + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); +++connection node_2; + +Performing --wsrep-recover ... +++connection node_2; + +Starting server ... + +Using --wsrep-start-position when starting mysqld ... + +SET AUTOCOMMIT=OFF; + +START TRANSACTION; + +INSERT INTO t1 (f1) VALUES ('node2_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node2_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node2_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node2_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node2_committed_after'); + +COMMIT; +++connection node_1; + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); + +COMMIT; + +SET AUTOCOMMIT=OFF; + +START TRANSACTION; + +INSERT INTO t1 (f1) VALUES ('node1_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_committed_after'); + +INSERT INTO t1 (f1) VALUES ('node1_committed_after'); + +COMMIT; +++connection node_1a_galera_st_kill_slave_ddl; + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); + +ROLLBACK; + +SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; + +COUNT(*) = 2 + +1 + +SELECT COUNT(*) = 35 FROM t1; + +COUNT(*) = 35 + +1 + +SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; + +COUNT(*) = 0 + +1 + +COMMIT; + +SET AUTOCOMMIT=ON; +++connection node_1; + +SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; + +COUNT(*) = 2 + +1 + +SELECT COUNT(*) = 35 FROM t1; + +COUNT(*) = 35 + +1 + +SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; + +COUNT(*) = 0 + +1 + +DROP TABLE t1; + +COMMIT; + +SET AUTOCOMMIT=ON; + +SET GLOBAL debug_dbug = $debug_orig; diff --cc mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs.result index 00000000000,e3bf407ddaa..7813b5a58fc mode 000000,100644..100644 --- a/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs.result +++ b/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs.result @@@ -1,0 -1,88 +1,96 @@@ + Performing State Transfer on a server that has been killed and restarted ++connection node_1; + CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_committed_before'); + INSERT INTO t1 VALUES ('node1_committed_before'); + INSERT INTO t1 VALUES ('node1_committed_before'); + INSERT INTO t1 VALUES ('node1_committed_before'); + INSERT INTO t1 VALUES ('node1_committed_before'); + COMMIT; ++connection node_2; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + COMMIT; + Killing server ... ++connection node_1; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_committed_during'); + INSERT INTO t1 VALUES ('node1_committed_during'); + INSERT INTO t1 VALUES ('node1_committed_during'); + INSERT INTO t1 VALUES ('node1_committed_during'); + INSERT INTO t1 VALUES ('node1_committed_during'); + COMMIT; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); ++connect node_1a_galera_st_kill_slave, 127.0.0.1, root, , test, $NODE_MYPORT_1; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); ++connection node_2; + Performing --wsrep-recover ... + Starting server ... + Using --wsrep-start-position when starting mysqld ... + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node2_committed_after'); + INSERT INTO t1 VALUES ('node2_committed_after'); + INSERT INTO t1 VALUES ('node2_committed_after'); + INSERT INTO t1 VALUES ('node2_committed_after'); + INSERT INTO t1 VALUES ('node2_committed_after'); + COMMIT; ++connection node_1; + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + INSERT INTO t1 VALUES ('node1_to_be_committed_after'); + COMMIT; + SET AUTOCOMMIT=OFF; + START TRANSACTION; + INSERT INTO t1 VALUES ('node1_committed_after'); + INSERT INTO t1 VALUES ('node1_committed_after'); + INSERT INTO t1 VALUES ('node1_committed_after'); + INSERT INTO t1 VALUES ('node1_committed_after'); + INSERT INTO t1 VALUES ('node1_committed_after'); + COMMIT; ++connection node_1a_galera_st_kill_slave; + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); + ROLLBACK; + SELECT COUNT(*) = 35 FROM t1; + COUNT(*) = 35 + 1 + SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; + COUNT(*) = 0 + 1 + COMMIT; + SET AUTOCOMMIT=ON; ++connection node_1; + SELECT COUNT(*) = 35 FROM t1; + COUNT(*) = 35 + 1 + SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; + COUNT(*) = 0 + 1 + DROP TABLE t1; + COMMIT; + SET AUTOCOMMIT=ON; diff --cc mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result index 02dde169911,bdf3844f2c5..de52ac2fd1d --- a/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result +++ b/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result @@@ -204,120 -183,12 +204,12 @@@ COUNT(*) = DROP TABLE t1; COMMIT; SET AUTOCOMMIT=ON; - Performing State Transfer on a server that has been killed and restarted - while a DDL was in progress on it - connection node_1; - CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 VALUES ('node1_committed_before'); - INSERT INTO t1 VALUES ('node1_committed_before'); - INSERT INTO t1 VALUES ('node1_committed_before'); - INSERT INTO t1 VALUES ('node1_committed_before'); - INSERT INTO t1 VALUES ('node1_committed_before'); - connection node_2; - START TRANSACTION; - INSERT INTO t1 VALUES ('node2_committed_before'); - INSERT INTO t1 VALUES ('node2_committed_before'); - INSERT INTO t1 VALUES ('node2_committed_before'); - INSERT INTO t1 VALUES ('node2_committed_before'); - INSERT INTO t1 VALUES ('node2_committed_before'); - COMMIT; - SET GLOBAL debug_dbug = 'd,sync.alter_opened_table'; - connection node_1; - ALTER TABLE t1 ADD COLUMN f2 INTEGER; - connection node_2; - SET wsrep_sync_wait = 0; - Killing server ... - connection node_1; - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - INSERT INTO t1 (f1) VALUES ('node1_committed_during'); - COMMIT; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - connect node_1a_galera_st_kill_slave_ddl, 127.0.0.1, root, , test, $NODE_MYPORT_1; - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - connection node_2; - Performing --wsrep-recover ... - connection node_2; - Starting server ... - Using --wsrep-start-position when starting mysqld ... - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - INSERT INTO t1 (f1) VALUES ('node2_committed_after'); - COMMIT; - connection node_1; - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); - COMMIT; - SET AUTOCOMMIT=OFF; - START TRANSACTION; - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - INSERT INTO t1 (f1) VALUES ('node1_committed_after'); - COMMIT; - connection node_1a_galera_st_kill_slave_ddl; - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); - ROLLBACK; - SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; - COUNT(*) = 2 - 1 - SELECT COUNT(*) = 35 FROM t1; - COUNT(*) = 35 - 1 - SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; - COUNT(*) = 0 - 1 - COMMIT; - SET AUTOCOMMIT=ON; - connection node_1; - SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; - COUNT(*) = 2 - 1 - SELECT COUNT(*) = 35 FROM t1; - COUNT(*) = 35 - 1 - SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; - COUNT(*) = 0 - 1 - DROP TABLE t1; - COMMIT; - SET AUTOCOMMIT=ON; - SET GLOBAL debug_dbug = $debug_orig; +connection node_1; CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query"); DROP USER sst; +connection node_2; CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query"); CALL mtr.add_suppression("InnoDB: Error: Table \"mysql\"\\.\"innodb_index_stats\" not found"); -CALL mtr.add_suppression("InnoDB: New log files created"); -CALL mtr.add_suppression("InnoDB: Creating foreign key constraint system tables"); CALL mtr.add_suppression("Can't open and lock time zone table"); CALL mtr.add_suppression("Can't open and lock privilege tables"); CALL mtr.add_suppression("Info table is not ready to be used"); diff --cc mysql-test/suite/galera/r/partition.result index 3835de514aa,6b0868aab3e..bdf6df25589 --- a/mysql-test/suite/galera/r/partition.result +++ b/mysql-test/suite/galera/r/partition.result @@@ -118,10 -109,9 +118,10 @@@ connection node_1 SET GLOBAL wsrep_load_data_splitting = ON; CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2; +connection node_2; - SELECT COUNT(*) = 20002 FROM t1; - COUNT(*) = 20002 - 1 + SELECT COUNT(*) FROM t1; + COUNT(*) + 20002 wsrep_last_committed_diff 1 DROP TABLE t1; @@@ -130,10 -119,9 +130,10 @@@ connection node_1 SET GLOBAL wsrep_load_data_splitting = ON; CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2; +connection node_2; - SELECT COUNT(*) = 101 FROM t1; - COUNT(*) = 101 - 1 + SELECT COUNT(*) FROM t1; + COUNT(*) + 101 wsrep_last_committed_diff 1 DROP TABLE t1; @@@ -143,10 -130,9 +143,10 @@@ connection node_1 SET GLOBAL wsrep_load_data_splitting = OFF; CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2; +connection node_2; - SELECT COUNT(*) = 20002 FROM t1; - COUNT(*) = 20002 - 1 + SELECT COUNT(*) FROM t1; + COUNT(*) + 20002 wsrep_last_committed_diff 1 DROP TABLE t1;

1 0