revision-id: e27caaf22944db11fd12a35f0f548f3a5d1ed8ba (mariadb-10.4.3-106-ge27caaf2294) parent(s): 3e1f3d3e2f14a157121b92bd4b76e986f1846454 author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-29 10:56:45 +0200 message: MDEV-18590: galera.versioning_trx_id: Test failure: mysqltest: Result content mismatch Add wsrep sync waits and if expected result is not reached print out current contents. --- mysql-test/suite/galera/r/versioning_trx_id.result | 6 ++++-- mysql-test/suite/galera/t/versioning_trx_id.test | 14 +++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/galera/r/versioning_trx_id.result b/mysql-test/suite/galera/r/versioning_trx_id.result index 232cca202c0..ec3dc09e97b 100644 --- a/mysql-test/suite/galera/r/versioning_trx_id.result +++ b/mysql-test/suite/galera/r/versioning_trx_id.result @@ -5,6 +5,7 @@ connection node_1; create table t1 (a int, s bigint unsigned as row start, e bigint unsigned as row end, period for system_time(s,e)) engine=InnoDB with system versioning; insert into t1 (a) values (1),(2); connection node_2; +set session wsrep_sync_wait=15; insert into t1 (a) values (3),(4); select a from t1; a @@ -19,6 +20,7 @@ select count(*) from mysql.transaction_registry where begin_timestamp>=commit_ti count(*) 0 connection node_3; +set session wsrep_sync_wait=15; insert into t1 (a) values (5),(6); select a from t1; a @@ -35,6 +37,7 @@ select count(*) from mysql.transaction_registry where begin_timestamp>=commit_ti count(*) 0 connection node_1; +set session wsrep_sync_wait=15; select a from t1; a 1 @@ -50,5 +53,4 @@ select count(*) from mysql.transaction_registry where begin_timestamp>=commit_ti count(*) 0 drop table t1; -disconnect node_2; -disconnect node_1; +disconnect node_3; diff --git a/mysql-test/suite/galera/t/versioning_trx_id.test b/mysql-test/suite/galera/t/versioning_trx_id.test index 175ead265a5..a99d7891ea0 100644 --- a/mysql-test/suite/galera/t/versioning_trx_id.test +++ b/mysql-test/suite/galera/t/versioning_trx_id.test @@ -7,22 +7,34 @@ create table t1 (a int, s bigint unsigned as row start, e bigint unsigned as row insert into t1 (a) values (1),(2); --connection node_2 +set session wsrep_sync_wait=15; insert into t1 (a) values (3),(4); select a from t1; select count(*) from mysql.transaction_registry where begin_timestamp='0-0-0'; +if (`SELECT count(*) from mysql.transaction_registry where begin_timestamp>=commit_timestamp`) { + select * from mysql.transaction_registry; +} select count(*) from mysql.transaction_registry where begin_timestamp>=commit_timestamp; --connection node_3 +set session wsrep_sync_wait=15; insert into t1 (a) values (5),(6); select a from t1; select count(*) from mysql.transaction_registry where begin_timestamp='0-0-0'; +if (`SELECT count(*) from mysql.transaction_registry where begin_timestamp>=commit_timestamp`) { + select * from mysql.transaction_registry; +} select count(*) from mysql.transaction_registry where begin_timestamp>=commit_timestamp; --connection node_1 +set session wsrep_sync_wait=15; select a from t1; select count(*) from mysql.transaction_registry where begin_timestamp='0-0-0'; +if (`SELECT count(*) from mysql.transaction_registry where begin_timestamp>=commit_timestamp`) { + select * from mysql.transaction_registry; +} select count(*) from mysql.transaction_registry where begin_timestamp>=commit_timestamp; drop table t1; ---source include/galera_end.inc +--disconnect node_3