revision-id: 5ce21bc67f48342dbb3e6759dd9ab2b19e6af7e0 (mariadb-10.2.16-55-g5ce21bc67f4) parent(s): ef3070e997a6e90c8eadaa833dc47324c2167bb4 b4f7f12e2ba2d805f9e8c424d2082beacca0111d author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-08-02 21:41:41 +0200 message: Merge branch '10.1' into 10.2 .../galera/r/galera_sst_mysqldump_with_key.result | 125 ++++++++++++++++++++- 1 file changed, 120 insertions(+), 5 deletions(-) diff --cc mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result index 0329e105a63,bf9613f6d7d..02dde169911 --- a/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result +++ b/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result @@@ -14,8 -9,7 +14,8 @@@ CREATE USER sslsst GRANT ALL PRIVILEGES ON *.* TO sslsst; GRANT USAGE ON *.* TO sslsst REQUIRE SSL; SET GLOBAL wsrep_sst_auth = 'sslsst:'; - Performing State Transfer on a server that has been temporarily disconnected + 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; @@@ -34,9 -27,7 +34,8 @@@ INSERT INTO t1 VALUES ('node2_committed INSERT INTO t1 VALUES ('node2_committed_before'); INSERT INTO t1 VALUES ('node2_committed_before'); COMMIT; - Unloading wsrep provider ... - SET GLOBAL wsrep_provider = 'none'; + Shutting down server ... +connection node_1; SET AUTOCOMMIT=OFF; START TRANSACTION; INSERT INTO t1 VALUES ('node1_committed_during'); @@@ -51,7 -42,6 +50,7 @@@ INSERT INTO t1 VALUES ('node1_to_be_com 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; ++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'); @@@ -69,6 -58,6 +68,7 @@@ INSERT INTO t1 VALUES ('node2_committed 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'); @@@ -83,6 -72,6 +83,7 @@@ INSERT INTO t1 VALUES ('node1_committed 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'); @@@ -97,6 -86,6 +98,7 @@@ COUNT(*) = 1 COMMIT; SET AUTOCOMMIT=ON; ++connection node_1; SELECT COUNT(*) = 35 FROM t1; COUNT(*) = 35 1 @@@ -107,6 -96,6 +109,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; @@@ -116,6 -105,6 +119,7 @@@ INSERT INTO t1 VALUES ('node1_committed 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'); @@@ -125,6 -114,6 +129,7 @@@ INSERT INTO t1 VALUES ('node2_committed 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'); @@@ -139,6 -128,6 +144,7 @@@ INSERT INTO t1 VALUES ('node1_to_be_com 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'); @@@ -146,6 -135,6 +152,7 @@@ INSERT INTO t1 VALUES ('node1_to_be_rol 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 ... @@@ -172,7 -160,6 +179,7 @@@ INSERT INTO t1 VALUES ('node1_committed INSERT INTO t1 VALUES ('node1_committed_after'); INSERT INTO t1 VALUES ('node1_committed_after'); COMMIT; - connection node_1a_galera_st_disconnect_slave; ++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'); @@@ -197,12 -183,109 +204,120 @@@ 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");