revision-id: 97449e63d0bb7323946bbfad4bae0ad999589e0d (mariadb-10.3.6-291-g97449e63d0b) parent(s): 447f6072abb0d7131c41e3e96338a06aba4f2200 author: Jan Lindström committer: Jan Lindström timestamp: 2019-01-09 13:00:35 +0200 message: Fix test failure on galera.galera_many_rows by saving and restoring autoinc offset. modified: suite/galera/r/galera_many_rows.result modified: suite/galera/t/galera_many_rows.test --- mysql-test/suite/galera/r/galera_many_rows.result | 2 ++ mysql-test/suite/galera/t/galera_many_rows.test | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/mysql-test/suite/galera/r/galera_many_rows.result b/mysql-test/suite/galera/r/galera_many_rows.result index 28613c20779..26771dc3c24 100644 --- a/mysql-test/suite/galera/r/galera_many_rows.result +++ b/mysql-test/suite/galera/r/galera_many_rows.result @@ -1,6 +1,8 @@ connection node_2; connection node_1; 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); diff --git a/mysql-test/suite/galera/t/galera_many_rows.test b/mysql-test/suite/galera/t/galera_many_rows.test index 58ba85e1b9e..67e2eb6edbf 100644 --- a/mysql-test/suite/galera/t/galera_many_rows.test +++ b/mysql-test/suite/galera/t/galera_many_rows.test @@ -3,6 +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 SET SESSION innodb_lock_wait_timeout=600; SET SESSION lock_wait_timeout=600; @@ -52,3 +57,5 @@ COMMIT; DROP TABLE t1; DROP TABLE ten; + +--source include/auto_increment_offset_restore.inc