diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-19 16:56:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-19 16:56:13 +0300 |
| commit | 3a7201ea922f6d3373924c413fdb4b108f6208c5 (patch) | |
| tree | 1dd4316340daba50d6d1f684c7137b47c7799541 /sql/sql_reload.cc | |
| parent | 578d8bfde53c42245f2a0641e7cc2af2ed8230cc (diff) | |
| parent | c73fa2d75fac7a057ae817bfaf142adb87ff2500 (diff) | |
| download | mariadb-git-3a7201ea922f6d3373924c413fdb4b108f6208c5.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'sql/sql_reload.cc')
| -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 f54c0b88110..c01ad90f5d2 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 |