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.4 into 10.5

Browse Source 
The functional changes of commit 5836191c8f
(MDEV-21168) are omitted due to MDEV-742 having addressed the issue.
This commit is contained in:
Marko Mäkelä
2020-04-25 21:57:52 +03:00
parent 62903434eb a19782522b
commit fbe2712705
202 changed files with 2911 additions and 1669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_reload.cc
View File

@ -153,6 +153,8 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
if (mysql_bin_log.rotate_and_purge(true, drop_gtid_domain))
*write_to_binlog= -1;
/* Note that WSREP(thd) might not be true here e.g. during
SST. */
if (WSREP_ON)
{
/* Wait for last binlog checkpoint event to be logged. */