diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-11-21 19:47:46 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-11-21 19:47:46 +0100 |
| commit | 7f1900705b28a432a91595726f7d58e6d968cbd5 (patch) | |
| tree | a24724ebc45941490e2970d87c495bc5f5cbb64b /sql/sql_reload.cc | |
| parent | 375caf99c494a4add7d48d5db3a3ec4b409a256e (diff) | |
| parent | b54aeeb080aba2385204cdd09cba3eedbbf1b891 (diff) | |
| download | mariadb-git-7f1900705b28a432a91595726f7d58e6d968cbd5.tar.gz | |
Merge branch '10.1' into 10.2
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 73b996e738e..5d11387fbfe 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) |