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;