diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-03-04 14:06:44 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-03-04 14:12:48 +0100 |
| commit | 2e4dc5a3703c3e8e00cb0b403c9c3118e3d0e4af (patch) | |
| tree | 55ca169565afe3ed60943c93c7b281ffb4c975e3 /sql/sql_repl.cc | |
| parent | 95d72088596c9c58c30ab87781061094309b4460 (diff) | |
| download | mariadb-git-2e4dc5a3703c3e8e00cb0b403c9c3118e3d0e4af.tar.gz | |
after-merge fixes
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 8e18d218d37..3ce9ea8a2cc 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -2335,12 +2335,12 @@ static int send_format_descriptor_event(binlog_send_info *info, slave connects at a position past this event, it means that it already received and handled it in a previous connect). */ - if (!info.gtid_state.is_pos_reached()) + if (!info->gtid_state.is_pos_reached()) { int4store((char*) packet->ptr()+LOG_EVENT_MINIMAL_HEADER_LEN+ ST_CREATED_OFFSET+ev_offset, (ulong) 0); - if (info.current_checksum_alg != BINLOG_CHECKSUM_ALG_OFF && - info.current_checksum_alg != BINLOG_CHECKSUM_ALG_UNDEF) + if (info->current_checksum_alg != BINLOG_CHECKSUM_ALG_OFF && + info->current_checksum_alg != BINLOG_CHECKSUM_ALG_UNDEF) fix_checksum(packet, ev_offset); } } |