From: Andrei Elkin
Date: May 9 2011 5:45pm
Subject: bzr push into mysql-trunk branch (andrei.elkin:3385 to 3386) Bug#12535301
List-Archive: http://lists.mysql.com/commits/136935
X-Bug: 12535301
Message-Id: <201105091745.p49HjYaf001447@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0856783650=="

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

 3386 Andrei Elkin	2011-05-09
      bug#12535301 - SYS_VARS.RPL_INIT_SLAVE_FUNC MISMATCHES IN DAILY-5.5
      
      setting sys_vars.rpl_init_slave_func to default.experimental.

    modified:
      mysql-test/collections/default.experimental
 3385 Alexander Nozdrin	2011-05-09 [merge]
      Manual merge from mysql-5.5.

    modified:
      mysql-test/r/trigger.result
      mysql-test/t/trigger.test
      sql/item.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-05-06 12:56:36 +0000
+++ b/mysql-test/collections/default.experimental	2011-05-09 17:44:44 +0000
@@ -37,7 +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


--===============0856783650==
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: 229b5a2cf0d1d989e418f4f67da931a0daed57bb
# timestamp: 2011-05-09 20:45:34 +0300
# base_revision_id: alexander.nozdrin@stripped\
#   rllafhgeclo0yt46
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaG0nT0AAYVfgEAQWGP/939n
XyC////wUAOl73Y7veeqh1L0NCCU3pTyaM1TI8iNpGI0NDCZqZPQagSVTUzyNGp6k/RTynpPUMgG
IAMgaaADVPRJ+lM1NAaNMQAZGhoBoAABJJTYJNTCeRNPKBoABoADQACSUxGhME0ZGjJR6hk9QAaZ
AGhojBR3pDqkYJGBQO7G4ATOR7FqgM9Bi2jjMxVsKtbQYBnEGS5oM9N+SCbVus2cbsvEyjqQLuzc
DfRjykhkMTgdF5szDZCc2CI+mUy25OQXxSpXSvqgZLkhlqVAYwitttUdVUESDbWsW/F8o9Ik0Vw5
3FiE5ycIlZ8y6D8iggzSTBGSiQHfOdTwj2GZmcP3NHPUqBGvaY0cRBMa8guPDXy3liJM7xwK4XjE
rtBMbhrmJrg+2j+PJaN6yYRM6vy2bE2CfBaWIuYOVExxvmHtKQc4dk1P7IkCDjThhVfWU2Wy+ArB
RBjXJORRFbtY7jEX9GFsFodScYzxJypNfe8uIUGyYuzuazEjLkbiQRVQbVA4kLZMLoVsa3gCe2WJ
Knsaq1+jissvk0BUsU5qiBUw7BcXkOB2TFOUZ1kKh8nzJMhMTpx0PFshtS0mw4QDikN1ZxG0gGaW
CQTIngGol6hBYajqBJT6vZhENvSuvDFCDMHvt7OaMrcqzdWpUVrZy5o1Vh2erpFQsg3tVYxT4bSS
qlK9gTKRgb9KyCEhUmvJSP7bpIgzPCTlh1ag5h87HQ7Qy6zzjR8PjajuXpDsC5dvsNZ7eAykc0L1
xCbQAYV80AxPg2tdPO9DIhASAr/oRCOcEwa5MNnYUNWoJsHrTYU042aNLOF1Rmdz0HMKvvohd3fy
MxRQyoOpY82pjKGEDFlvqJdXg2nwkPhaAzEBe7reQ8XRBClMbQvUizKUY4eZ6Mc5x8QxCkIqHHPl
vtCwzlzKyZdOrnkx1nuTuhMjBc1iE0mpUK0RsMSnYLXWmheTquIPLeTOCRI1PnXhfbC4JcBcQ3a0
0MvReLAleBWGV6723BQEshmwykTlxoSGHSo98yWvFXbM0wSnQkPKWpoDKxbZF7ykVg6KemSGjfUX
gwfBgIONrKHIH2oHsmTGeVytl/QrUKIeNmefyRIJrWcp3Bny2ZGZOLjQEZ1Jr1kYi4Lc2VKsV9JP
wIHoldhJbTBALVNVvxWq+pQgydZWqPtXQssqkKrgaKskTp4kqI2m8VlfAIpzsChSBY/pgg4mwRjh
GPa4Jwi2RPxWU192PEF5TT3UliYnqgL56pRODETpAtZSnApxY1J25cBVbw2lHXVOL/i7kinChIUN
pOno


--===============0856783650==--