diff options
| -rw-r--r-- | sql/log_event.cc | 4 | ||||
| -rw-r--r-- | sql/slave.cc | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 5e30918106a..45e4379710a 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -6364,7 +6364,7 @@ Gtid_list_log_event::Gtid_list_log_event(const char *buf, uint event_len, buf+= 8; } -#ifdef MYSQL_SERVER +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) if ((gl_flags & FLAG_IGN_GTIDS)) { uint32 i; @@ -6417,6 +6417,7 @@ Gtid_list_log_event::Gtid_list_log_event(slave_connection_state *gtid_set, MYF(MY_WME)))) { gtid_set->get_gtid_list(list, count); +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) if (gl_flags & FLAG_IGN_GTIDS) { uint32 i; @@ -6441,6 +6442,7 @@ Gtid_list_log_event::Gtid_list_log_event(slave_connection_state *gtid_set, } } } +#endif } } diff --git a/sql/slave.cc b/sql/slave.cc index 29eee1cf135..29514293c78 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2224,8 +2224,8 @@ static void write_ignored_events_info_to_relay_log(THD *thd, Master_info *mi) mysql_mutex_lock(log_lock); if (rli->ign_master_log_name_end[0] || rli->ign_gtids.count()) { - Rotate_log_event *rev; - Gtid_list_log_event *glev; + Rotate_log_event *rev= NULL; + Gtid_list_log_event *glev= NULL; if (rli->ign_master_log_name_end[0]) { rev= new Rotate_log_event(rli->ign_master_log_name_end, |