From: Andrei Elkin
Date: May 16 2011 9:36am
Subject: bzr push into mysql-trunk branch (andrei.elkin:3086 to 3087)
List-Archive: http://lists.mysql.com/commits/137402
Message-Id: <201105160936.p4G9aEHk008340@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1228934421=="

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

 3087 Andrei Elkin	2011-05-16
      Bug 12535301 - SYS_VARS.RPL_INIT_SLAVE_FUNC MISMATCHES IN DAILY-5.5
      
      reverting sys_vars.rpl_init_slave_func back to the regular suites. The test failure is specific 
      to 5.5.

    modified:
      mysql-test/collections/default.experimental
 3086 Alexander Nozdrin	2011-05-16 [merge]
      Auto-merge from 5.5.

    modified:
      .bzrignore
      sql/sql_acl.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-05-09 17:44:44 +0000
+++ b/mysql-test/collections/default.experimental	2011-05-16 09:35:51 +0000
@@ -37,7 +37,6 @@ 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


--===============1228934421==
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: 28d998c32253043cf3b0828e45548824dfb2a584
# timestamp: 2011-05-16 12:36:14 +0300
# base_revision_id: alexander.nozdrin@stripped\
#   lae2hjr4w7ng0230
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ9R1ToAAYdfgEAQUGP/939n
XyC////wUAO14DqxZoGUNBImFPKY09RNqMT0ho/VPKDTamnkj1MnqA1U9qmJibU9TEyA0AGTJghh
AADJA0RplT0amj1DQAAGgAAAc0xMBGmBGEYAAAAmEYCSQjIaTJkyaFPJhE0g0GjJk2Kaepoc7oru
fQhxpIKtoYChrAZYBJuEFUSEGSOYxh0oHlJSgim52LjEDoauyfJLL72596zfZoY4q1jA2CbJ9Gkb
dhIZDonbkel9Z6CPnMXM459r1531x1zri845pHICa3KWN1sWnAMWPdqB3uWf4QjAQ7suKe9VHc5m
QUUu5t4KZms3pVJlQiUiJF0HdbhzMw4qS6Wr332qoR57uB3yH2iH9qNULbtNpq8ledq5IJ6zKvbx
ohpkp4+miFZNbjYtbLdjosLdbBkZkFumRtdEse98FsHmwVuwfboPLKz/pC5CfexGZamVpqfhftl6
jZQujIc6DQIFGWE/sJy35EXaa3wSYRgrDPSFlMCAqaOGWVRfUeotLanRMpAnMtmFECk1pG19wskc
RWf6MwmBYIxMaqtcbXGom9Orla+uVlrSOIn0j1KTosLYKA/BqSois7mhuDWBzGGgjYsEhewPVpRi
OEQIKlvSOCNc+QIer2peIhv/LrqJIzMj4LXyxP3RLf8XKskO7jyR9bzvqixLG9g4Pqt7zGxwpMs2
bQmwwLeDCRAHf1nruIg4QxE4bBG+BXIWsrMKvWE94BwNL7ZcZC2opSZZWC2tGU9Z7pW+gGV4inm1
7bwxCQmHISJZoCzGtdmkxPuFDIo094dXWR6juPm9B0VX+buXYcCn5apq/vxp+htKRs7ub+Z2d1uu
C+Z4XWnhpL64mP042LyqWgjh54+TdP9ce0CJvWicsSwHTP2sAfWiBDgIZiiJhM00amm7CSDS6QqZ
8Gcw4baWAdUT6mgY/pVcpkRFBt1tZj43JqfYapK6pUGvoPTJFsK/XZroxCnnXxDDPhHjtzFn4rNV
UoMA65r77wmFLjow1iuo4zSGI1B8KgM76gpi9I4KT1oxso8RUUE8h0Sk0EzkhtJygDL+GAoedFi6
nvVGAEGTJjnxMKPtiLBCkHtZqT7pEgqW9yr5Lvs2ZsycezkfBSrtZ+yW4VVWhkLHJTSXvruvQSRy
taBX0ZUqRwdfjYohBDTTdg/myOrroLpAIpoysolQGpoBZsVnTcLWYijC9tHRKot98wluELQJgZIM
NuAOXtXRnqUlC/AzpmskQOy/XuF0oW9liykdxaamGGTsbdyyJfkv+LuSKcKEgHqOqdA=


--===============1228934421==--