diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-11-29 12:06:48 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-11-29 12:06:48 +0400 |
| commit | 5b697c5a23ed7322b5b746b61e3ec66b510ca134 (patch) | |
| tree | 22f086fad2685d1a45b8531f96f30ed7fabb7554 /sql/sql_reload.cc | |
| parent | e01d33d773abbffad0ea1739f0e04816eecce89d (diff) | |
| parent | b65fd73bb19578148e41d788504ae18812c2cb43 (diff) | |
| download | mariadb-git-5b697c5a23ed7322b5b746b61e3ec66b510ca134.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
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 c01ad90f5d2..79968c029ea 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) |