diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2020-02-02 15:13:29 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2020-02-02 15:13:29 +0300 |
| commit | 14e6f0251ccc0056ade6637ea34bb40e72024fcd (patch) | |
| tree | 8f3da5afc8a315444cb98f520f911a8ea1731540 | |
| parent | c8bd8d5c64a2bbe603f28cfe10774556da5312a7 (diff) | |
| download | mariadb-git-14e6f0251ccc0056ade6637ea34bb40e72024fcd.tar.gz | |
MDEV-20955 versioning.update failed in buildbot with wrong result code
Race condition when innodb_lock_wait_timeout (default 50 seconds)
exceeds for 'send update', but information_schema.innodb_lock_waits
still sees this wait or it my exit by timeout. My occur on overloaded
host.
| -rw-r--r-- | mysql-test/suite/versioning/r/update.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/t/update.test | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/suite/versioning/r/update.result b/mysql-test/suite/versioning/r/update.result index e7c617f9196..a2ec02a7ec1 100644 --- a/mysql-test/suite/versioning/r/update.result +++ b/mysql-test/suite/versioning/r/update.result @@ -249,6 +249,8 @@ replace t1 values (1,2),(1,3),(2,4); # # MDEV-14829 Assertion `0' failed in Protocol::end_statement upon concurrent UPDATE # +set @old_lock_wait_timeout= @@innodb_lock_wait_timeout; +set @@innodb_lock_wait_timeout= 1073741824; create or replace table t1 (pk int, a char(3), b char(3), primary key(pk)) engine=innodb with system versioning; insert into t1 (pk) values (1); @@ -265,6 +267,7 @@ ERROR 40001: Deadlock found when trying to get lock; try restarting transaction disconnect con1; connection default; drop table t1; +set @@innodb_lock_wait_timeout= @old_lock_wait_timeout; # # MDEV-19406 Assertion on updating view of join with versioned table # diff --git a/mysql-test/suite/versioning/t/update.test b/mysql-test/suite/versioning/t/update.test index 548505bd39a..71e946e6c2b 100644 --- a/mysql-test/suite/versioning/t/update.test +++ b/mysql-test/suite/versioning/t/update.test @@ -157,6 +157,8 @@ replace t1 values (1,2),(1,3),(2,4); --echo # --echo # MDEV-14829 Assertion `0' failed in Protocol::end_statement upon concurrent UPDATE --echo # +set @old_lock_wait_timeout= @@innodb_lock_wait_timeout; +set @@innodb_lock_wait_timeout= 1073741824; create or replace table t1 (pk int, a char(3), b char(3), primary key(pk)) engine=innodb with system versioning; @@ -175,6 +177,7 @@ disconnect con1; connection default; reap; drop table t1; +set @@innodb_lock_wait_timeout= @old_lock_wait_timeout; --echo # --echo # MDEV-19406 Assertion on updating view of join with versioned table |