diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-19 16:46:34 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-19 16:46:34 +0300 |
| commit | c73fa2d75fac7a057ae817bfaf142adb87ff2500 (patch) | |
| tree | c075625ce33972005c76a1483074a00edeb2ba13 /sql/sql_reload.cc | |
| parent | cf4a6abea12fcc957c81753be084104455f3cd9b (diff) | |
| parent | d1e182d603c73e42a18667f3984d6487c9a3b090 (diff) | |
| download | mariadb-git-c73fa2d75fac7a057ae817bfaf142adb87ff2500.tar.gz | |
Merge 10.1 into 10.2
This will also change the minimum and maximum value of
innodb_log_file_size to 1MiB and 512GiB, respectively.
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 313c77cc014..73b996e738e 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 |