diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-08-13 23:45:16 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-08-13 23:45:16 +0300 |
| commit | c0f04fa31cd46c2507b2152eeeeb4950e0d5edc9 (patch) | |
| tree | b0696b0df90fdc17d6801d14229c74167f00647d /plugin/semisync | |
| parent | c9b95de246ccaad22abf90996f295b05fe85f53d (diff) | |
| parent | cee888acb36141136cdb121a7bb7d53200b14cb6 (diff) | |
| download | mariadb-git-c0f04fa31cd46c2507b2152eeeeb4950e0d5edc9.tar.gz | |
Automatic merge
Diffstat (limited to 'plugin/semisync')
| -rw-r--r-- | plugin/semisync/semisync_master.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugin/semisync/semisync_master.cc b/plugin/semisync/semisync_master.cc index 8573c4dcbde..d1b982468d2 100644 --- a/plugin/semisync/semisync_master.cc +++ b/plugin/semisync/semisync_master.cc @@ -1049,10 +1049,11 @@ int ReplSemiSyncMaster::readSlaveReply(NET *net, uint32 server_id, ulong log_file_len = 0; ulong packet_len; int result = -1; - struct timespec start_ts; ulong trc_level = trace_level_; + LINT_INIT_STRUCT(start_ts); + function_enter(kWho); assert((unsigned char)event_buf[1] == kPacketMagicNum); |