From: marko.makela
Date: October 27 2010 6:54pm
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3208 to 3209) Bug#57707
List-Archive: http://lists.mysql.com/commits/122141
X-Bug: 57707
Message-Id: <201010271855.o9RHfa30006537@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1855568426=="

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

IDMyMDkgTWFya28gTcOka2Vsw6QJMjAxMC0xMC0yNwogICAgICBGaXggYSBib2d1cyBkZWJ1ZyBh
c3NlcnRpb24gaW4gdGhlIGZpeCBvZiBCdWcgIzU3NzA3LgogICAgICAKICAgICAgYnVmX3Bvb2xf
aW5pdCgpOiBSZXBsYWNlIHV0X2FkKG5faW5zdGFuY2VzIDwgTUFYX0JVRkZFUl9QT09MUykKICAg
ICAgd2l0aCB1dF9hZChuX2luc3RhbmNlcyA8PSBNQVhfQlVGRkVSX1BPT0xTKS4KICAgICAgKFNw
b3R0ZWQgYnkgTWljaGFlbCBJemlvdW10Y2hlbmtvLikKICAgICAgQWRkIHV0X2FkKG5faW5zdGFu
Y2VzID4gMCkuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBi
dWYuYwogMzIwOCBWYXNpbCBEaW1vdgkyMDEwLTEwLTI3IFttZXJnZV0KICAgICAgTWVyZ2UgbXlz
cWwtNS4xLWlubm9kYiAtPiBteXNxbC01LjUtaW5ub2RiIChlbXB0eSBkaWZmKQoKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYycKLS0tIGEvc3RvcmFnZS9p
bm5vYmFzZS9idWYvYnVmMGJ1Zi5jCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMDEw
MjcxMzQzMjktbTMzeGE4MXB1Nm9waDhydQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYw
YnVmLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEwMjcxODUwNDUtdWVjMnh4
MW14YzNhNjAyaApAQCAtMTI5NSw3ICsxMjk1LDggQEAgYnVmX3Bvb2xfaW5pdCgKIAl1bGludAkJ
aTsKIAljb25zdCB1bGludAlzaXplCT0gdG90YWxfc2l6ZSAvIG5faW5zdGFuY2VzOwogCi0JdXRf
YWQobl9pbnN0YW5jZXMgPCBNQVhfQlVGRkVSX1BPT0xTKTsKKwl1dF9hZChuX2luc3RhbmNlcyA+
IDApOworCXV0X2FkKG5faW5zdGFuY2VzIDw9IE1BWF9CVUZGRVJfUE9PTFMpOwogCXV0X2FkKG5f
aW5zdGFuY2VzID09IHNydl9idWZfcG9vbF9pbnN0YW5jZXMpOwogCiAJLyogV2UgY3JlYXRlIGFu
IGV4dHJhIGJ1ZmZlciBwb29sIGluc3RhbmNlLCB0aGlzIGluc3RhbmNlIGlzIHVzZWQKCg==

--===============1855568426==
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: 20b42be576e9810e7aafbee4028cff8fb71f2e88
# timestamp: 2010-10-27 21:55:05 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   m33xa81pu6oph8ru
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRtkstIAAa1flAAwWmP//3Mm
2kC/7//wBAAIAFAD2nt2zVe7zyPB28JJQ0U9MqewTTIwqPaEnpPUepp6htIaaPKBlCZU/UzJppoS
ekzRDI0AeoAGgAkkmjIAJT8mST2ijageo9RtQaDQAK/UpMh6QBo0BoAANADQyeoAkppJk9BT2qae
Keo00NNNqBoNAAAGMrKbdHt39Tpt2xxMGbStBVm6MbJHw6z4VZszFx3/A8HRMYQTUOed+l2Y8vPb
uOt2/rX5ecn4PzHBp1R+ryH4socLyqt0NKHmW/OoS/2wSI249CXwZ6Negj0WxRLv0Z9DlTa+LPp4
K5DYW2kZ1LKBC2qiZ4tDlHAQ8RlTq+qx4iwTTF4nOcRUB9DRBlepqMH9FNWTstZhHJhHXbt1XjSp
CWHeyFMbUOMaA/YaQrc7LiXcVAOxVwovSYOXZcYCmVj7xFJJJDKRnEWlWpQTLFFgu1u1oybUCgW8
TYAx5lQqh8Fe+dRFgSGtKcrWv2Dh67H2irlcxMPVNBipzg8umcaUi1acBruBwt1UzPkKR5io51h4
GcpCPqzIu8G6Mqg1jmTG6NMYGkqZObbXB1sMBkiZYKiEmOissWdcYqvNV5LNjYQEw9XUp9Tp9Zod
YWmt4e+dZW0XPmLxJOi3It/Iy6svQKIqihcBJRByaDSkQhFrU9UGS5je09XZgVu9MmPbE8ty3ftM
l9SjORBFMOy24lHodFXnIxBpFNEgsWNyHPGRjBhuijuYOQwavTnlKmDfDiF2q3h0VAfrDePWkXoj
TNAGQH3qpFBlmRlEBtVby18l8LbcoCQs0ps1u5cUxw9+qHm+DEiicLEU65KfxUWxEypep53iwMIH
mSJyRbUJ5iK8IBuIpDiw74TK9zTWz07ztzVUnhFhnbs1ucoA9yb8PdwlNLbrwuRgl84ENE4LKm0S
gxGmrNldDUiW5J0QO8DgmXHRbXuxaxGNxGEKexsWZMLGp61ayq4flPtt2FzHeZi9G6feVMVtYnrA
aCNz8qocWHGaX4pnWkqrT4+qTEJe7uZHKuh0cgX4hn7Y/KiLhpiTdLgPXAM5mA01TBQFDg9ergNZ
q0hirHhPCIjcm5gafM7hneO9VSVmc7k95XyE+VmDVHGAng9rGgrXZMhyGZMt3EQ+yj2UZAoo45wP
OvBI7QrUrlO6OIVYsycShdrD8bIbV1/uc67qUlk9EeNpCyVBBXyWyj+vRTKRPRdJykqdvcUUrEHQ
ObRlbeiCJISOoQ3cUCvaBsmmDQrzUjpwoB6eykmf82KLzIJ1wjwbCOBS2THVmcplMtIaqCsV6sE5
eIp5lhZGdov8a+f8XckU4UJAbZLLSA==


--===============1855568426==--