diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/slave.cc | 4 | ||||
| -rw-r--r-- | sql/sql_repl.h | 2 |
2 files changed, 3 insertions, 3 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; /* diff --git a/sql/sql_repl.h b/sql/sql_repl.h index a242fa4aeef..917da9b598e 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -32,7 +32,7 @@ typedef struct st_slave_info THD* thd; } SLAVE_INFO; -class slave_connection_state; +struct slave_connection_state; extern my_bool opt_show_slave_auth_info; extern char *master_host, *master_info_file; |