diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-10-07 08:47:42 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-10-07 08:47:42 +0300 |
| commit | c3394870303090e3e58ec68f425cc46cc4762370 (patch) | |
| tree | c886cd5f2c38102db1f750384f44882fae529e8c | |
| parent | 37570e845bc5eb20e277340015c5fd36feb7a823 (diff) | |
| download | mariadb-git-c3394870303090e3e58ec68f425cc46cc4762370.tar.gz | |
Try to fix galera_parallel_simple test case.
| -rw-r--r-- | mysql-test/suite/galera/r/galera_parallel_simple.result | 20 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_parallel_simple.test | 14 |
2 files changed, 20 insertions, 14 deletions
diff --git a/mysql-test/suite/galera/r/galera_parallel_simple.result b/mysql-test/suite/galera/r/galera_parallel_simple.result index d95abefdc24..cac784cd16f 100644 --- a/mysql-test/suite/galera/r/galera_parallel_simple.result +++ b/mysql-test/suite/galera/r/galera_parallel_simple.result @@ -3,11 +3,11 @@ connection node_1; CREATE TABLE t1 (id INT) ENGINE=InnoDB; CREATE TABLE t2 (id INT) ENGINE=InnoDB; connection node_2; -SET GLOBAL wsrep_slave_threads = 2; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%'; NAME test/t1 test/t2 +SET GLOBAL wsrep_slave_threads = 2; LOCK TABLE t1 WRITE; connection node_1; INSERT INTO t1 VALUES (1); @@ -20,18 +20,20 @@ INSERT INTO t1 VALUES (1); INSERT INTO t2 VALUES (1); INSERT INTO t1 VALUES (1); INSERT INTO t2 VALUES (1); -INSERT INTO t1 VALUES (1); -INSERT INTO t2 VALUES (1); +INSERT INTO t1 select * from t1; +INSERT INTO t2 select * from t2; +INSERT INTO t1 select * from t1; +INSERT INTO t2 select * from t2; connection node_2; SET SESSION wsrep_sync_wait = 0; UNLOCK TABLES; SET SESSION wsrep_sync_wait = 15; -SELECT COUNT(*) = 10 FROM t1; -COUNT(*) = 10 -0 -SELECT COUNT(*) = 10 FROM t2; -COUNT(*) = 10 -0 +SELECT COUNT(*) as expect_20 FROM t1; +expect_20 +20 +SELECT COUNT(*) as expect_20 FROM t2; +expect_20 +20 SET GLOBAL wsrep_slave_threads = 1;; DROP TABLE t1; DROP TABLE t2; diff --git a/mysql-test/suite/galera/t/galera_parallel_simple.test b/mysql-test/suite/galera/t/galera_parallel_simple.test index 51bb1355ba4..d49dc0ae876 100644 --- a/mysql-test/suite/galera/t/galera_parallel_simple.test +++ b/mysql-test/suite/galera/t/galera_parallel_simple.test @@ -12,7 +12,6 @@ CREATE TABLE t1 (id INT) ENGINE=InnoDB; CREATE TABLE t2 (id INT) ENGINE=InnoDB; --connection node_2 -SET GLOBAL wsrep_slave_threads = 2; # Wait until above DDL's are replicated --let $wait_condition = SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%'; @@ -20,6 +19,8 @@ SET GLOBAL wsrep_slave_threads = 2; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%'; +SET GLOBAL wsrep_slave_threads = 2; + LOCK TABLE t1 WRITE; --connection node_1 @@ -38,8 +39,11 @@ INSERT INTO t2 VALUES (1); INSERT INTO t1 VALUES (1); INSERT INTO t2 VALUES (1); -INSERT INTO t1 VALUES (1); -INSERT INTO t2 VALUES (1); +INSERT INTO t1 select * from t1; +INSERT INTO t2 select * from t2; + +INSERT INTO t1 select * from t1; +INSERT INTO t2 select * from t2; --connection node_2 SET SESSION wsrep_sync_wait = 0; @@ -54,8 +58,8 @@ UNLOCK TABLES; SET SESSION wsrep_sync_wait = 15; -SELECT COUNT(*) = 10 FROM t1; -SELECT COUNT(*) = 10 FROM t2; +SELECT COUNT(*) as expect_20 FROM t1; +SELECT COUNT(*) as expect_20 FROM t2; --eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig; |