diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-11 11:45:33 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-11 11:45:33 +0200 |
commit | 3ea49d35bd93c515f3da55b846850ba1125971a0 (patch) | |
tree | 6ac151cd540109709f3f89e6fdd0ecb324781dd8 /mysql-test/suite/galera | |
parent | ab7e2b048d7d0835ae7473873169b7606114348e (diff) | |
parent | 2a2ab121b0f65cdc4b104ec763d23f1b7035a644 (diff) | |
download | mariadb-git-3ea49d35bd93c515f3da55b846850ba1125971a0.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/suite/galera')
10 files changed, 48 insertions, 37 deletions
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 4a6e6919511..1296d494b76 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -26,8 +26,10 @@ galera_as_slave_replication_bundle : MDEV-15785 OPTION_GTID_BEGIN is set in Gtid galera_binlog_rows_query_log_events: MariaDB does not support binlog_rows_query_log_events galera_binlog_stmt_autoinc : MDEV-13549 auto_increment mismatch galera_flush : MariaDB does not have global.thread_statistics +galera_gcache_recover_manytrx : MDEV-18834 Galera test failure galera_gcs_fc_limit : MDEV-17061 Timeout in wait_condition.inc for PROCESSLIST -galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read transfer status +galera_ist_mariabackup : MDEV-18829 test leaves port open +galera_ist_progress: MDEV-15236 fails when trying to read transfer status galera_kill_applier : race condition at the start of the test galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl galera_migrate : MariaDB does not support START SLAVE USER diff --git a/mysql-test/suite/galera/r/galera_kill_nochanges.result b/mysql-test/suite/galera/r/galera_kill_nochanges.result index 56caf1bd9ea..3ccf73f0d46 100644 --- a/mysql-test/suite/galera/r/galera_kill_nochanges.result +++ b/mysql-test/suite/galera/r/galera_kill_nochanges.result @@ -1,4 +1,6 @@ connection node_1; +connection node_2; +connection node_1; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); connection node_2; diff --git a/mysql-test/suite/galera/r/galera_many_rows.result b/mysql-test/suite/galera/r/galera_many_rows.result index b06925fea60..d6669fe6bdf 100644 --- a/mysql-test/suite/galera/r/galera_many_rows.result +++ b/mysql-test/suite/galera/r/galera_many_rows.result @@ -1,7 +1,9 @@ connection node_1; +connection node_2; +connection node_1; SET SESSION innodb_lock_wait_timeout=600; SET SESSION lock_wait_timeout=600; -CREATE TABLE ten (f1 INTEGER); +CREATE TABLE ten (f1 INTEGER) engine=InnoDB; INSERT INTO ten VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); CREATE TABLE t1 (f1 INTEGER AUTO_INCREMENT PRIMARY KEY, f2 INTEGER) Engine=InnoDB; INSERT INTO t1 (f2) SELECT a1.f1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5; @@ -9,24 +11,24 @@ connection node_2; SET SESSION wsrep_sync_wait = 0; SET SESSION wsrep_sync_wait = 15; SET GLOBAL wsrep_provider_options = 'repl.causal_read_timeout=PT1H'; -SELECT COUNT(*) = 100000 FROM t1; -COUNT(*) = 100000 -1 +SELECT COUNT(*) FROM t1; +COUNT(*) +100000 INSERT INTO t1 (f2) SELECT a1.f1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5; connection node_1; -SELECT COUNT(*) = 200000 FROM t1; -COUNT(*) = 200000 -1 +SELECT COUNT(*) FROM t1; +COUNT(*) +200000 UPDATE t1 SET f2 = 1; connection node_2; -SELECT COUNT(*) = 200000 FROM t1 WHERE f2 = 1; -COUNT(*) = 200000 -1 +SELECT COUNT(*) FROM t1 WHERE f2 = 1; +COUNT(*) +200000 connection node_1; START TRANSACTION; -SELECT COUNT(*) = 200000 FROM t1; -COUNT(*) = 200000 -1 +SELECT COUNT(*) FROM t1; +COUNT(*) +200000 UPDATE t1 SET f2 = 3; connection node_2; START TRANSACTION; diff --git a/mysql-test/suite/galera/r/galera_var_dirty_reads.result b/mysql-test/suite/galera/r/galera_var_dirty_reads.result index 049aa5be3cc..020efb7b8f1 100644 --- a/mysql-test/suite/galera/r/galera_var_dirty_reads.result +++ b/mysql-test/suite/galera/r/galera_var_dirty_reads.result @@ -1,7 +1,5 @@ connection node_1; connection node_2; -connection node_1; -connection node_2; connection node_2; CREATE TABLE t1(i INT) ENGINE=INNODB; INSERT INTO t1 VALUES(1); diff --git a/mysql-test/suite/galera/r/galera_var_notify_cmd.result b/mysql-test/suite/galera/r/galera_var_notify_cmd.result index e9e4605e1bc..bcd9875743a 100644 --- a/mysql-test/suite/galera/r/galera_var_notify_cmd.result +++ b/mysql-test/suite/galera/r/galera_var_notify_cmd.result @@ -1,3 +1,4 @@ +connection node_1; SELECT COUNT(DISTINCT uuid) = 2 FROM mtr_wsrep_notify.membership; COUNT(DISTINCT uuid) = 2 1 diff --git a/mysql-test/suite/galera/t/galera_autoinc_sst_mariabackup.test b/mysql-test/suite/galera/t/galera_autoinc_sst_mariabackup.test index 731059dc584..20f2fb9dea0 100644 --- a/mysql-test/suite/galera/t/galera_autoinc_sst_mariabackup.test +++ b/mysql-test/suite/galera/t/galera_autoinc_sst_mariabackup.test @@ -5,7 +5,6 @@ --source include/big_test.inc --source include/galera_cluster.inc ---source include/have_innodb.inc --source include/have_mariabackup.inc --connection node_1 @@ -29,11 +28,11 @@ END| DELIMITER ;| --send CALL p1(); ---sleep 2 +--sleep 1 --connection node_2 --send CALL p1(); ---sleep 2 +--sleep 1 # Kill and restart node #2 @@ -41,10 +40,7 @@ DELIMITER ;| --connection node_2a --source include/kill_galera.inc ---sleep 10 --source include/start_mysqld.inc ---sleep 25 ---source include/wait_until_connected_again.inc INSERT INTO t1 VALUES (DEFAULT); @@ -68,8 +64,6 @@ INSERT INTO t1 VALUES (DEFAULT); --error 2013,2006 --reap ---sleep 10 - # Confirm that the count is correct and that the cluster is intact --connection node_1a diff --git a/mysql-test/suite/galera/t/galera_kill_nochanges.test b/mysql-test/suite/galera/t/galera_kill_nochanges.test index 4106378885f..9360ad542f6 100644 --- a/mysql-test/suite/galera/t/galera_kill_nochanges.test +++ b/mysql-test/suite/galera/t/galera_kill_nochanges.test @@ -3,7 +3,11 @@ # --source include/galera_cluster.inc ---source include/have_innodb.inc + +# Save original auto_increment_offset values. +--let $node_1=node_1 +--let $node_2=node_2 +--source include/auto_increment_offset_save.inc --connection node_1 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; @@ -29,4 +33,7 @@ SET SESSION wsrep_sync_wait = DEFAULT; SELECT COUNT(*) = 1 FROM t1; SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; +--let $node_2=node_2a +--source include/auto_increment_offset_restore.inc + DROP TABLE t1; diff --git a/mysql-test/suite/galera/t/galera_many_rows.cnf b/mysql-test/suite/galera/t/galera_many_rows.cnf new file mode 100644 index 00000000000..4e1022cf67f --- /dev/null +++ b/mysql-test/suite/galera/t/galera_many_rows.cnf @@ -0,0 +1,5 @@ +!include ../galera_2nodes.cnf + +[mysqld] +innodb-status-output=ON +innodb-status-output-locks=ON diff --git a/mysql-test/suite/galera/t/galera_many_rows.test b/mysql-test/suite/galera/t/galera_many_rows.test index 58ba85e1b9e..bc9e99db8da 100644 --- a/mysql-test/suite/galera/t/galera_many_rows.test +++ b/mysql-test/suite/galera/t/galera_many_rows.test @@ -1,13 +1,16 @@ - --source include/big_test.inc --source include/galera_cluster.inc ---source include/have_innodb.inc + +# Save original auto_increment_offset values. +--let $node_1=node_1 +--let $node_2=node_2 +--source include/auto_increment_offset_save.inc --connection node_1 SET SESSION innodb_lock_wait_timeout=600; SET SESSION lock_wait_timeout=600; -CREATE TABLE ten (f1 INTEGER); +CREATE TABLE ten (f1 INTEGER) engine=InnoDB; INSERT INTO ten VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); CREATE TABLE t1 (f1 INTEGER AUTO_INCREMENT PRIMARY KEY, f2 INTEGER) Engine=InnoDB; @@ -20,19 +23,19 @@ SET SESSION wsrep_sync_wait = 15; SET GLOBAL wsrep_provider_options = 'repl.causal_read_timeout=PT1H'; -SELECT COUNT(*) = 100000 FROM t1; +SELECT COUNT(*) FROM t1; INSERT INTO t1 (f2) SELECT a1.f1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5; --connection node_1 -SELECT COUNT(*) = 200000 FROM t1; +SELECT COUNT(*) FROM t1; UPDATE t1 SET f2 = 1; --connection node_2 -SELECT COUNT(*) = 200000 FROM t1 WHERE f2 = 1; +SELECT COUNT(*) FROM t1 WHERE f2 = 1; --connection node_1 START TRANSACTION; -SELECT COUNT(*) = 200000 FROM t1; +SELECT COUNT(*) FROM t1; UPDATE t1 SET f2 = 3; --connection node_2 @@ -50,5 +53,7 @@ COMMIT; --eval SET GLOBAL wsrep_provider_options = '$wsrep_provider_options_node2'; --enable_query_log +--source include/auto_increment_offset_restore.inc + DROP TABLE t1; DROP TABLE ten; diff --git a/mysql-test/suite/galera/t/galera_var_dirty_reads.test b/mysql-test/suite/galera/t/galera_var_dirty_reads.test index 1f01c4aac07..3e2108868af 100644 --- a/mysql-test/suite/galera/t/galera_var_dirty_reads.test +++ b/mysql-test/suite/galera/t/galera_var_dirty_reads.test @@ -11,11 +11,6 @@ --let $node_2=node_2 --source include/auto_increment_offset_save.inc -# Save original auto_increment_offset values. ---let $node_1=node_1 ---let $node_2=node_2 ---source include/auto_increment_offset_save.inc - --connection node_2 --let $wsrep_cluster_address_saved = `SELECT @@global.wsrep_cluster_address` |