diff options
| author | Andrei Elkin <andrei.elkin@mariadb.com> | 2017-11-27 13:00:08 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-12-18 13:43:38 +0200 |
| commit | 6a84e3407df448b28230602ca4e748c85bce52bc (patch) | |
| tree | 64ca5eca5936ff88713399a9a70436ea78516050 /sql/semisync_slave.cc | |
| parent | c0ea3056b64779c798f90d3ba9a4f8d37eb14665 (diff) | |
| download | mariadb-git-6a84e3407df448b28230602ca4e748c85bce52bc.tar.gz | |
MDEV-13073. This patch replaces semisync's native function_enter,exit
and its custom trace faciltiy with standard DBUG_ based equivalents.
Diffstat (limited to 'sql/semisync_slave.cc')
| -rw-r--r-- | sql/semisync_slave.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/sql/semisync_slave.cc b/sql/semisync_slave.cc index 012f807d28e..7cfc1879dd5 100644 --- a/sql/semisync_slave.cc +++ b/sql/semisync_slave.cc @@ -58,9 +58,8 @@ int ReplSemiSyncSlave::slaveReadSyncHeader(const char *header, const char **payload, unsigned long *payload_len) { - const char *kWho = "ReplSemiSyncSlave::slaveReadSyncHeader"; int read_res = 0; - function_enter(kWho); + DBUG_ENTER("Repl_semi_sync_slave::slave_read_sync_header"); if (rpl_semi_sync_slave_status) { @@ -71,8 +70,9 @@ int ReplSemiSyncSlave::slaveReadSyncHeader(const char *header, *payload_len = total_len - 2; *payload = header + 2; - if (trace_level_ & kTraceDetail) - sql_print_information("%s: reply - %d", kWho, semi_sync_need_reply); + DBUG_PRINT("semisync", ("%s: reply - %d", + "Repl_semi_sync_slave::slave_read_sync_header", + semi_sync_need_reply)); if (semi_sync_need_reply) *semi_flags |= SEMI_SYNC_NEED_ACK; @@ -90,7 +90,7 @@ int ReplSemiSyncSlave::slaveReadSyncHeader(const char *header, *payload_len= total_len; } - return function_exit(kWho, read_res); + DBUG_RETURN(read_res); } int ReplSemiSyncSlave::slaveStart(Master_info *mi) @@ -203,7 +203,6 @@ int ReplSemiSyncSlave::requestTransmit(Master_info *mi) int ReplSemiSyncSlave::slaveReply(Master_info *mi) { - const char *kWho = "ReplSemiSyncSlave::slaveReply"; MYSQL* mysql= mi->mysql; const char *binlog_filename= const_cast<char *>(mi->master_log_name); my_off_t binlog_filepos= mi->master_log_pos; @@ -215,7 +214,7 @@ int ReplSemiSyncSlave::slaveReply(Master_info *mi) int reply_res = 0; int name_len = strlen(binlog_filename); - function_enter(kWho); + DBUG_ENTER("Repl_semi_sync_slave::slave_reply"); if (rpl_semi_sync_slave_status && semi_sync_need_reply) { @@ -226,9 +225,9 @@ int ReplSemiSyncSlave::slaveReply(Master_info *mi) binlog_filename, name_len + 1 /* including trailing '\0' */); - if (trace_level_ & kTraceDetail) - sql_print_information("%s: reply (%s, %lu)", kWho, - binlog_filename, (ulong)binlog_filepos); + DBUG_PRINT("semisync", ("%s: reply (%s, %lu)", + "Repl_semi_sync_slave::slave_reply", + binlog_filename, (ulong)binlog_filepos)); net_clear(net, 0); /* Send the reply. */ @@ -248,5 +247,5 @@ int ReplSemiSyncSlave::slaveReply(Master_info *mi) } } - return function_exit(kWho, reply_res); + DBUG_RETURN(reply_res); } |