mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix embedded link error and uninitialised variable following previous push.

Browse source
This commit is contained in:
unknown 2013-08-23 10:16:43 +02:00
parent c7717d92b9
commit 62d358295b
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sql/log_event.cc
View file

@ -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
}
}

4
sql/slave.cc
View file

@ -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,