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.

Author: midenok

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
 #

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