From: marko.makela
Date: May 6 2010 11:20am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3456) Bug#52964
List-Archive: http://lists.mysql.com/commits/107630
X-Bug: 52964
Message-Id: <201005061120.o46AuOrG005608@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1714396983=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDUxMzI3MzYtNnJ5b3Bk
MXI3d3J6cmN5bAoKIDM0NTYgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNgogICAgICBidHJfcGFn
ZV9zcGxpdF9hbmRfaW5zZXJ0KCk6IEFkZCBhbiBhc3NlcnRpb24gc3VnZ2VzdGVkIGJ5IFN1bm55
CiAgICAgIHdoZW4gcmV2aWV3aW5nIHRoZSBwYXRjaCB0byBCdWcgIzUyOTY0LgoKICAgIG1vZGlm
aWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBidHIuYwo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwYnRyLmMnCi0tLSBhL3N0b3Jh
Z2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGJ0ci5jCTIwMTAtMDUtMDQgMTA6NTU6NDYgKzAwMDAK
KysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwYnRyLmMJMjAxMC0wNS0wNiAxMToy
MDoyNCArMDAwMApAQCAtMjAwMCw2ICsyMDAwLDcgQEAgZnVuY19zdGFydDoKIAkJCWdvdG8gaW5z
ZXJ0X2VtcHR5OwogCQl9CiAJfSBlbHNlIGlmIChVTklWX1VOTElLRUxZKGluc2VydF9sZWZ0KSkg
eworCQl1dF9hKG5faXRlcmF0aW9ucyA+IDApOwogCQlmaXJzdF9yZWMgPSBwYWdlX3JlY19nZXRf
bmV4dChwYWdlX2dldF9pbmZpbXVtX3JlYyhwYWdlKSk7CiAJCW1vdmVfbGltaXQgPSBwYWdlX3Jl
Y19nZXRfbmV4dChidHJfY3VyX2dldF9yZWMoY3Vyc29yKSk7CiAJfSBlbHNlIHsKCg==

--===============1714396983==
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/mysql/5.1-innodb/
# testament_sha1: e554d18f37bfced8e7ba3c60dcf780b4a9216e66
# timestamp: 2010-05-06 14:20:32 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   6ryopd1r7wrzrcyl
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRWgt3EAAarfgEAwW2P//3MC
CAC/7//wUAO5pPZoudDrs0JJKeowjTSZowUzE0Q00DQGmmgkpNTNGiYyjTKPSGmQGmh6g0ACSIJM
Ak8iY0mo2pjQmEeoPUAYAAAADQAAAAAJKKekNNDQGjEAGgA0ABbCF1+Ge1vry9DOK0DKptuTPACq
tn2vL++t1WJdpZmLOfuukqLHL7otDpx1GHvYzfSHPSSaDdGlN/sw7Gpjdp+/X2RwKqWzys07wJLo
tQbjpanmfLjLiz34d1UFaJ04jiuId6nSqMcXyrfSs0jgkT0m/sl7IpkJmGsbiFqRYOIzURxMXMIZ
SwKFUekhSG7SohkdSqO7grhgrRaqrHCKdpnmFbtmUS0ToVvjLmUxrPQepzJQhpeyckVww+NCjEue
mCJhXkTN5EwnRmHQTSdFxwRTsnRaIjKKSRQvwEo1WygmDE+oRw8rDsBaGqwKCMn0MMTlErrMlIbY
LpXM6j2tEdnq62YF8PFZOiiKkQOoksTXO3U01QlTFqFMzVBUvAWs/KDUqzOvbDnTE+9bDGxVPZiu
gU8VdYmSaMhQKXWFxgZDlTLfnRQjY1ReaCnnRAjXemMVHAqCdSpfazfLmbGF8GLzu1FBp2SHj5Mt
feeW6FDk+EYRxXBIlC5kx+IPJD0Ncp0prHcLnr+dtBP9RDeaV8jM396R/pS+xIprJAb3pHCBbomh
DCgWT0hzE127rTjSbDC9DENXNUph1uXbYDEi1m8nwDlaPL14qVdh0rj7eE7mSGypGalR2E3CahZE
5NGJuUxlX7LpV5GTih37WAoxkYNGuwlEmhmznovQYGQDkVnY6svcE836mI1yQnAmGYrMmZM+FBvw
wLF2X41Qw5Uk+dDGkjPqzaaKXK63c+1Jp8H5UZupsZMzVg1OT3q2Y86xayXT5ieS1mqgHk9oY5aI
+dWGDTEyTSAbYZrhYnzmhdNaRCGoF7XxJkiiJIZ4xuhqskg7kjtFxSJbOLHuOTaVYPuvOPXZOk85
wjkyXY283SmDRcfhrUGz7ZxqBmQye/ZcCwaL6QUCC9n7EwfqREEascpLZ5rmrr5U2M6cMCd91FAy
yF9aDUYi3qRtSS1tcozihV1SWsoUTmCpVULwkEWIp14rwWXqKcxmyNcnjAqNwDTXa8i1iYXtDOPm
Lz5SM7LtxfJ3vlaaGxtHGhdAESpENKmMTKJx38oOVuFdX9YlL7akF7dLnPW4XJxQWjG3rZm5Jlnq
E2xyuFOM1/xdyRThQkBWgt3E


--===============1714396983==--