From: marko.makela
Date: May 12 2010 6:22am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3086 to 3087)
List-Archive: http://lists.mysql.com/commits/108073
Message-Id: <201005120623.o4C68RWG011853@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1444260480=="

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

IDMwODcgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xMgogICAgICBNZXJnZSBmcm9tIG15c3FsLTUu
MS1pbm5vZGI6CiAgICAgIAogICAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICAgIHJldm5vOiAzNDYwCiAgICAgICAg
cmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTEyMDUzOTI1LW92d21w
bzA4MzhmczJyb28KICAgICAgICBwYXJlbnQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAw
NTExMTY1ODQ1LWxzdzdzZWl4ZnRnenBmcXQKICAgICAgICBjb21taXR0ZXI6IE1hcmtvIE3DpGtl
bMOkIDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgICBicmFuY2ggbmljazogbXlzcWwt
NS4xLWlubm9kYgogICAgICAgIHRpbWVzdGFtcDogV2VkIDIwMTAtMDUtMTIgMDg6Mzk6MjUgKzAz
MDAKICAgICAgICBtZXNzYWdlOgogICAgICAgICAgcm93X21lcmdlX2Ryb3BfdGVtcF9pbmRleGVz
KCk6IERvIG5vdCByZWZlcmVuY2UgZnJlZWQgbWVtb3J5LgogICAgICAgICAgKEJ1ZyAjNTM0NzEp
CgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBtZXJnZS5jCiAz
MDg2IFN1bm55IEJhaW5zCTIwMTAtMDUtMTIKICAgICAgUmVtb3ZlIFVOSVZfREVCVUcgYW5kIFVO
SVZfU1lOQ19ERUJVRyBmcm9tIHVuaXYuaS4gTGVmdCBvdmVyIGZyb20gdGVzdGluZwogICAgICB0
aGUgcmV2ZXJ0IG9mIGtlcm5lbCBtdXRleCBzcGxpdCBwYXRjaC4KCiAgICBtb2RpZmllZDoKICAg
ICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vYmFzZS9yb3cvcm93MG1lcmdlLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93
L3JvdzBtZXJnZS5jCTIwMTAtMDUtMTEgMTY6MTg6MjggKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5v
YmFzZS9yb3cvcm93MG1lcmdlLmMJMjAxMC0wNS0xMiAwNjoyMTo0NiArMDAwMApAQCAtMjEyMCw5
ICsyMTIwLDEyIEBAIHJvd19tZXJnZV9kcm9wX3RlbXBfaW5kZXhlcyh2b2lkKQogCiAJCWlmICh0
YWJsZSkgewogCQkJZGljdF9pbmRleF90KglpbmRleDsKKwkJCWRpY3RfaW5kZXhfdCoJbmV4dF9p
bmRleDsKIAogCQkJZm9yIChpbmRleCA9IGRpY3RfdGFibGVfZ2V0X2ZpcnN0X2luZGV4KHRhYmxl
KTsKLQkJCSAgICAgaW5kZXg7IGluZGV4ID0gZGljdF90YWJsZV9nZXRfbmV4dF9pbmRleChpbmRl
eCkpIHsKKwkJCSAgICAgaW5kZXg7IGluZGV4ID0gbmV4dF9pbmRleCkgeworCisJCQkJbmV4dF9p
bmRleCA9IGRpY3RfdGFibGVfZ2V0X25leHRfaW5kZXgoaW5kZXgpOwogCiAJCQkJaWYgKCppbmRl
eC0+bmFtZSA9PSBURU1QX0lOREVYX1BSRUZJWCkgewogCQkJCQlyb3dfbWVyZ2VfZHJvcF9pbmRl
eChpbmRleCwgdGFibGUsIHRyeCk7Cgo=

--===============1444260480==
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.5-innodb/
# testament_sha1: 583ef20ae10e76b1c418907740533473f4ea7710
# timestamp: 2010-05-12 09:22:58 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: sunny.bains@stripped\
#   1kycbqgcpp3zolfx
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbZVKskAAgHfgGAwW3v//1cC
AIC////4UARs9s1Obp297dTr3koSiIU9E8FPTTCmymNMgEMjIAGgkpNJ6m0MiZRtNGoNNB6gAGgA
BJEEAmmTRpMiPSZDaT1Bpk00AyDapIGmgxGgDEABoAAABJQJpMGqn4mmk8RR6QeU2oNqMj1BkDkj
jBUdRQgZil6ZKqctgvp0N9mTBC/9S4Fzd8CSCo+sVbkIoMeE4O7NsQQNjAd15VOe4yvZmXlZ4LVK
rR3c0ShradmuqifmSzGNJo49/p5ZEDDXCohU/5plV5W/ymWbuvw7RjDffdLhtzP9wd66mZ3IG5dj
gO4LXeRSfw8z8mZEc3TNiZ4rb2unE7MSTckehBJ0kH3UhfVKboTrOQmdlql7RgvagOpI6NRXKX2R
UUzSex346H4yQmQulOOEV4YE9OTgp9dCrgKrG28sI0nbQWLgqVBlL5l21gUjlzaegrGQVTxFIRZM
Oy0tcUnkfbV1KBayk6qNhhu+U2sHW844q3O6cIxYE0BGSdFYoH3BorQ1yHd8MHDSakGmSYGHVK4D
nK2eixhQ5Qe0zT51VCyxWGQwwLTQkb8VKa2g1CeV7HCtIVkh40eXKJUflsYwpkLiXTbLQbbrDKCz
3GD9WTEYyNzVXOm7hYiyHDSJ7NEgnxbcp1Itd8M4yF5TQutz4mZTVwUiRcbabJPcsM1NbycZZD2R
pCBpmtSlIiyuN2sjUQ459Hnbl3y8LJ5cZGNrnUoR2ooBR7q8JInBrGCjeZkwvYxzmzLIpMYtrflI
djhxOXZCTk4PDUZdARTJXyTDfruwjQk6qxehYWjs6MYB1wjd9NMTa1MQiLAwQw5JHfGOIlXSmhtX
RI+MicgFm2hL6E4lx0u2osZeWkgPGxNownS8jjgSvu3GHOgo6kJqKWmtHh4jHxtYUN/VpQ0opGlB
KTEDHUFVOo6EtXUW1uWFRpKVKmZUoqsqX9W5BMvavSfs/LbaEiS3zFgrmEpeg1UDSjIaWwIoX1H9
C/o1JaPHAbs4oJHE4laKi+55d3RDVkFxj6jCZEzb6xFaDEK1GA9c28WBMTodg2E9rsxjiYkylM2y
xKxLtfNKQ0oqhBf7mYu3Ur0gyxhrB+dRSY7i2wURxjkDlj2hM1h0Z5sLKFgoaPjegqMEHA3vzZsN
bP2VpEgnFsQu1UGg4NArLiBkjFoKEdeNPt/pwGsFUV6wua3DICJDqhxW1s269dheKRsoGWHhjSch
UToHHzn1BBCh1lHpKd0d8Uy4cFH3SVqGZDKKhbsPNkjTKsTLb1JvUAToGtS+RLEKU+S9g+GaZKc2
TKZOzLDDBUOHBVWJr5Fme8Z54KBZPouCAgcGTbqsdlSpbiyDE1mQU5oVazr8ZctQeiOvpsK2K3B1
W0BtqfJeO6TFxvQN30K3mKEUBBl28sr66NHgUEyHeHrm49GBB9BtH206yVTBQFTCVitJDnv9Z5Zl
UJlb1C5oiKWx27DsomWMJhr2Stxa1M7SF71ncMws6jmjzm9Wwq2/8XckU4UJC2VSrJA=


--===============1444260480==--