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

Merge 10.1 into 10.2

Browse Source 
This will also change the minimum and maximum value of
innodb_log_file_size to 1MiB and 512GiB, respectively.
This commit is contained in:
Marko Mäkelä
2017-06-19 16:46:34 +03:00
parent cf4a6abea1 d1e182d603
commit c73fa2d75f
29 changed files with 146 additions and 3787 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