From: marko.makela
Date: January 26 2011 8:14am
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3292 to 3293)
List-Archive: http://lists.mysql.com/commits/129624
Message-Id: <201101260815.p0Q85JFp015023@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0357447052=="

--===============0357447052==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

IDMyOTMgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0yNiBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuMS1pbm5vZGIgdG8gbXlzcWwtNS41LWlubm9kYi4KCiAgICBtb2RpZmllZDoKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9yb3cvcm93MHVwZC5jCiAzMjkyIFN1bm55IEJhaW5zCTIwMTEtMDEtMjYK
ICAgICAgSW4gc3luY19jbG9zZSgpIGZpeCBhIGJ1ZyBpbnRyb2R1Y2VkIGJ5IHRoZSBmaXggZm9y
IEJ1ZyAjNTk2ODMgd2hlcmUgd2UgaXRlcmF0ZQogICAgICBvdmVyIHRoZSBtdXRleCBsaXN0IGFu
ZCBmcmVlIGVhY2ggbXV0ZXguIFdoZW4gVU5JVl9NRU1fREVCVUcgaXMgZGVmaW5lZCwgd2UKICAg
ICAgbmVlZCBza2lwIHRoZSBoYXNoIG11dGV4LgogICAgICAKICAgICAgSXQgaXMgYSBtaW5vciBi
dWcgYWZmZWN0aW5nIG9ubHkgVU5JVl9TWU5DX0RFQlVHIGJ1aWxkcywgZm91bmQgYnkgTWljaGFl
bC4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwc3luYy5j
Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdXBkLmMnCi0tLSBh
L3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1cGQuYwlyZXZpZDpzdW5ueS5iYWluc0BvcmFjbGUu
Y29tLTIwMTEwMTI1MjIzMzU5LWJjNnRmaHlvb3gwcm05MzEKKysrIGIvc3RvcmFnZS9pbm5vYmFz
ZS9yb3cvcm93MHVwZC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTI2MDgw
MjUyLXZscDE3M2hqOTh4MW9yZWsKQEAgLTEyNTIsNiArMTI1MiwxMCBAQCByb3dfdXBkX2NoYW5n
ZXNfb3JkX2ZpZWxkX2JpbmFyeSgKIAkJICAgIHx8IGRmaWVsZF9pc19udWxsKGRmaWVsZCkpIHsK
IAkJCS8qIGRvIG5vdGhpbmcgc3BlY2lhbCAqLwogCQl9IGVsc2UgaWYgKFVOSVZfTElLRUxZX05V
TEwoZXh0KSkgeworCQkJLyogU2lsZW5jZSBhIGNvbXBpbGVyIHdhcm5pbmcgd2l0aG91dAorCQkJ
c2lsZW5jaW5nIGEgVmFsZ3JpbmQgZXJyb3IuICovCisJCQlkZmllbGRfbGVuID0gMDsKKwkJCVVO
SVZfTUVNX0lOVkFMSUQoJmRmaWVsZF9sZW4sIHNpemVvZiBkZmllbGRfbGVuKTsKIAkJCS8qIFNl
ZSBpZiB0aGUgY29sdW1uIGlzIHN0b3JlZCBleHRlcm5hbGx5LiAqLwogCQkJYnVmID0gcm93X2V4
dF9sb29rdXAoZXh0LCBjb2xfbm8sICZkZmllbGRfbGVuKTsKIAoK

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@stripped
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# testament_sha1: 4c273584a39923d65752b96e8e87296e3bc4e070
# timestamp: 2011-01-26 10:14:54 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: sunny.bains@stripped\
#   bc6tfhyoox0rm931
# 
# Begin bundle
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
FCQ7oDxygA==


--===============0357447052==--