diff options
| author | Andrei Elkin <andrei.elkin@mariadb.com> | 2017-11-22 19:34:42 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-12-18 13:43:37 +0200 |
| commit | 74b35b68744ce552f09124e27ef1785af69d7989 (patch) | |
| tree | acb3c43dab8f87df9769ca13f15aee19e02a217c /sql/semisync_master.cc | |
| parent | e972125f11d8f37bc263b113e85ed064257a92ee (diff) | |
| download | mariadb-git-74b35b68744ce552f09124e27ef1785af69d7989.tar.gz | |
MDEV-13073. This part patch weeds out RUN_HOOK from the server as semisync
is defined statically. Consequently the observer interfaces are removed
as well.
Diffstat (limited to 'sql/semisync_master.cc')
| -rw-r--r-- | sql/semisync_master.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/semisync_master.cc b/sql/semisync_master.cc index de91e30beec..8adbce179e1 100644 --- a/sql/semisync_master.cc +++ b/sql/semisync_master.cc @@ -738,19 +738,19 @@ int ReplSemiSyncMaster::reportBinlogUpdate(THD* thd, const char *log_file, return 0; } -void ReplSemiSyncMaster::dump_start(THD* thd, +int ReplSemiSyncMaster::dump_start(THD* thd, const char *log_file, my_off_t log_pos) { if (!thd->semi_sync_slave) - return; + return 0; if (ack_receiver.add_slave(thd)) { sql_print_error("Failed to register slave to semi-sync ACK receiver " "thread. Turning off semisync"); thd->semi_sync_slave= 0; - return; + return 1; } add_slave(); @@ -758,7 +758,7 @@ void ReplSemiSyncMaster::dump_start(THD* thd, sql_print_information("Start semi-sync binlog_dump to slave (server_id: %d), pos(%s, %lu", thd->variables.server_id, log_file, (unsigned long)log_pos); - return; + return 0; } void ReplSemiSyncMaster::dump_end(THD* thd) |