From: Luis Soares
Date: November 16 2009 12:17pm
Subject: bzr commit into mysql-5.1-rep+2 branch (luis.soares:3143) Bug#48048
List-Archive: http://lists.mysql.com/commits/90499
X-Bug: 48048
Message-Id: <0KT700LW6BFTD460@fe-emea-09.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_G72bNUCZy8FR5wBDxJQSQA)"

--Boundary_(ID_G72bNUCZy8FR5wBDxJQSQA)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///home/lsoares/Workspace/bzr/work/bugfixing/48048/mysql-5.1-rep%2B2-push/ based on revid:luis.soares@stripped

 3143 Luis Soares	2009-11-16
      BUG#48048: Deprecated constructs need removal in Betony
      
      Post-push fix: Removed MTRv1 arguments according to the
      original patch. Although there is a version check, the patch
      was pushed to a 5.1 GA staging tree, while the version check 
      considers version 5.2. This makes the deprecated parameters 
      to be used, despite the fact that they are not valid anymore.
      
      Part of MTRv1 is currently used in RQG semisync test, and this
      was causing the test to fail on slave startup.
      
      It should be safe to uncomment when merging up to celosia.

    modified:
      mysql-test/lib/v1/mysql-test-run.pl
=== modified file 'mysql-test/lib/v1/mysql-test-run.pl'
--- a/mysql-test/lib/v1/mysql-test-run.pl	2008-11-14 08:45:32 +0000
+++ b/mysql-test/lib/v1/mysql-test-run.pl	2009-11-16 12:17:19 +0000
@@ -4024,15 +4024,26 @@ sub mysqld_arguments ($$$$) {
     }
     else
     {
-      if ($mysql_version_id < 50200)
-      {
-        mtr_add_arg($args, "%s--master-user=root", $prefix);
-        mtr_add_arg($args, "%s--master-connect-retry=1", $prefix);
-        mtr_add_arg($args, "%s--master-host=127.0.0.1", $prefix);
-        mtr_add_arg($args, "%s--master-password=", $prefix);
-        mtr_add_arg($args, "%s--master-port=%d", $prefix,
-    	            $master->[0]->{'port'}); # First master
-      }
+#      NOTE: the backport (see BUG#48048) originally removed the
+#            commented out lines below. However, given that they are
+#            protected with a version check (< 50200) now, it should be 
+#            safe to keep them. The problem is that the backported patch 
+#            was into a 5.1 GA codebase - mysql-5.1-rep+2 tree - so 
+#            version is 501XX, consequently check becomes worthless. It 
+#            should be safe to uncomment them when merging up to 5.5.
+#
+#            RQG semisync test runs on the 5.1 GA tree and needs MTR v1.
+#            This was causing the test to fail (slave would not start
+#            due to unrecognized option(s)).
+#      if ($mysql_version_id < 50200)
+#      {
+#        mtr_add_arg($args, "%s--master-user=root", $prefix);
+#        mtr_add_arg($args, "%s--master-connect-retry=1", $prefix);
+#        mtr_add_arg($args, "%s--master-host=127.0.0.1", $prefix);
+#        mtr_add_arg($args, "%s--master-password=", $prefix);
+#        mtr_add_arg($args, "%s--master-port=%d", $prefix,
+#    	            $master->[0]->{'port'}); # First master
+#      }
       my $slave_server_id=  2 + $idx;
       my $slave_rpl_rank= $slave_server_id;
       mtr_add_arg($args, "%s--server-id=%d", $prefix, $slave_server_id);


--Boundary_(ID_G72bNUCZy8FR5wBDxJQSQA)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/luis.soares@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/luis.soares@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: luis.soares@stripped
# target_branch: file:///home/lsoares/Workspace/bzr/work/bugfixing\
#   /48048/mysql-5.1-rep%2B2-push/
# testament_sha1: 29471175f3079f68e7b431fd622f21d76e43a1d4
# timestamp: 2009-11-16 12:17:24 +0000
# source_branch: file:///home/lsoares/Workspace/bzr/work/bugfixing\
#   /48048/mysql-5.1-rep%2B2/
# base_revision_id: luis.soares@stripped\
#   ufogz86vcny1w22w
# 
# Begin bundle
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
+2tF6zo5V7f+LuSKcKEgPmWU9g==


--Boundary_(ID_G72bNUCZy8FR5wBDxJQSQA)--