diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-06-05 15:32:44 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-06-05 15:32:44 +0200 |
| commit | 64e53a0f816ec0ca4792fcefe5be18494691bfe7 (patch) | |
| tree | 75d53f710e691c6d1bc70d587e3dc593f4dbd542 /sql/slave.cc | |
| parent | 5cb486d159e45b9b8dc4d647b2df2492a286cf4d (diff) | |
| download | mariadb-git-64e53a0f816ec0ca4792fcefe5be18494691bfe7.tar.gz | |
Fix two small problems in previous push.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index edd7a06d959..38ff94bcea0 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4970,9 +4970,9 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len) (If we queued such an event, and it was the first format_description event after master restart, the slave SQL thread would think that the partial event group before it in the relay log was from a - previous master crash and should be rolled back. + previous master crash and should be rolled back). */ - if (unlikely(mi->gtid_reconnect_event_skip_count)) + if (unlikely(mi->gtid_reconnect_event_skip_count && !mi->gtid_event_seen)) gtid_skip_enqueue= true; /* |