diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-30 08:16:37 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-30 08:16:37 +0200 |
| commit | 7cb3520c0632ad912b309489ad86a90f9fc9bd0b (patch) | |
| tree | ff8e6b8fdf5e9cacdfe914790e480bc3bad2ad85 /sql/sql_reload.cc | |
| parent | 51b30586ea999744de6a15146257f2976825781e (diff) | |
| parent | 5b697c5a23ed7322b5b746b61e3ec66b510ca134 (diff) | |
| download | mariadb-git-7cb3520c0632ad912b309489ad86a90f9fc9bd0b.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/sql_reload.cc')
| -rw-r--r-- | sql/sql_reload.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc index 057d1a9f46c..93db089b24a 100644 --- a/sql/sql_reload.cc +++ b/sql/sql_reload.cc @@ -153,7 +153,10 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options, tmp_write_to_binlog= 0; if (mysql_bin_log.is_open()) { - if (mysql_bin_log.rotate_and_purge(true)) + DYNAMIC_ARRAY *drop_gtid_domain= + (thd && (thd->lex->delete_gtid_domain.elements > 0)) ? + &thd->lex->delete_gtid_domain : NULL; + if (mysql_bin_log.rotate_and_purge(true, drop_gtid_domain)) *write_to_binlog= -1; if (WSREP_ON) |