database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.2 into bb-10.2-ext

Browse Source
This commit is contained in:
Marko Mäkelä
2017-06-19 16:56:13 +03:00
parent 578d8bfde5 c73fa2d75f
commit 3a7201ea92
61 changed files with 286 additions and 4423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_reload.cc
View File

@ -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