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

 3864 Magnus Blåudd	2010-10-15 [merge]
      Merge 6.3 -> 7.0

    modified:
      client/mysqltest.cc
      sql/slave.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-10-12 14:53:28 +0000
+++ b/client/mysqltest.cc	2010-10-15 10:43:31 +0000
@@ -2262,7 +2262,7 @@ do_result_format_version(struct st_comma
   long version;
   static DYNAMIC_STRING ds_version;
   const struct command_arg result_format_args[] = {
-    "version", ARG_STRING, TRUE, &ds_version, "Version to use",
+    "version", ARG_STRING, TRUE, &ds_version, "Version to use"
   };
 
   DBUG_ENTER("do_result_format_version");

=== modified file 'sql/slave.cc'
--- a/sql/slave.cc	2010-10-12 14:53:28 +0000
+++ b/sql/slave.cc	2010-10-15 10:43:31 +0000
@@ -2549,7 +2549,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
@@ -3990,8 +3990,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.
@@ -4011,9 +4011,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-20101015104331-v4saw4uq1hm905lq.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3864) Magnus Blåudd15 Oct