mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 23:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Automatic merge with 5.5

Browse source
This commit is contained in:
Michael Widenius 2012-09-01 00:54:54 +03:00
commit 1999be8d4e
760 changed files with 47844 additions and 5283 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugin/semisync/semisync_master.cc
View file

@ -1049,11 +1049,12 @@ 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);
LINT_INIT_STRUCT(start_ts);
function_enter(kWho);
assert((unsigned char)event_buf[1] == kPacketMagicNum);