From: Andrei Elkin
Date: May 16 2011 6:43pm
Subject: bzr commit into mysql-trunk branch (andrei.elkin:3093) Bug#12535301
List-Archive: http://lists.mysql.com/commits/137474
X-Bug: 12535301
Message-Id: <201105161843.p4GIhtEj017780@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0099368863=="

--===============0099368863==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ based on revid:alfranio.correia@stripped

 3093 Andrei Elkin	2011-05-16 [merge]
      merging of experimentizing of SYS_VARS.RPL_INIT_SLAVE_FUNC due to  Bug#12535301

    modified:
      mysql-test/collections/default.experimental
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-05-16 09:35:51 +0000
+++ b/mysql-test/collections/default.experimental	2011-05-16 18:42:44 +0000
@@ -37,6 +37,7 @@ sys_vars.wait_timeout_func              
 sys_vars.ndb_log_update_as_write_basic
 sys_vars.have_ndbcluster_basic
 sys_vars.ndb_log_updated_only_basic
+sys_vars.rpl_init_slave_func		 # Bug#12535301 2011-05-09 andrei sys_vars.rpl_init_slave_func mismatches in daily-5.5
 
 rpl_bhs.*                                # skozlov : WL#5139 - rpl_bhs suite generated "on-the-fly" at testing moment from rpl suite
 main.gis-rtree                           # svoj: due to BUG#38965


--===============0099368863==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/andrei.elkin@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrei.elkin@stripped
# target_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/
# testament_sha1: b3ec03c1e1f84b6999853866c64a0fb25bf29472
# timestamp: 2011-05-16 21:43:55 +0300
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-5.5/
# base_revision_id: alfranio.correia@stripped\
#   537aai57t7f6z6wk
# 
# Begin bundle
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
pmuIih7H/xdyRThQkOeVpIM=


--===============0099368863==--