List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:October 15 2010 10:04am
Subject:bzr commit into mysql-5.1-telco-6.3 branch (magnus.blaudd:3298)
View as plain text  
#At file:///home/msvensson/mysql/6.3/ based on revid:magnus.blaudd@stripped

 3298 Magnus Blåudd	2010-10-15
      ndb - fix compiler warnings in cluster specific slave.cc code

    modified:
      sql/slave.cc
=== modified file 'sql/slave.cc'
--- a/sql/slave.cc	2010-10-12 11:54:35 +0000
+++ b/sql/slave.cc	2010-10-15 10:04:36 +0000
@@ -2545,7 +2545,7 @@ int init_dynarray_intvar_from_file(DYNAM
     memcpy(buf_act, buf, read_size);
     snd_size= my_b_gets(f, buf_act + read_size, max_size - read_size);
     if (snd_size == 0 ||
-        (snd_size + 1 == max_size - read_size) &&  buf[max_size - 2] != '\n')
+        ((snd_size + 1 == max_size - read_size) &&  buf[max_size - 2] != '\n'))
     {
       /*
         failure to make the 2nd read or short read again
@@ -3980,8 +3980,8 @@ static int queue_event(Master_info* mi,c
        /* everything is filtered out from non-master */
        (s_id != mi->master_id ||
         /* for the master meta information is necessary */
-        buf[EVENT_TYPE_OFFSET] != FORMAT_DESCRIPTION_EVENT &&
-        buf[EVENT_TYPE_OFFSET] != ROTATE_EVENT)))
+        (buf[EVENT_TYPE_OFFSET] != FORMAT_DESCRIPTION_EVENT &&
+        buf[EVENT_TYPE_OFFSET] != ROTATE_EVENT))))
   {
     /*
       Do not write it to the relay log.
@@ -4001,9 +4001,9 @@ static int queue_event(Master_info* mi,c
       as well as rli->group_relay_log_pos.
     */
     if (!(s_id == ::server_id && !mi->rli.replicate_same_server_id) ||
-        buf[EVENT_TYPE_OFFSET] != FORMAT_DESCRIPTION_EVENT &&
+        (buf[EVENT_TYPE_OFFSET] != FORMAT_DESCRIPTION_EVENT &&
         buf[EVENT_TYPE_OFFSET] != ROTATE_EVENT &&
-        buf[EVENT_TYPE_OFFSET] != STOP_EVENT)
+        buf[EVENT_TYPE_OFFSET] != STOP_EVENT))
     {
       mi->master_log_pos+= inc_pos;
       memcpy(rli->ign_master_log_name_end, mi->master_log_name, FN_REFLEN);

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@sun.com-20101015100436-6str13akrdvrsbyv.bundle
Thread
bzr commit into mysql-5.1-telco-6.3 branch (magnus.blaudd:3298) Magnus Blåudd15 Oct