diff options
| author | Andrei Elkin <andrei.elkin@mariadb.com> | 2017-11-25 18:54:42 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-12-18 13:43:38 +0200 |
| commit | f279d3c43aa7536b0f9bf46df8f4a3ef02918be0 (patch) | |
| tree | 8b030839b7b1017a8caf948a5991bd610e0e1c6b /sql/sql_repl.cc | |
| parent | 6a84e3407df448b28230602ca4e748c85bce52bc (diff) | |
| download | mariadb-git-f279d3c43aa7536b0f9bf46df8f4a3ef02918be0.tar.gz | |
MDEV-13073. This part converts the Ali patch`s identifiers to the MariaDB standard. Also some renaming is done as well as white spaces removal.
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index c9e804135a5..1d6aa0aaab1 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -316,7 +316,7 @@ static int reset_transmit_packet(binlog_send_info *info, ushort flags, if (info->thd->semi_sync_slave) { - if (repl_semisync_master.reserveSyncHeader(packet)) + if (repl_semisync_master.reserve_sync_header(packet)) { info->error= ER_UNKNOWN_ERROR; *errmsg= "Failed to run hook 'reserve_header'"; @@ -1945,9 +1945,10 @@ send_event_to_slave(binlog_send_info *info, Log_event_type event_type, THD_STAGE_INFO(info->thd, stage_sending_binlog_event_to_slave); pos= my_b_tell(log); - if (repl_semisync_master.updateSyncHeader(info->thd, (uchar *)packet->c_ptr(), - info->log_file_name + info->dirlen, - pos, &need_sync)) + if (repl_semisync_master.update_sync_header(info->thd, + (uchar*) packet->c_ptr(), + info->log_file_name + info->dirlen, + pos, &need_sync)) { info->error= ER_UNKNOWN_ERROR; return "run 'before_send_event' hook failed"; @@ -1969,7 +1970,7 @@ send_event_to_slave(binlog_send_info *info, Log_event_type event_type, } } - if (need_sync && repl_semisync_master.flushNet(info->thd, packet->c_ptr())) + if (need_sync && repl_semisync_master.flush_net(info->thd, packet->c_ptr())) { info->error= ER_UNKNOWN_ERROR; return "Failed to run hook 'after_send_event'"; @@ -3341,7 +3342,7 @@ int reset_slave(THD *thd, Master_info* mi) sql_print_information("Deleted Master_info file '%s'.", fname); if (rpl_semi_sync_slave_enabled) - repl_semisync_slave.resetSlave(mi); + repl_semisync_slave.reset_slave(mi); err: mi->unlock_slave_threads(); if (error) @@ -3845,10 +3846,10 @@ int reset_master(THD* thd, rpl_gtid *init_state, uint32 init_state_len, bool ret= 0; /* Temporarily disable master semisync before reseting master. */ - repl_semisync_master.beforeResetMaster(); + repl_semisync_master.before_reset_master(); ret= mysql_bin_log.reset_logs(thd, 1, init_state, init_state_len, next_log_number); - repl_semisync_master.afterResetMaster(); + repl_semisync_master.after_reset_master(); return ret; } |