MDEV-11227 - mysqlimport -l doesn't issue UNLOCK TABLES

Merged fix for innodb_mysql from 5.7.

mysql-test/include/mix1.inc

@@ -654,9 +654,11 @@ INSERT INTO t2 VALUES (1);
 
 CONNECTION c2;
 SET AUTOCOMMIT=0;
+SET @old_lock_wait_timeout= @@lock_wait_timeout;
+SET lock_wait_timeout= 1;
 --error ER_LOCK_WAIT_TIMEOUT
 LOCK TABLES t1 READ, t2 READ;
-
+SET  @@lock_wait_timeout= @old_lock_wait_timeout;
 CONNECTION c1;
 COMMIT;
 INSERT INTO t1 VALUES (1);

mysql-test/suite/innodb/r/innodb_mysql.result

@@ -678,8 +678,11 @@ SET AUTOCOMMIT=0;
 INSERT INTO t2 VALUES (1);
 connection c2;
 SET AUTOCOMMIT=0;
+SET @old_lock_wait_timeout= @@lock_wait_timeout;
+SET lock_wait_timeout= 1;
 LOCK TABLES t1 READ, t2 READ;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+SET  @@lock_wait_timeout= @old_lock_wait_timeout;
 connection c1;
 COMMIT;
 INSERT INTO t1 VALUES (1);