From 056bab0880544d91ea67d18fe8db65b4f6625482 Mon Sep 17 00:00:00 2001
From: Sergey Vojtovich <svoj@mariadb.org>
Date: Fri, 16 Jun 2017 15:47:46 +0400
Subject: MDEV-12620 - set lock_wait_timeout = 1;flush tables with read lock;  
            lock not released after timeout

Release GRL if FLUSH TABLES phase failed.
---
 sql/sql_reload.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sql/sql_reload.cc')

diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc
index 376dfeb1542..d68ce96dc85 100644
--- a/sql/sql_reload.cc
+++ b/sql/sql_reload.cc
@@ -253,7 +253,8 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
           NOTE: my_error() has been already called by reopen_tables() within
           close_cached_tables().
         */
-        result= 1;
+        thd->global_read_lock.unlock_global_read_lock(thd);
+        return 1;
       }
 
       if (thd->global_read_lock.make_global_read_lock_block_commit(thd)) // Killed
-- 
cgit v1.2.1