diff options
| author | Daniele Sciascia <daniele.sciascia@galeracluster.com> | 2020-11-02 14:18:49 +0100 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2020-11-03 11:15:35 +0200 |
| commit | 9166295bdca2659788b8fc44a62cbb91a1ad9492 (patch) | |
| tree | 69c6fd609ab1a9c937c7b59a98f47c78e1a7f171 | |
| parent | 440d4b282dd4992d64abdd6289859598db7e5f75 (diff) | |
| download | mariadb-git-9166295bdca2659788b8fc44a62cbb91a1ad9492.tar.gz | |
Fix MTR test galera.galera_triggerbb-10.5-trigger
Changed the test so that it does not rely on specific auto increment
ids. With Galera's default wsrep_auto_increment_control setting it is
not guaranteed that auto increments always start from 1. The test was
occasionally failing due to result content mismatch.
| -rw-r--r-- | mysql-test/suite/galera/r/galera_trigger.result | 48 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_trigger.test | 8 |
2 files changed, 28 insertions, 28 deletions
diff --git a/mysql-test/suite/galera/r/galera_trigger.result b/mysql-test/suite/galera/r/galera_trigger.result index 40b63b327af..2a31a104404 100644 --- a/mysql-test/suite/galera/r/galera_trigger.result +++ b/mysql-test/suite/galera/r/galera_trigger.result @@ -45,34 +45,34 @@ connection node_2; set session wsrep_sync_wait=15; insert into t1(value) values (3); insert into t1(value) values (4); -select * from t2; -id tbl action -1 t1 INSERT -3 t1 INSERT -4 t1 INSERT -6 t1 INSERT +select tbl, action from t2; +tbl action +t1 INSERT +t1 INSERT +t1 INSERT +t1 INSERT connection node_1; drop trigger if exists log_insert; insert into t1(value) values (5); -select * from t2; -id tbl action -1 t1 INSERT -3 t1 INSERT -4 t1 INSERT -6 t1 INSERT +select tbl, action from t2; +tbl action +t1 INSERT +t1 INSERT +t1 INSERT +t1 INSERT connection node_2; insert into t1(value) values (6); -select * from t2; -id tbl action -1 t1 INSERT -3 t1 INSERT -4 t1 INSERT -6 t1 INSERT +select tbl, action from t2; +tbl action +t1 INSERT +t1 INSERT +t1 INSERT +t1 INSERT connection node_1; -select * from t2; -id tbl action -1 t1 INSERT -3 t1 INSERT -4 t1 INSERT -6 t1 INSERT +select tbl, action from t2; +tbl action +t1 INSERT +t1 INSERT +t1 INSERT +t1 INSERT drop table t1, t2; diff --git a/mysql-test/suite/galera/t/galera_trigger.test b/mysql-test/suite/galera/t/galera_trigger.test index f85a75d0ff1..3c66b941e32 100644 --- a/mysql-test/suite/galera/t/galera_trigger.test +++ b/mysql-test/suite/galera/t/galera_trigger.test @@ -55,18 +55,18 @@ insert into t1(value) values (2); set session wsrep_sync_wait=15; insert into t1(value) values (3); insert into t1(value) values (4); -select * from t2; +select tbl, action from t2; --connection node_1 drop trigger if exists log_insert; insert into t1(value) values (5); -select * from t2; +select tbl, action from t2; --connection node_2 insert into t1(value) values (6); -select * from t2; +select tbl, action from t2; --connection node_1 -select * from t2; +select tbl, action from t2; drop table t1, t2; |