From: marko.makela
Date: May 20 2010 1:16pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3108 to 3109)
List-Archive: http://lists.mysql.com/commits/108792
Message-Id: <201005201317.o4KDDR61015568@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0628230594=="

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

IDMxMDkgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0yMAogICAgICBNZXJnZSBhIGNoYW5nZSBmcm9t
IG15c3FsLTUuMS1pbm5vZGI6CiAgICAgIAogICAgICAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAgcmV2bm86IDM0NzUKICAg
ICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTIwMTMwNzM0LXVl
b3c5bW42MGN6cDdvNG0KICAgICAgcGFyZW50OiBtYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEw
MDUyMDEwNDA0Mi1tYTJuc3NjcWR2d29waDhrCiAgICAgIGNvbW1pdHRlcjogTWFya28gTcOka2Vs
w6QgPG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tPgogICAgICBicmFuY2ggbmljazogNS4xLWlubm9k
YgogICAgICB0aW1lc3RhbXA6IFRodSAyMDEwLTA1LTIwIDE2OjA3OjM0ICswMzAwCiAgICAgIG1l
c3NhZ2U6CiAgICAgICAgYnVmX0xSVV9mcmVlX2Jsb2NrKCk6IENvcnJlY3QgYW4gZXJyb3IgaW4g
dGhlIGNvbW1lbnQuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1
ZjBscnUuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMGxydS5oCiAzMTA4IE1h
cmtvIE3DpGtlbMOkCTIwMTAtMDUtMjAKICAgICAgTWVyZ2UgYSBjaGFuZ2UgZnJvbSBteXNxbC01
LjEtaW5ub2RiOgogICAgICAKICAgICAgVE8gRE86IEVuYWJsZSB0aGlzIGluIENNYWtlLWJhc2Vk
IGJ1aWxkcy4KICAgICAgCiAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICByZXZubzogMzQ3NAogICAgICByZXZpc2lv
bi1pZDogbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MjAxMDQwNDItbWEybnNzY3Fkdndv
cGg4awogICAgICBwYXJlbnQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE5MDgxNjE4
LWgzOHEwMnF4dXZjb3didGsKICAgICAgY29tbWl0dGVyOiBNYXJrbyBNw6RrZWzDpCA8bWFya28u
bWFrZWxhQG9yYWNsZS5jb20+CiAgICAgIGJyYW5jaCBuaWNrOiA1LjEtaW5ub2RiCiAgICAgIHRp
bWVzdGFtcDogVGh1IDIwMTAtMDUtMjAgMTM6NDA6NDIgKzAzMDAKICAgICAgbWVzc2FnZToKICAg
ICAgICBCdWcjNTM1OTM6IEFkZCBzb21lIGluc3RydW1lbnRhdGlvbiB0byBpbXByb3ZlIFZhbGdy
aW5kIHNlbnNpdGl2aXR5CiAgICAgIAogICAgICAgIEJVSUxELyo6IEFkZCB2YWxncmluZF9jb25m
aWdzPS0td2l0aC12YWxncmluZC4KICAgICAgICBCVUlMRC8qOiBSZW1vdmUgLVVTQUZFTUFMTE9D
IGZyb20gdmFsZ3JpbmRfZmxhZ3MuCiAgICAgIAogICAgICAgIGNvbmZpZ3VyZS5pbjogQWRkIEFD
X0FSR19XSVRIKHZhbGdyaW5kKSBhbmQgSEFWRV9WQUxHUklORC4KICAgICAgCiAgICAgICAgaW5j
bHVkZS9teV9zeXMuaDogRGVmaW5lIGEgbnVtYmVyIG9mIE1FTV8gd3JhcHBlcnMgZm9yIFZBTEdS
SU5EXyBmdW5jdGlvbnMuCiAgICAgICAgaW5jbHVkZS9teV9zeXMuaDogTWFrZSBUUkFTSCBkbyBN
RU1fVU5ERUZJTkVEKCkuCiAgICAgIAogICAgICAgIGluY2x1ZGUvbV9zdHJpbmcuaDogUmVtb3Zl
IHVudXNlZCBtYWNybyBiemVyb19pZl9wdXJpZnkoQSxCKS4KICAgICAgCiAgICAgICAgX215bWFs
bG9jKCk6IERlY2xhcmUgTUVNX1VOREVGSU5FRCgpIG9uIHRoZSBhbGxvY2F0ZWQgbWVtb3J5Lgog
ICAgICAKICAgICAgICBfbXlmcmVlKCk6IERlY2xhcmUgTUVNX05PQUNDRVNTKCkgb24gdGhlIGZy
ZWVkIG1lbW9yeS4KICAgICAgCiAgICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYu
aTogRW5hYmxlIFVOSVZfREVCVUdfVkFMR1JJTkQgYmFzZWQgb24KICAgICAgICBIQVZFX1ZBTEdS
SU5EIHJhdGhlciB0aGFuIEhBVkVfcHVyaWZ5LgogICAgICAKICAgICAgICBQb3NzaWJsZSB0aGlu
Z3MgdG8gZG86CiAgICAgICAgICogSW4gbXlfZ2xvYmFsLmgsIHJlbW92ZSB0aGUgZGVmaW5lZChI
QVZFX3B1cmlmeSkgY29uZGl0aW9uCiAgICAgICAgICAgZnJvbSB0aGUgX1dJTjMyIHVpbnQza29y
cigpLgogICAgICAgICAqIEluIG15X2dsb2JhbC5oICppbnQqa29ycigpLCB1c2UgfCBpbnN0ZWFk
IG9mICsKICAgICAgICAgICBpbiBvcmRlciB0byBrZWVwIHRoZSBWYWxncmluZCBWIGJpdHMgYWNj
dXJhdGUKICAgICAgICAgKiBDb25zaWRlciByZXBsYWNpbmcgSEFWRV9wdXJpZnkgd2l0aCBIQVZF
X1ZBTEdSSU5ECiAgICAgICAgICogVXNlIFZBTEdSSU5EX0NSRUFURV9CTE9DSywgVkFMR1JJTkRf
RElTQ0FSRCBpbiBtZW1fcm9vdCBhbmQgc2ltaWxhciBwbGFjZXMKCiAgICBtb2RpZmllZDoKICAg
ICAgQlVJTEQvU0VUVVAuc2gKICAgICAgQlVJTEQvYnVpbGRfbWNjZ2Uuc2gKICAgICAgQlVJTEQv
Y29tcGlsZS1hbWQ2NC12YWxncmluZC1tYXgKICAgICAgQlVJTEQvY29tcGlsZS1wZW50aXVtLWlj
Yy12YWxncmluZC1tYXgKICAgICAgQlVJTEQvY29tcGlsZS1wZW50aXVtLXZhbGdyaW5kLW1heAog
ICAgICBCVUlMRC9jb21waWxlLXBlbnRpdW0tdmFsZ3JpbmQtbWF4LW5vLW5kYgogICAgICBCVUlM
RC9jb21waWxlLXBlbnRpdW02NC12YWxncmluZC1tYXgKICAgICAgY29uZmlndXJlLmluCiAgICAg
IGluY2x1ZGUvbV9zdHJpbmcuaAogICAgICBpbmNsdWRlL215X3N5cy5oCiAgICAgIG15c3lzL3Nh
ZmVtYWxsb2MuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdW5pdi5pCj09PSBtb2Rp
ZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwbHJ1LmMnCi0tLSBhL3N0b3JhZ2Uv
aW5ub2Jhc2UvYnVmL2J1ZjBscnUuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEw
MDUyMDExNDMwNi1vejhtY2U3eThtN3k2cDFnCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1
ZjBscnUuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyMDEzMTYzMi1xdndy
emV1bjVqYmh2MjRkCkBAIC0xNDQyLDExICsxNDQyLDExIEBAIGJ1Zl9MUlVfbWFrZV9ibG9ja19v
bGQoCiBUcnkgdG8gZnJlZSBhIGJsb2NrLiAgSWYgYnBhZ2UgaXMgYSBkZXNjcmlwdG9yIG9mIGEg
Y29tcHJlc3NlZC1vbmx5CiBwYWdlLCB0aGUgZGVzY3JpcHRvciBvYmplY3Qgd2lsbCBiZSBmcmVl
ZCBhcyB3ZWxsLgogCi1OT1RFOiBJZiB0aGlzIGZ1bmN0aW9uIHJldHVybnMgQlVGX0xSVV9GUkVF
RCwgaXQgd2lsbCBub3QgdGVtcG9yYXJpbHkKLXJlbGVhc2UgYnVmX3Bvb2wtPm11dGV4LiAgRnVy
dGhlcm1vcmUsIHRoZSBwYWdlIGZyYW1lIHdpbGwgbm8gbG9uZ2VyIGJlCitOT1RFOiBJZiB0aGlz
IGZ1bmN0aW9uIHJldHVybnMgQlVGX0xSVV9GUkVFRCwgaXQgd2lsbCB0ZW1wb3JhcmlseQorcmVs
ZWFzZSBidWZfcG9vbF9tdXRleC4gIEZ1cnRoZXJtb3JlLCB0aGUgcGFnZSBmcmFtZSB3aWxsIG5v
IGxvbmdlciBiZQogYWNjZXNzaWJsZSB2aWEgYnBhZ2UuCiAKLVRoZSBjYWxsZXIgbXVzdCBob2xk
IGJ1Zl9wb29sLT5tdXRleCBhbmQgYnVmX3BhZ2VfZ2V0X211dGV4KGJwYWdlKSBhbmQKK1RoZSBj
YWxsZXIgbXVzdCBob2xkIGJ1Zl9wb29sX211dGV4IGFuZCBidWZfcGFnZV9nZXRfbXV0ZXgoYnBh
Z2UpIGFuZAogcmVsZWFzZSB0aGVzZSB0d28gbXV0ZXhlcyBhZnRlciB0aGUgY2FsbC4gIE5vIG90
aGVyCiBidWZfcGFnZV9nZXRfbXV0ZXgoKSBtYXkgYmUgaGVsZCB3aGVuIGNhbGxpbmcgdGhpcyBm
dW5jdGlvbi4KIEByZXR1cm4gQlVGX0xSVV9GUkVFRCBpZiBmcmVlZCwgQlVGX0xSVV9DQU5OT1Rf
UkVMT0NBVEUgb3IKQEAgLTE0NjAsNyArMTQ2MCw3IEBAIGJ1Zl9MUlVfZnJlZV9ibG9jaygKIAkJ
CQljb21wcmVzc2VkIHBhZ2Ugb2YgYW4gdW5jb21wcmVzc2VkIHBhZ2UgKi8KIAlpYm9vbCoJCWJ1
Zl9wb29sX211dGV4X3JlbGVhc2VkKQogCQkJCS8qITwgaW46IHBvaW50ZXIgdG8gYSB2YXJpYWJs
ZSB0aGF0IHdpbGwKLQkJCQliZSBhc3NpZ25lZCBUUlVFIGlmIGJ1Zl9wb29sLT5tdXRleAorCQkJ
CWJlIGFzc2lnbmVkIFRSVUUgaWYgYnVmX3Bvb2xfbXV0ZXgKIAkJCQl3YXMgdGVtcG9yYXJpbHkg
cmVsZWFzZWQsIG9yIE5VTEwgKi8KIHsKIAlidWZfcGFnZV90KgliID0gTlVMTDsKCj09PSBtb2Rp
ZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMGxydS5oJwotLS0gYS9zdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMGxydS5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTAwNTIwMTE0MzA2LW96OG1jZTd5OG03eTZwMWcKKysrIGIvc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL2J1ZjBscnUuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUy
MDEzMTYzMi1xdndyemV1bjVqYmh2MjRkCkBAIC05Nyw3ICs5Nyw3IEBAIGJ1Zl9MUlVfaW5zZXJ0
X3ppcF9jbGVhbigKIFRyeSB0byBmcmVlIGEgYmxvY2suICBJZiBicGFnZSBpcyBhIGRlc2NyaXB0
b3Igb2YgYSBjb21wcmVzc2VkLW9ubHkKIHBhZ2UsIHRoZSBkZXNjcmlwdG9yIG9iamVjdCB3aWxs
IGJlIGZyZWVkIGFzIHdlbGwuCiAKLU5PVEU6IElmIHRoaXMgZnVuY3Rpb24gcmV0dXJucyBCVUZf
TFJVX0ZSRUVELCBpdCB3aWxsIG5vdCB0ZW1wb3JhcmlseQorTk9URTogSWYgdGhpcyBmdW5jdGlv
biByZXR1cm5zIEJVRl9MUlVfRlJFRUQsIGl0IHdpbGwgdGVtcG9yYXJpbHkKIHJlbGVhc2UgYnVm
X3Bvb2wtPm11dGV4LiAgRnVydGhlcm1vcmUsIHRoZSBwYWdlIGZyYW1lIHdpbGwgbm8gbG9uZ2Vy
IGJlCiBhY2Nlc3NpYmxlIHZpYSBicGFnZS4KIAoK

--===============0628230594==
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: 607c7ba22f39f2530ad0278ca6d0848352de89d6
# timestamp: 2010-05-20 16:16:54 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   oz8mce7y8m7y6p1g
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWGMIg8AArtfgEAwW2///18n
lgC////wUAWs2eYlRu6g3bQdOhwkkSbVM1PUyPTE9ITQNGIB6gGgAAkoRpNpoyEYpmqAeoD1MgHq
ZGgGgJTUJooeSeRPSNNPU2k0aAaeoABoNAcwCYCZGAEYmJhMJghpiaYCSQmQCYmgAjIaBPTVHoCD
QaempfcD8EY1Ry/ttv7IevbIeGxNPBTpk5nFc735W4JUGtkWyrKn4JoSSV+1cM1PjmnvGzPvNhKB
CTC9/Ub7fKjAi85xfUYO1LcHyp7RWokyosFYslFmR+qaXSoGlYBFluY4kW/GuL+RfeUeKLzj+qba
CQwvYUjAdZQOKbjLh8Zs3FvX2a7NnuUkBs9oJ2bG9I5g5Hq8TDlUayw3iTfdPDof4D9PWYJ0qMc4
lgSwQsShtJU7ugmxdlmlPAhDPIvmdf5LEAZcgDcaV4VcpHyRWREzBW4czDYOd2vMU+ZPSTAjikyB
5lPjnHxzaniVCVIeNNW/Ym8iPTYlqKYW0tR1DmkGpL1aMapMSbrdJmVb0FklPmMVKTyuiwCjDmLM
v6sJQjRampceJefsLiMJARzGFI0StQrqqPkHcBsy1NTSRg8eD0rSCNX2YZvskbS8KjRjPB0B1j1C
pgJgNmU2TYzk+SpLAYqegsJywkYVu21QahPg57IkP3D0OHkRxhKtw83QWiUAeZAce5szKVxPflH5
4bHiW07xLGosd5qSTyym1SSymgx5AatIVK4hq0kwXAbJOKkr8S+JAruDAeOS4G4/vnT6Aml9MaFk
r1Wloim0HRMicyPjn5F0J9OsYcEpjqErzwcMzGZWWGMawxJHTov8n4ZjdUmE4uGGMCKVNxW2d1Iw
N5nRdw269ZpydUdmrJhrahqscK0ygFzYVKJZICmeMwxntK0zZ0YSqoKphQvuc0M4mz8zW3Pi4i9z
741gBQPGYZn7zWzHt7EXnsfkmJCJJ6ZVYznsfgq9l+SaKn4BNQTHTS9YkltMhrh6kCFfRJtpp4kB
tGNmynwOw4HcWgHPs7ADqKDLOTGCaKLAD6WPxWUyvTGBxoQQPuUgFlE71r7itLoFx5Hb6xHkSJ5p
U+sR57geOG/+u623tQ5hq0c5kDGRL0M51Gi4gYpZkpjtKmSiYpXmlfzUdU/zfvh8mcAPTsACOVuO
WJybIPdyc8Us5eVkggDVoLAgWpXlyf6pbVHvr+mo4ygkHV7afx3BA6w1J0uQqV8cSU6iVPI5TSzX
RTESbuJQt1ccxAywi1daYLojZtnsOWU/DwBvfKbURdYUgMkUoJo4+5kVqW9wtZzNhs3EyGPgRSyq
dexwmJVU7rw5W1MZ6I8EGeMgcQ2fk3ynRxMNwa4THz6y9nsXw0gYpQwLjJlvAmKNyszaEv4VRJSO
a70W1/ux02wlZQMg7zWIgciB47QPTWaRMf8dYBqRmSCdeJzqD0TwBtxSAMh8aHpu/qv5C7iVATnl
0rQHDFbu8AzHK39HDuA8GNCnWPFlt648MFAuXlTOWLWW7g1upokw5uttoFbkorNonU6kOHMR0Oe9
RliNIDta0MVJdSzSoZNDCRQBjqfYwUZF2O3pBSC8JeamR4t/YB4Igarl7vgrMNC7+itpNJju4vOP
HgGqdWonTi7fPON9Nd14F2FbdbA5CMsU1aOntqQbSThpJic6A95JgggqJmVlWAW1Skw5jWKcT1rA
zmwiTDNmCzTBzlYoREOIh3XTqiix5Sk/TVUTSOJkJDyH4CQ2ctKwcE7GDGDjM8tKEVBkExFgyFg8
6mF0rW3YJapAMRFVedN6KgKLFVxqEUNZzAobHKuSCKCgyZGqE50ZLzrqjhUoFly9XT/i7kinChIM
MYRB4A==


--===============0628230594==--