From: marko.makela
Date: May 12 2010 6:21am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3087)
List-Archive: http://lists.mysql.com/commits/108071
Message-Id: <201005120622.o4C6M7cb027482@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0907047927=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS41LWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6c3VubnkuYmFpbnNAb3JhY2xlLmNvbS0yMDEwMDUxMjAyMzM1OS0xa3ljYnFn
Y3BwM3pvbGZ4CgogMzA4NyBNYXJrbyBNw6RrZWzDpAkyMDEwLTA1LTEyCiAgICAgIE1lcmdlIGZy
b20gbXlzcWwtNS4xLWlubm9kYjoKICAgICAgCiAgICAgICAgLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgICAgcmV2bm86IDM0
NjAKICAgICAgICByZXZpc2lvbi1pZDogbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTIw
NTM5MjUtb3Z3bXBvMDgzOGZzMnJvbwogICAgICAgIHBhcmVudDogbWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMDA1MTExNjU4NDUtbHN3N3NlaXhmdGd6cGZxdAogICAgICAgIGNvbW1pdHRlcjog
TWFya28gTcOka2Vsw6QgPG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tPgogICAgICAgIGJyYW5jaCBu
aWNrOiBteXNxbC01LjEtaW5ub2RiCiAgICAgICAgdGltZXN0YW1wOiBXZWQgMjAxMC0wNS0xMiAw
ODozOToyNSArMDMwMAogICAgICAgIG1lc3NhZ2U6CiAgICAgICAgICByb3dfbWVyZ2VfZHJvcF90
ZW1wX2luZGV4ZXMoKTogRG8gbm90IHJlZmVyZW5jZSBmcmVlZCBtZW1vcnkuCiAgICAgICAgICAo
QnVnICM1MzQ3MSkKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MG1lcmdlLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBtZXJn
ZS5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbWVyZ2UuYwkyMDEwLTA1LTExIDE2
OjE4OjI4ICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBtZXJnZS5jCTIwMTAt
MDUtMTIgMDY6MjE6NDYgKzAwMDAKQEAgLTIxMjAsOSArMjEyMCwxMiBAQCByb3dfbWVyZ2VfZHJv
cF90ZW1wX2luZGV4ZXModm9pZCkKIAogCQlpZiAodGFibGUpIHsKIAkJCWRpY3RfaW5kZXhfdCoJ
aW5kZXg7CisJCQlkaWN0X2luZGV4X3QqCW5leHRfaW5kZXg7CiAKIAkJCWZvciAoaW5kZXggPSBk
aWN0X3RhYmxlX2dldF9maXJzdF9pbmRleCh0YWJsZSk7Ci0JCQkgICAgIGluZGV4OyBpbmRleCA9
IGRpY3RfdGFibGVfZ2V0X25leHRfaW5kZXgoaW5kZXgpKSB7CisJCQkgICAgIGluZGV4OyBpbmRl
eCA9IG5leHRfaW5kZXgpIHsKKworCQkJCW5leHRfaW5kZXggPSBkaWN0X3RhYmxlX2dldF9uZXh0
X2luZGV4KGluZGV4KTsKIAogCQkJCWlmICgqaW5kZXgtPm5hbWUgPT0gVEVNUF9JTkRFWF9QUkVG
SVgpIHsKIAkJCQkJcm93X21lcmdlX2Ryb3BfaW5kZXgoaW5kZXgsIHRhYmxlLCB0cngpOwoK

--===============0907047927==
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:01 +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=


--===============0907047927==--