diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-09 08:33:08 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-09 08:33:08 +0200 |
| commit | 06b7fce9f24116080168b924d17f71b979fc3a14 (patch) | |
| tree | 5ff9f5684bb118abbee5a9fd3b838d0841661287 /sql/sql_reload.cc | |
| parent | 1f2ff25eba6c089b2698cd0dab96155ccbf2afd2 (diff) | |
| parent | 8494039757a2f6353cc161e7824aab4fe2312d2a (diff) | |
| download | mariadb-git-06b7fce9f24116080168b924d17f71b979fc3a14.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_reload.cc')
| -rw-r--r-- | sql/sql_reload.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc index 2fef615831b..2d72d1052d2 100644 --- a/sql/sql_reload.cc +++ b/sql/sql_reload.cc @@ -155,6 +155,12 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options, { if (mysql_bin_log.rotate_and_purge(true)) *write_to_binlog= -1; + + if (WSREP_ON) + { + /* Wait for last binlog checkpoint event to be logged. */ + mysql_bin_log.wait_for_last_checkpoint_event(); + } } } if (options & REFRESH_RELAY_LOG) |