semisync_master.cc   semisync_master.cc 
skipping to change at line 741 skipping to change at line 741
} }
else else
{ {
int wait_time; int wait_time;
wait_time = getWaitTime(start_ts); wait_time = getWaitTime(start_ts);
if (wait_time < 0) if (wait_time < 0)
{ {
if (trace_level_ & kTraceGeneral) if (trace_level_ & kTraceGeneral)
{ {
sql_print_error("Replication semi-sync getWaitTime fail at " sql_print_information("Assessment of waiting time for commitTrx
"wait position (%s, %lu)", "
trx_wait_binlog_name, (unsigned long)trx_wait_b "failed at wait position (%s, %lu)",
inlog_pos); trx_wait_binlog_name,
(unsigned long)trx_wait_binlog_pos);
} }
rpl_semi_sync_master_timefunc_fails++; rpl_semi_sync_master_timefunc_fails++;
} }
else else
{ {
rpl_semi_sync_master_trx_wait_num++; rpl_semi_sync_master_trx_wait_num++;
rpl_semi_sync_master_trx_wait_time += wait_time; rpl_semi_sync_master_trx_wait_time += wait_time;
} }
} }
} }
skipping to change at line 1129 skipping to change at line 1130
* Transactions wait on binlog replies detected by binlog dump threads. If * Transactions wait on binlog replies detected by binlog dump threads. If
* binlog dump threads wait too long, transactions will timeout and conti nue. * binlog dump threads wait too long, transactions will timeout and conti nue.
*/ */
packet_len = my_net_read(net); packet_len = my_net_read(net);
if (trc_level & kTraceNetWait) if (trc_level & kTraceNetWait)
{ {
int wait_time = getWaitTime(start_ts); int wait_time = getWaitTime(start_ts);
if (wait_time < 0) if (wait_time < 0)
{ {
sql_print_error("Semi-sync master wait for reply " sql_print_information("Assessment of waiting time for "
"fail to get wait time."); "readSlaveReply failed.");
rpl_semi_sync_master_timefunc_fails++; rpl_semi_sync_master_timefunc_fails++;
} }
else else
{ {
rpl_semi_sync_master_net_wait_num++; rpl_semi_sync_master_net_wait_num++;
rpl_semi_sync_master_net_wait_time += wait_time; rpl_semi_sync_master_net_wait_time += wait_time;
} }
} }
if (packet_len == packet_error || packet_len < REPLY_BINLOG_NAME_OFFSET) if (packet_len == packet_error || packet_len < REPLY_BINLOG_NAME_OFFSET)
 End of changes. 2 change blocks. 
6 lines changed or deleted 7 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/