diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2017-06-16 15:47:46 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2017-06-16 15:47:46 +0400 |
| commit | 056bab0880544d91ea67d18fe8db65b4f6625482 (patch) | |
| tree | 18d728d74bc13c5bc52c4b7543e346b0b22753b8 /sql | |
| parent | 58f87a41bd8de7370cc05c41977fadc685826c9e (diff) | |
| download | mariadb-git-056bab0880544d91ea67d18fe8db65b4f6625482.tar.gz | |
MDEV-12620 - set lock_wait_timeout = 1;flush tables with read lock;
lock not released after timeout
Release GRL if FLUSH TABLES phase failed.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_reload.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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 |