Patch to eliminate warnings in mysql-next-mr-bugteam.

1 files changed, 6 insertions, 6 deletions

diff --git a/sql/slave.cc b/sql/slave.cc
index a4f16f6ed28..af43b39c63b 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -1111,7 +1111,7 @@ int init_dynarray_intvar_from_file(DYNAMIC_ARRAY* arr, IO_CACHE* f)
     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
@@ -3943,8 +3943,8 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len)
        /* 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.
@@ -3964,9 +3964,9 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len)
       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] != ROTATE_EVENT &&
-        buf[EVENT_TYPE_OFFSET] != STOP_EVENT)
+        (buf[EVENT_TYPE_OFFSET] != FORMAT_DESCRIPTION_EVENT &&
+         buf[EVENT_TYPE_OFFSET] != ROTATE_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);