From: marko.makela
Date: June 23 2011 9:59am
Subject: bzr push into mysql-5.5 branch (marko.makela:3466 to 3467) Bug#11753728
List-Archive: http://lists.mysql.com/commits/139718
X-Bug: 11753728
Message-Id: <201106230959.p5N9xAJM031401@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0027570623=="

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

IDM0NjcgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0yMwogICAgICBCdWcjMTE3NTM3MjggNDUyMjU6
IExvY2tpbmc6IGhhbmcgaWYgZHJvcCB0YWJsZSB3aXRoIG5vIHRpbWVvdXQKICAgICAgCiAgICAg
IEZpeCBhIGZhaWx1cmUgb2YgdGhlIHJlLWVuYWJsZWQgaW5ub2RiLWluZGV4LnRlc3QgaW4gdGhl
IGVtYmVkZGVkIHNlcnZlci4KICAgICAgQXBwYXJlbnRseSwgdGhlIGVtYmVkZGVkIHNlcnZlciBk
b2VzIG5vdCBkZWZhdWx0IHRvIEVOR0lORT1Jbm5vREIgd2hlbgogICAgICBjb3B5aW5nIGFuIElu
bm9EQiB0YWJsZSBieSBDUkVBVEUgVEFCTEUgdDIgU0VMRUNUICogRlJPTSB0MTsKCiAgICBtb2Rp
ZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItaW5kZXgucmVzdWx0
CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LnRlc3QKIDM0NjYg
R3VpbGhlbSBCaWNob3QJMjAxMS0wNi0wNwogICAgICBUaGlzIHBhdGNoIGlzIGZvciA1LjUuCiAg
ICAgIFdMIzU5MTQgcmVtb3ZlIG9wdGlvbiAiLS1hbGwiIG9mIHRoZSAicGVycm9yIiBwcm9ncmFt
LgogICAgICBJbiA1LjUgd2UganVzdCBnaXZlIGEgZGVwcmVjYXRpb24gd2FybmluZzsgaW4gdHJ1
bmsgd2UgcmVtb3ZlIHRoZSBvcHRpb24uCgogICAgbW9kaWZpZWQ6CiAgICAgIGV4dHJhL3BlcnJv
ci5jCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYi1p
bmRleC5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWluZGV4
LnJlc3VsdAlyZXZpZDpndWlsaGVtLmJpY2hvdEBvcmFjbGUuY29tLTIwMTEwNjA3MDc1MzM3LWIw
NWI1MTZkZ2pxdDFyY3EKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItaW5k
ZXgucmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjIzMDk0MDE5LWVk
MjdrdnBqN2wyN2kwcnUKQEAgLTEwODcsNyArMTA4Nyw4IEBAIERST1AgVEFCTEUgdDI7CiBEUk9Q
IFRBQkxFIHQxOwogQ1JFQVRFIFRBQkxFIHQxIChhIElOVCwgYiBDSEFSKDEpKSBFTkdJTkU9SW5u
b0RCOwogSU5TRVJUIElOVE8gdDEgVkFMVUVTICgzLCdhJyksKDMsJ2InKSwoMSwnYycpLCgwLCdk
JyksKDEsJ2UnKTsKLUNSRUFURSBUQUJMRSB0MiBTRUxFQ1QgKiBGUk9NIHQxOworQ1JFQVRFIFRB
QkxFIHQyIChhIElOVCwgYiBDSEFSKDEpKSBFTkdJTkU9SW5ub0RCOworSU5TRVJUIElOVE8gdDIg
U0VMRUNUICogRlJPTSB0MTsKIEJFR0lOOwogU0VMRUNUICogRlJPTSB0MTsKIGEJYgoKPT09IG1v
ZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LnRlc3Qn
Ci0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LnRlc3QJcmV2aWQ6
Z3VpbGhlbS5iaWNob3RAb3JhY2xlLmNvbS0yMDExMDYwNzA3NTMzNy1iMDViNTE2ZGdqcXQxcmNx
CisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LnRlc3QJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MjMwOTQwMTktZWQyN2t2cGo3bDI3aTBydQpA
QCAtNTIxLDcgKzUyMSw4IEBAIGNvbm5lY3QgKGIsbG9jYWxob3N0LHJvb3QsLCk7CiBjb25uZWN0
aW9uIGE7CiBDUkVBVEUgVEFCTEUgdDEgKGEgSU5ULCBiIENIQVIoMSkpIEVOR0lORT1Jbm5vREI7
CiBJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKDMsJ2EnKSwoMywnYicpLCgxLCdjJyksKDAsJ2QnKSwo
MSwnZScpOwotQ1JFQVRFIFRBQkxFIHQyIFNFTEVDVCAqIEZST00gdDE7CitDUkVBVEUgVEFCTEUg
dDIgKGEgSU5ULCBiIENIQVIoMSkpIEVOR0lORT1Jbm5vREI7CitJTlNFUlQgSU5UTyB0MiBTRUxF
Q1QgKiBGUk9NIHQxOwogY29ubmVjdGlvbiBiOwogQkVHSU47CiAjIFRoaXMgYWNxdWlyZXMgYSBN
REwgbG9jayBvbiB0MSB1bnRpbCBjb21taXQuCgo=

--===============0027570623==
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/mysql-5.5/
# testament_sha1: c3f4831407b8cfa815d50d5d22cdc94dd9fb3816
# timestamp: 2011-06-23 12:59:06 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# base_revision_id: guilhem.bichot@stripped\
#   b05b516dgjqt1rcq
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbun4LkAAnbflAAQWnf//3/n
nAC////wBAAIAFAFLXjICKINUNFYSSo2pN6hqPCah5DKG1AAaANPSB6jQOaMmJgAmIwI0wIMRgmT
AIwSSAgTNVPyp5TxT1NGnlMgaB5INNqBtQDmjJiYAJiMCNMCDEYJkwCMElAQAJk01T9TaBSfk1MT
U9RsRBiGho+Jpck7DWOPkmmCWiiRyhwDJamROPnuvgyRQR4C/1rGby0ZmTNd9FlCbJ5a9+ZuZ9zx
5D+9Z/NOc5l8TEptljXOtfrWady2y6Qse8cL9T2zHt9vxQFxk40qIsG77bwSY342SU8eDw3b+Hcb
ez4CcwD2ShqDIPoeKq5HMcuRwxDdR9kLuOgfbwF4qsGgdm6aRLnEqmCnOfStUiW9I6pdhgW0xJnp
MYGtmg2xqF4A5NN4DO0hxIFBtUA0KpWjCJGpak+0scs4zgHZrlJiKmOYi+3gHUBGiiyzcDpw9Uya
FVVgxsO/DDBCq6d7SnAJ2YdTJTlcCsmIh6XMZSu2qcKsfiGCdmMh5z+2wtSNMSU5rUNCeJlpFOhm
ORPoktRmnNpNQwDIbUyEbM3GIEgFmGuxwYXI9QV40s6FTSx5e4a4CZhiRNkC9VKBvar094PConkL
XUMqiBAexWsqoTQxl04PIDLIa61CBMmAwqDIhaWkb7dUs5OpFGpThJLsKmKsKXwVI9SGFzQ2XYEV
0ID3FesaIuNxiDiy7UETZeH3GLYEqlxci+rKBNIpVaDzwK+8NJmc0isA5AV1vcVhIsx1BKuBfViR
gbDNHCDjMRKbiqyRnBkGisMpA4CuMyki7e02JGNCGWB+x3tvnJFWkMn56a06die9Sk8GqaSrRLFk
C4Z8VhyyNZAYe4cvguXU42BMtiR4r+CVV/QqHMwwzjiobu8RGeveFa/S7l1q165KpMMtYWMBNfk7
lAijsXhV6f2qjuSgmFQosS5clImryCkOHqScYni0jkceDw7CqJtiJx7DaHjNzpHUkb7Sr9PQS7il
kqteirokfKYnuii7vOtYH1nEqOEx5h70vVNNTvJGRgeR7j8jaDqzzPkr11Rb3pWhPjOEwYBYXBbA
/eQ7NrAYrGeTRK4Sut2qJvDYP33jh4GqNISBa1yKkr8wlLC8xbKlSGC0UCijjvGF7WtYAevpj68O
ZuIs1GRhxNe85nEiR5tbaVo9pMSwuhMgGU2I/rPLLczPprjcxax6Ao1UNFmDWmCfZHFWefTkw40B
yniAygCZJyHPi8NuXTM4nHQwxyCao31tL8OMvlLFZcKmkFKoFt4aBqBPgTs6/byWJGsC+Q7DWrOp
w+6GRruWIsFhBQOSJErPo7zO5kWN/HPKX2I5h0RnzngbdAO9bjBI+/sQ7QFvA70cAaBQihwZDEjh
xGTCTQaxU4aIlfpL1QmLiN8UjM+puTBumClKyiDDOd7wzCMXsgh28eh4J7Dm5/mDko+ZIaaT2Blu
x3SZIYOLJYdFetJVo5wTv6Ep0UL8GqfxWqxlAa6tbCZoOUMDtAh67pI7C5ckfyq1Ro0MSVIOSPJU
3SgcFX7XqftiCnWTtuEYe8Bo1MRHU2icwapzJDCQKOiJREUMTMS7oupe54zMjRsovOmROagcggTd
hoDIIhbk5WWc7rSltKGg9gSNSvZ6+C5SUMVNOhQpjFHMCsrcCpc9iYy6DOigiwLkDDoJD+IfP/F3
JFOFCQu6fguQ


--===============0027570623==--