From: marko.makela
Date: June 30 2010 9:55am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3131) Bug#54358
List-Archive: http://lists.mysql.com/commits/112553
X-Bug: 54358
Message-Id: <201006300955.o5U95nmC023726@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1836080960=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYzMDA5NTI0MS1iaWV0
Z3VrZHkyZzZrN3g0CgogMzEzMSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTMwCiAgICAgIE1lcmdl
IGEgQnVnICM1NDM1OCBlcnJvciBoYW5kbGluZyBjb3JyZWN0aW9uIGZyb20gbXlzcWwtNS4xLWlu
bm9kYjoKICAgICAgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tCiAgICAgIHJldm5vOiAzNTM0CiAgICAgIHJldmlzaW9uLWlkOiBtYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYzMDA5Mzg0Ny03Z2tyMWxoM2JoMnhrc3kwCiAgICAg
IHBhcmVudDogbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MzAwOTMxNDktd21jMzd0MTI4
Z2ljOTMzdgogICAgICBjb21taXR0ZXI6IE1hcmtvIE3DpGtlbMOkIDxtYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbT4KICAgICAgYnJhbmNoIG5pY2s6IDUuMS1pbm5vZGIKICAgICAgdGltZXN0YW1wOiBX
ZWQgMjAxMC0wNi0zMCAxMjozODo0NyArMDMwMAogICAgICBtZXNzYWdlOgogICAgICAgIEJ1ZyM1
NDM1OCBmb2xsb3ctdXA6IENvcnJlY3Qgc29tZSBlcnJvciBoYW5kbGluZy4KCiAgICBtb2RpZmll
ZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwc2VsLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uv
cm93L3JvdzBzZWwuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYzMDA5NTI0
MS1iaWV0Z3VrZHkyZzZrN3g0CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYzMDA5NTUxMC1nNmZ3MnowczFtbzhn
YXY1CkBAIC0zNjE5LDExICszNjE5LDggQEAgcm93X3NlYXJjaF9mb3JfbXlzcWwoCiAJCQkJCXV0
X2EodHJ4LT5pc29sYXRpb25fbGV2ZWwKIAkJCQkJICAgICA9PSBUUlhfSVNPX1JFQURfVU5DT01N
SVRURUQpOwogCi0JCQkJCWVyciA9IERCX1RPT19CSUdfUkVDT1JEOwotCi0JCQkJCS8qIFdlIGxl
dCB0aGUgbWFpbiBsb29wIHRvIGRvIHRoZQotCQkJCQllcnJvciBoYW5kbGluZyAqLwotCQkJCQln
b3RvIHNob3J0Y3V0X2ZhaWxzX3Rvb19iaWdfcmVjOworCQkJCQkvKiBQcm9jZWVkIGFzIGluIGNh
c2UgU0VMX1JFVFJZLiAqLworCQkJCQlicmVhazsKIAkJCQl9CiAKIAkJCQltdHJfY29tbWl0KCZt
dHIpOwpAQCAtMzY2Myw3ICszNjYwLDcgQEAgcmVsZWFzZV9zZWFyY2hfbGF0Y2hfaWZfbmVlZGVk
OgogCQkJZGVmYXVsdDoKIAkJCQl1dF9hZCgwKTsKIAkJCX0KLXNob3J0Y3V0X2ZhaWxzX3Rvb19i
aWdfcmVjOgorCiAJCQltdHJfY29tbWl0KCZtdHIpOwogCQkJbXRyX3N0YXJ0KCZtdHIpOwogCQl9
Cgo=

--===============1836080960==
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/5.5-innodb/
# testament_sha1: b3d97a895b64c46fdd68d1d0285cff21d2bd1ad2
# timestamp: 2010-06-30 12:55:17 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   bietgukdy2g6k7x4
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWehfBrsAAePflCAwWnv//1sG
XKC/7//wBAAIAFAD7QI0Y14OW4JJIBqT0yE8mSn5RjSGp7UBGgDNAgSVU/Uep6Ypsk1PTRpDQAAx
AAAAMSBIwR6J6jUnptIRoA0GI0ZNBoOYTAJgBMJhNMAAAmTTQMJJSPUZR+lPak3qNMkzUNPU0AA0
AGhoYBxTlpzXao3fmvta19w8t5eR+RHFggvmgluiguHw390X0qz1ZYVpI93afy+q9r4ddH60lF0p
P8h2ZxHmHR2uVl+O143694uJJ6THnZ5RuVjGS09qtx3IZlVozqMgl6nGvtH+azAufBccJOlbQnTx
fIrhOWy7RN5xEzNOuYS06xLX2SWUzyvdCuhgpAZnWOBOBaN6FzKHwhRpehW9UcTxiIFDCyZTOggk
XwKxTqRlIHAwm0CvcC6OG643wfacnhilUu2KDJVqsqpt4Kgd65Zfunm55W2NNEBOyY0lcfWKS291
4KzfMNQTg4zGWl46RTuRXi3iiCOjAOHMDCuAt4z4OAMY6ZtPHjWGPKg2RzjJhulJ5126hZotFSSF
xomiAkwgM8rY6Yl46BiW8gPiaLPCNb7QY0xAnauwOB5wMniRnDQRQZmzGFGq0BJmAOx1HsLlKSKk
TIHQIdWNW3ZfUU4fiixM2aqrX8QMtGyYWrDzuLqhVpcKkMMYWoRTRusmoe4G5tJhsalrKJQI5LrL
Bhv5LtnTwXpxune02Nwm2T1HYRRwgxUlAVASqVDd1DIXYXiz2s7l6eoXHcCYCtJLusLvHxkRCHOE
fb1dC0fHO/MwduMJI4LipW3bRLww2bRKeccDrRLvppIig1TC9CUSz73LEW/ZCtBUDcOkiicnZ+jE
MNnj1wIYmT6MTnWN603VyrHOvjs+desmewwlmEuXRPpQ7dY6hTJYFlvtCSyqNONRoM48e/pCWe7g
ALIZht41O3SVUNuc+MMN17HvHr5n4c8NFLbI7KlqyZWr/jiwAzLvTLgqyGl+gsszAwTCvq5MGcYh
GJTXSsRdIumJzXxYKmWhmvCtus1otwICjaKTTjCgjbJUFBRAMMo+1oEDqTOnCopVxPLAfAlWvJB0
uBG+jMSTRwJqwbJWDCXwYgxgFOrZWlOE8ggzvEmOTKTx54TExcSXKJbxkDwNQ0mUivKWd08FWOMA
rxeH3hwLPDgEHMeD9Zcd+8zBcijx4gAWgw1Ip62gnchIH1vA+4J5gJH+S9jzOR3o261PZtZi4S0R
fqeKYxZXBBanjhX3jxr5wuAJVshhdRtmxFkptJpUyf1igzEUMKouY5NSGlW3P/XhIirJbfwaBukp
G5DIXRB1eOm7WpiGELyaxVmLuOQM2BWv0SFBTFNKgTrA0NUFCkNxoozHfwWGo/xdyRThQkOhfBrs


--===============1836080960==--