[Commits] Rev 3684: Fix embedded link error and uninitialised variable following previous push. in http://bazaar.launchpad.net/~maria-captains/maria/10.0

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Fri Aug 23 11:16:44 EEST 2013


At http://bazaar.launchpad.net/~maria-captains/maria/10.0

------------------------------------------------------------
revno: 3684
revision-id: knielsen at knielsen-hq.org-20130823081643-f3yhupp15yw9cpy4
parent: psergey at askmonty.org-20130822184548-w173161u2rhh33wx
committer: knielsen at knielsen-hq.org
branch nick: mariadb-10.0-base
timestamp: Fri 2013-08-23 10:16:43 +0200
message:
  Fix embedded link error and uninitialised variable following previous push.
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2013-08-22 10:36:42 +0000
+++ b/sql/log_event.cc	2013-08-23 08:16:43 +0000
@@ -6364,7 +6364,7 @@ Gtid_list_log_event::Gtid_list_log_event
     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
                                     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
         }
       }
     }
+#endif
   }
 }
 

=== modified file 'sql/slave.cc'
--- a/sql/slave.cc	2013-08-22 10:36:42 +0000
+++ b/sql/slave.cc	2013-08-23 08:16:43 +0000
@@ -2224,8 +2224,8 @@ static void write_ignored_events_info_to
   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,



More information about the commits mailing list