From: marko.makela
Date: June 23 2011 9:40am
Subject: bzr commit into mysql-5.5 branch (marko.makela:3467) Bug#11753728
List-Archive: http://lists.mysql.com/commits/139715
X-Bug: 11753728
Message-Id: <201106230940.p5N9eVS1004303@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1708005432=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC01LjUvIGJh
c2VkIG9uIHJldmlkOmd1aWxoZW0uYmljaG90QG9yYWNsZS5jb20tMjAxMTA2MDcwNzUzMzctYjA1
YjUxNmRnanF0MXJjcQoKIDM0NjcgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0yMwogICAgICBCdWcj
MTE3NTM3MjggNDUyMjU6IExvY2tpbmc6IGhhbmcgaWYgZHJvcCB0YWJsZSB3aXRoIG5vIHRpbWVv
dXQKICAgICAgCiAgICAgIEZpeCBhIGZhaWx1cmUgb2YgdGhlIHJlLWVuYWJsZWQgaW5ub2RiLWlu
ZGV4LnRlc3QgaW4gdGhlIGVtYmVkZGVkIHNlcnZlci4KICAgICAgQXBwYXJlbnRseSwgdGhlIGVt
YmVkZGVkIHNlcnZlciBkb2VzIG5vdCBkZWZhdWx0IHRvIEVOR0lORT1Jbm5vREIgd2hlbgogICAg
ICBjb3B5aW5nIGFuIElubm9EQiB0YWJsZSBieSBDUkVBVEUgVEFCTEUgdDIgU0VMRUNUICogRlJP
TSB0MTsKCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5v
ZGItaW5kZXgucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWlu
ZGV4LnRlc3QKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5u
b2RiLWluZGV4LnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGIt
aW5kZXgucmVzdWx0CXJldmlkOmd1aWxoZW0uYmljaG90QG9yYWNsZS5jb20tMjAxMTA2MDcwNzUz
MzctYjA1YjUxNmRnanF0MXJjcQorKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9k
Yi1pbmRleC5yZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MjMwOTQw
MTktZWQyN2t2cGo3bDI3aTBydQpAQCAtMTA4Nyw3ICsxMDg3LDggQEAgRFJPUCBUQUJMRSB0MjsK
IERST1AgVEFCTEUgdDE7CiBDUkVBVEUgVEFCTEUgdDEgKGEgSU5ULCBiIENIQVIoMSkpIEVOR0lO
RT1Jbm5vREI7CiBJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKDMsJ2EnKSwoMywnYicpLCgxLCdjJyks
KDAsJ2QnKSwoMSwnZScpOwotQ1JFQVRFIFRBQkxFIHQyIFNFTEVDVCAqIEZST00gdDE7CitDUkVB
VEUgVEFCTEUgdDIgKGEgSU5ULCBiIENIQVIoMSkpIEVOR0lORT1Jbm5vREI7CitJTlNFUlQgSU5U
TyB0MiBTRUxFQ1QgKiBGUk9NIHQxOwogQkVHSU47CiBTRUxFQ1QgKiBGUk9NIHQxOwogYQliCgo9
PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItaW5kZXgu
dGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItaW5kZXgudGVzdAly
ZXZpZDpndWlsaGVtLmJpY2hvdEBvcmFjbGUuY29tLTIwMTEwNjA3MDc1MzM3LWIwNWI1MTZkZ2px
dDFyY3EKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItaW5kZXgudGVzdAly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYyMzA5NDAxOS1lZDI3a3ZwajdsMjdp
MHJ1CkBAIC01MjEsNyArNTIxLDggQEAgY29ubmVjdCAoYixsb2NhbGhvc3Qscm9vdCwsKTsKIGNv
bm5lY3Rpb24gYTsKIENSRUFURSBUQUJMRSB0MSAoYSBJTlQsIGIgQ0hBUigxKSkgRU5HSU5FPUlu
bm9EQjsKIElOU0VSVCBJTlRPIHQxIFZBTFVFUyAoMywnYScpLCgzLCdiJyksKDEsJ2MnKSwoMCwn
ZCcpLCgxLCdlJyk7Ci1DUkVBVEUgVEFCTEUgdDIgU0VMRUNUICogRlJPTSB0MTsKK0NSRUFURSBU
QUJMRSB0MiAoYSBJTlQsIGIgQ0hBUigxKSkgRU5HSU5FPUlubm9EQjsKK0lOU0VSVCBJTlRPIHQy
IFNFTEVDVCAqIEZST00gdDE7CiBjb25uZWN0aW9uIGI7CiBCRUdJTjsKICMgVGhpcyBhY3F1aXJl
cyBhIE1ETCBsb2NrIG9uIHQxIHVudGlsIGNvbW1pdC4KCg==

--===============1708005432==
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:40:26 +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


--===============1708005432==--