From b4c2ceb214c262c09094fd3d318c786368259760 Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <psergey@askmonty.org>
Date: Sat, 7 Apr 2018 15:03:15 +0300
Subject: MDEV-15769: Assertion `!is_set() || (m_status == DA_OK_BULK &&
 is_bulk_op())' failed

Adjust the fix for MDEV-15472:
In close_cached_tables(), locked_tables_list.reopen_tables(...) call
might be made when a previous call to some function has already returned
error.
In this scenario, the function should return 0, even if reopen_tables(...)
call has succeeded.
---
 mysql-test/r/lock.result | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/lock.result b/mysql-test/r/lock.result
index 00dbb166ffb..e3fd16ee59a 100644
--- a/mysql-test/r/lock.result
+++ b/mysql-test/r/lock.result
@@ -489,3 +489,19 @@ unlock tables;
 disconnect con1;
 connection default;
 drop table t1;
+# 
+# MDEV-15769: Assertion `!is_set() || (m_status == DA_OK_BULK && is_bulk_op())' failed in Diagnostics_area::set_ok_status
+# 
+CREATE TABLE t1 (a INT);
+CREATE TABLE t2 (b INT);
+LOCK TABLE t1 READ;
+connect  con1,localhost,root,,test;
+LOCK TABLE t2 WRITE;
+SET lock_wait_timeout= 1;
+FLUSH TABLES;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+UNLOCK TABLES;
+disconnect con1;
+connection default;
+UNLOCK TABLES;
+DROP TABLE t1, t2;
-- 
cgit v1.2.1