From: marko.makela
Date: October 27 2010 6:50pm
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3209) Bug#57707
List-Archive: http://lists.mysql.com/commits/122139
X-Bug: 57707
Message-Id: <201010271851.o9RIDCVf017806@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1936927127=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAxMDI3MTM0MzI5LW0zM3hh
ODFwdTZvcGg4cnUKCiAzMjA5IE1hcmtvIE3DpGtlbMOkCTIwMTAtMTAtMjcKICAgICAgRml4IGEg
Ym9ndXMgZGVidWcgYXNzZXJ0aW9uIGluIHRoZSBmaXggb2YgQnVnICM1NzcwNy4KICAgICAgCiAg
ICAgIGJ1Zl9wb29sX2luaXQoKTogUmVwbGFjZSB1dF9hZChuX2luc3RhbmNlcyA8IE1BWF9CVUZG
RVJfUE9PTFMpCiAgICAgIHdpdGggdXRfYWQobl9pbnN0YW5jZXMgPD0gTUFYX0JVRkZFUl9QT09M
UykuCiAgICAgIChTcG90dGVkIGJ5IE1pY2hhZWwgSXppb3VtdGNoZW5rby4pCiAgICAgIEFkZCB1
dF9hZChuX2luc3RhbmNlcyA+IDApLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9i
YXNlL2J1Zi9idWYwYnVmLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnVm
L2J1ZjBidWYuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1Zi5jCXJldmlkOnZh
c2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMDEwMjcxMzQzMjktbTMzeGE4MXB1Nm9waDhydQorKysg
Yi9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwYnVmLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMDEwMjcxODUwNDUtdWVjMnh4MW14YzNhNjAyaApAQCAtMTI5NSw3ICsxMjk1LDgg
QEAgYnVmX3Bvb2xfaW5pdCgKIAl1bGludAkJaTsKIAljb25zdCB1bGludAlzaXplCT0gdG90YWxf
c2l6ZSAvIG5faW5zdGFuY2VzOwogCi0JdXRfYWQobl9pbnN0YW5jZXMgPCBNQVhfQlVGRkVSX1BP
T0xTKTsKKwl1dF9hZChuX2luc3RhbmNlcyA+IDApOworCXV0X2FkKG5faW5zdGFuY2VzIDw9IE1B
WF9CVUZGRVJfUE9PTFMpOwogCXV0X2FkKG5faW5zdGFuY2VzID09IHNydl9idWZfcG9vbF9pbnN0
YW5jZXMpOwogCiAJLyogV2UgY3JlYXRlIGFuIGV4dHJhIGJ1ZmZlciBwb29sIGluc3RhbmNlLCB0
aGlzIGluc3RhbmNlIGlzIHVzZWQKCg==

--===============1936927127==
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:50:59 +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==


--===============1936927127==--