Commit 62d35829 authored by unknown's avatar unknown

Fix embedded link error and uninitialised variable following previous push.

parent c7717d92
...@@ -6364,7 +6364,7 @@ Gtid_list_log_event::Gtid_list_log_event(const char *buf, uint event_len, ...@@ -6364,7 +6364,7 @@ Gtid_list_log_event::Gtid_list_log_event(const char *buf, uint event_len,
buf+= 8; buf+= 8;
} }
#ifdef MYSQL_SERVER #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
if ((gl_flags & FLAG_IGN_GTIDS)) if ((gl_flags & FLAG_IGN_GTIDS))
{ {
uint32 i; uint32 i;
...@@ -6417,6 +6417,7 @@ Gtid_list_log_event::Gtid_list_log_event(slave_connection_state *gtid_set, ...@@ -6417,6 +6417,7 @@ Gtid_list_log_event::Gtid_list_log_event(slave_connection_state *gtid_set,
MYF(MY_WME)))) MYF(MY_WME))))
{ {
gtid_set->get_gtid_list(list, count); gtid_set->get_gtid_list(list, count);
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
if (gl_flags & FLAG_IGN_GTIDS) if (gl_flags & FLAG_IGN_GTIDS)
{ {
uint32 i; uint32 i;
...@@ -6441,6 +6442,7 @@ Gtid_list_log_event::Gtid_list_log_event(slave_connection_state *gtid_set, ...@@ -6441,6 +6442,7 @@ Gtid_list_log_event::Gtid_list_log_event(slave_connection_state *gtid_set,
} }
} }
} }
#endif
} }
} }
......
...@@ -2224,8 +2224,8 @@ static void write_ignored_events_info_to_relay_log(THD *thd, Master_info *mi) ...@@ -2224,8 +2224,8 @@ static void write_ignored_events_info_to_relay_log(THD *thd, Master_info *mi)
mysql_mutex_lock(log_lock); mysql_mutex_lock(log_lock);
if (rli->ign_master_log_name_end[0] || rli->ign_gtids.count()) if (rli->ign_master_log_name_end[0] || rli->ign_gtids.count())
{ {
Rotate_log_event *rev; Rotate_log_event *rev= NULL;
Gtid_list_log_event *glev; Gtid_list_log_event *glev= NULL;
if (rli->ign_master_log_name_end[0]) if (rli->ign_master_log_name_end[0])
{ {
rev= new Rotate_log_event(rli->ign_master_log_name_end, rev= new Rotate_log_event(rli->ign_master_log_name_end,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment