From: marko.makela
Date: May 11 2010 4:18pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3082)
List-Archive: http://lists.mysql.com/commits/108007
Message-Id: <201005111618.o4BG3mMl002308@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0564745622=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS41LWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTExNTQ2MTctNGlwZWds
b3BicGRpd3p5MAoKIDMwODIgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xMQogICAgICBNZXJnZSBm
cm9tIG15c3FsLTUuMS1pbm5vZGI6CiAgICAgIAogICAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICAgIHJldm5vOiAz
NDU5CiAgICAgICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTEx
MTA1MzA4LWdycDJ0M3ByaDN0cWl2dzAKICAgICAgICBwYXJlbnQ6IG1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTAwNTExMTA1MDEyLWIydDd3dno2bXU2YmxsNzQKICAgICAgICBwYXJlbnQ6IG1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTA1MTIzOTAxLXhqeHU5M2gxeG5ia2ZrcTAKICAg
ICAgICBjb21taXR0ZXI6IE1hcmtvIE3DpGtlbMOkIDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4K
ICAgICAgICBicmFuY2ggbmljazogbXlzcWwtNS4xLWlubm9kYgogICAgICAgIHRpbWVzdGFtcDog
VHVlIDIwMTAtMDUtMTEgMTM6NTM6MDggKzAzMDAKICAgICAgICBtZXNzYWdlOgogICAgICAgICAg
TWVyZ2UgYSBwYXRjaCBmcm9tIEZhY2Vib29rIHRvIGZpeCBCdWcgIzUzMjkwCiAgICAgIAogICAg
ICAgICAgY29tbWl0IGU3NTliYzY0ZWI1YzVlZWQ0Zjc1Njc3YWQ2NzI0Njc5N2Q0ODY0NjAKICAg
ICAgICAgIEF1dGhvcjogUnlhbiBNYWNrCiAgICAgICAgICBEYXRlOiAgIDMgZGF5cyBhZ28KICAg
ICAgCiAgICAgICAgICAgICAgQnVnZml4IGZvciA1MzI5MCwgZmFzdCB1bmlxdWUgaW5kZXggY3Jl
YXRpb24gZmFpbHMgb24gZHVwbGljYXRlIG51bGwgdmFsdWVzCiAgICAgIAogICAgICAgICAgICAg
IFN1bW1hcnk6CiAgICAgICAgICAgICAgQnVnIGluIHRoZSBmYXN0IGluZGV4IGNyZWF0aW9uIGNv
ZGUgaW5jb3JyZWN0bHkgY29uc2lkZXJzIG51bGwKICAgICAgICAgICAgICB2YWx1ZXMgdG8gYmUg
ZHVwbGljYXRlcyBkdXJpbmcgYmxvY2sgbWVyZ2luZy4gIElubm9kYiBwb2xpY3kgaXMgdGhhdAog
ICAgICAgICAgICAgIG11bHRpcGxlIG51bGwgdmFsdWVzIGFyZSBhbGxvd2VkIGluIGEgdW5pcXVl
IGluZGV4LiAgTnVsbCBkdXBsaWNhdGVzCiAgICAgICAgICAgICAgd2VyZSBjb3JyZWN0bHkgaWdu
b3JlZCB3aGlsZSBzb3J0aW5nIGluZGl2aWR1YWwgYmxvY2tzIGFuZCB3aXRoIHNsb3cKICAgICAg
ICAgICAgICBpbmRleCBjcmVhdGlvbi4KICAgICAgCiAgICAgICAgICAgICAgVGVzdCBQbGFuOgog
ICAgICAgICAgICAgIG10ciwgaW5jbHVkaW5nIG5ldyB0ZXN0LCBsb2FkIGRicyB1c2luZyBkZWZl
cnJlZCBpbmRleCBjcmVhdGlvbgogICAgICAKICAgICAgICAgICAgICBMaWNlbnNlOgogICAgICAg
ICAgICAgIENvcHlyaWdodCAoQykgMjAwOS0yMDEwIEZhY2Vib29rLCBJbmMuICBBbGwgUmlnaHRz
IFJlc2VydmVkLgogICAgICAKICAgICAgICAgICAgICBEdWFsIGxpY2Vuc2VkIHVuZGVyIEJTRCBs
aWNlbnNlIGFuZCBHUEx2Mi4KICAgICAgCiAgICAgICAgICAgICAgUmVkaXN0cmlidXRpb24gYW5k
IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgICAgICAg
ICAgICAgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv
d2luZyBjb25kaXRpb25zIGFyZSBtZXQ6CiAgICAgICAgICAgICAgMS4gUmVkaXN0cmlidXRpb25z
IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlLAog
ICAgICAgICAgICAgICAgIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n
IGRpc2NsYWltZXIuCiAgICAgICAgICAgICAgMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBm
b3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlLAogICAgICAgICAg
ICAgICAgIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt
ZXIgaW4gdGhlIGRvY3VtZW50YXRpb24KICAgICAgICAgICAgICAgICBhbmQvb3Igb3RoZXIgbWF0
ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KICAgICAgCiAgICAgICAgICAg
ICAgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBGQUNFQk9PSywgSU5DLiBgYEFTIElTJycg
QU5EIEFOWSBFWFBSRVNTIE9SCiAgICAgICAgICAgICAgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNM
VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRgogICAg
ICAgICAgICAgIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBV
UlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTwogICAgICAgICAgICAgIEVWRU5UIFNIQUxMIEZB
Q0VCT09LLCBJTkMuIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5U
QUwsCiAgICAgICAgICAgICAgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERB
TUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAogICAgICAgICAgICAgIFBST0NV
UkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRB
LCBPUiBQUk9GSVRTOwogICAgICAgICAgICAgIE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9X
RVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLAogICAgICAgICAgICAg
IFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElO
RyBORUdMSUdFTkNFIE9SCiAgICAgICAgICAgICAgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBX
QVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRgogICAgICAgICAgICAg
IEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICAgICAKICAgICAg
ICAgICAgICBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1
dGUgaXQgYW5kL29yIG1vZGlmeSBpdAogICAgICAgICAgICAgIHVuZGVyIHRoZSB0ZXJtcyBvZiB0
aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlCiAg
ICAgICAgICAgICAgU29mdHdhcmUgRm91bmRhdGlvbjsgdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNl
LgogICAgICAKICAgICAgICAgICAgICBUaGlzIHByb2dyYW0gaXMgZGlzdHJpYnV0ZWQgaW4gdGhl
IGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwgYnV0IFdJVEhPVVQKICAgICAgICAgICAgICBB
TlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZiBNRVJDSEFO
VEFCSUxJVFkgb3IKICAgICAgICAgICAgICBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9T
RS4gIFNlZSB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yCiAgICAgICAgICAgICAg
bW9yZSBkZXRhaWxzLgogICAgICAKICAgICAgICAgICAgICBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2
ZWQgYSBjb3B5IG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhbG9uZyB3aXRoCiAg
ICAgICAgICAgICAgdGhpcyBwcm9ncmFtOyBpZiBub3QsIHdyaXRlIHRvIHRoZSBGcmVlIFNvZnR3
YXJlIEZvdW5kYXRpb24sIEluYy4sIDU5IFRlbXBsZQogICAgICAgICAgICAgIFBsYWNlLCBTdWl0
ZSAzMzAsIEJvc3RvbiwgTUEgIDAyMTExLTEzMDcgIFVTQQogICAgICAgICAgICAtLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAg
ICAgICAgcmV2bm86IDM0NTMuMi4xCiAgICAgICAgICAgIHJldmlzaW9uLWlkOiBtYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDEwMDUwNTEyMzkwMS14anh1OTNoMXhuYmtma3EwCiAgICAgICAgICAg
IHBhcmVudDogbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDUxMjA1NTUtdWtvcTFna2xw
aGVzbHJ4cwogICAgICAgICAgICBjb21taXR0ZXI6IE1hcmtvIE3DpGtlbMOkIDxtYXJrby5tYWtl
bGFAb3JhY2xlLmNvbT4KICAgICAgICAgICAgYnJhbmNoIG5pY2s6IDUuMS1pbm5vZGIKICAgICAg
ICAgICAgdGltZXN0YW1wOiBXZWQgMjAxMC0wNS0wNSAxNTozOTowMSArMDMwMAogICAgICAgICAg
ICBtZXNzYWdlOgogICAgICAgICAgICAgIE1lcmdlIGEgY29udHJpYnV0aW9uIGZyb20gUnlhbiBN
YWNrIGF0IEZhY2Vib29rOgogICAgICAKICAgICAgICAgICAgICBCdWdmaXggZm9yIDUzMjkwLCBm
YXN0IHVuaXF1ZSBpbmRleCBjcmVhdGlvbiBmYWlscyBvbiBkdXBsaWNhdGUgbnVsbCB2YWx1ZXMK
ICAgICAgCiAgICAgICAgICAgICAgICAgIFN1bW1hcnk6CiAgICAgICAgICAgICAgICAgIEJ1ZyBp
biB0aGUgZmFzdCBpbmRleCBjcmVhdGlvbiBjb2RlIGluY29ycmVjdGx5IGNvbnNpZGVycyBudWxs
CiAgICAgICAgICAgICAgICAgIHZhbHVlcyB0byBiZSBkdXBsaWNhdGVzIGR1cmluZyBibG9jayBt
ZXJnaW5nLiAgSW5ub2RiIHBvbGljeSBpcyB0aGF0CiAgICAgICAgICAgICAgICAgIG11bHRpcGxl
IG51bGwgdmFsdWVzIGFyZSBhbGxvd2VkIGluIGEgdW5pcXVlIGluZGV4LiAgTnVsbCBkdXBsaWNh
dGVzCiAgICAgICAgICAgICAgICAgIHdlcmUgY29ycmVjdGx5IGlnbm9yZWQgd2hpbGUgc29ydGlu
ZyBpbmRpdmlkdWFsIGJsb2NrcyBhbmQgd2l0aCBzbG93CiAgICAgICAgICAgICAgICAgIGluZGV4
IGNyZWF0aW9uLgogICAgICAKICAgICAgICAgICAgICAgICAgVGVzdCBQbGFuOgogICAgICAgICAg
ICAgICAgICBtdHIsIGluY2x1ZGluZyBuZXcgdGVzdCwgbG9hZCBkYnMgdXNpbmcgZGVmZXJyZWQg
aW5kZXggY3JlYXRpb24KICAgICAgCiAgICAgICAgICAgICAgICAgIERpZmZDYW1wIFJldmlzaW9u
OiAxMTA4NDAKICAgICAgICAgICAgICAgICAgUmV2aWV3ZWQgQnk6IG1jYWxsYWdoYW4KICAgICAg
ICAgICAgICAgICAgQ0M6IG1jYWxsYWdoYW4sIG15c3FsLWRldmVsQGxpc3RzCiAgICAgICAgICAg
ICAgICAgIFJldmVydCBQbGFuOgogICAgICAgICAgICAgICAgICBPSwoKICAgIGFkZGVkOgogICAg
ICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYl9idWc1MzI5MC5yZXN1bHQKICAgICAg
bXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNTMyOTAudGVzdAogICAgbW9kaWZp
ZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wY21wLmgKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9yZW0vcmVtMGNtcC5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBt
ZXJnZS5jCj09PSBhZGRlZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYl9i
dWc1MzI5MC5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1
ZzUzMjkwLnJlc3VsdAkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBiL215c3FsLXRlc3Qv
c3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZzUzMjkwLnJlc3VsdAkyMDEwLTA1LTExIDE2OjE4OjI4
ICswMDAwCkBAIC0wLDAgKzEsMTcgQEAKK2NyZWF0ZSB0YWJsZSBidWc1MzI5MCAoeCBiaWdpbnQp
IGVuZ2luZT1pbm5vZGI7CitpbnNlcnQgaW50byBidWc1MzI5MCAoKSB2YWx1ZXMgKCksKCksKCks
KCksKCksKCksKCksKCksKCksKCksKCksKCk7CitpbnNlcnQgaW50byBidWc1MzI5MCBzZWxlY3Qg
KiBmcm9tIGJ1ZzUzMjkwOworaW5zZXJ0IGludG8gYnVnNTMyOTAgc2VsZWN0ICogZnJvbSBidWc1
MzI5MDsKK2luc2VydCBpbnRvIGJ1ZzUzMjkwIHNlbGVjdCAqIGZyb20gYnVnNTMyOTA7CitpbnNl
cnQgaW50byBidWc1MzI5MCBzZWxlY3QgKiBmcm9tIGJ1ZzUzMjkwOworaW5zZXJ0IGludG8gYnVn
NTMyOTAgc2VsZWN0ICogZnJvbSBidWc1MzI5MDsKK2luc2VydCBpbnRvIGJ1ZzUzMjkwIHNlbGVj
dCAqIGZyb20gYnVnNTMyOTA7CitpbnNlcnQgaW50byBidWc1MzI5MCBzZWxlY3QgKiBmcm9tIGJ1
ZzUzMjkwOworaW5zZXJ0IGludG8gYnVnNTMyOTAgc2VsZWN0ICogZnJvbSBidWc1MzI5MDsKK2lu
c2VydCBpbnRvIGJ1ZzUzMjkwIHNlbGVjdCAqIGZyb20gYnVnNTMyOTA7CitpbnNlcnQgaW50byBi
dWc1MzI5MCBzZWxlY3QgKiBmcm9tIGJ1ZzUzMjkwOworaW5zZXJ0IGludG8gYnVnNTMyOTAgc2Vs
ZWN0ICogZnJvbSBidWc1MzI5MDsKK2luc2VydCBpbnRvIGJ1ZzUzMjkwIHNlbGVjdCAqIGZyb20g
YnVnNTMyOTA7CitpbnNlcnQgaW50byBidWc1MzI5MCBzZWxlY3QgKiBmcm9tIGJ1ZzUzMjkwOwor
YWx0ZXIgdGFibGUgYnVnNTMyOTAgYWRkIHVuaXF1ZSBpbmRleCBgaWR4YCAoeCk7Citkcm9wIHRh
YmxlIGJ1ZzUzMjkwOwoKPT09IGFkZGVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3Qv
aW5ub2RiX2J1ZzUzMjkwLnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5u
b2RiX2J1ZzUzMjkwLnRlc3QJMTk3MC0wMS0wMSAwMDowMDowMCArMDAwMAorKysgYi9teXNxbC10
ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc1MzI5MC50ZXN0CTIwMTAtMDUtMTEgMTY6MTg6
MjggKzAwMDAKQEAgLTAsMCArMSwyMiBAQAorLS0gc291cmNlIGluY2x1ZGUvaGF2ZV9pbm5vZGIu
aW5jCisKK2NyZWF0ZSB0YWJsZSBidWc1MzI5MCAoeCBiaWdpbnQpIGVuZ2luZT1pbm5vZGI7CisK
K2luc2VydCBpbnRvIGJ1ZzUzMjkwICgpIHZhbHVlcyAoKSwoKSwoKSwoKSwoKSwoKSwoKSwoKSwo
KSwoKSwoKSwoKTsKK2luc2VydCBpbnRvIGJ1ZzUzMjkwIHNlbGVjdCAqIGZyb20gYnVnNTMyOTA7
CitpbnNlcnQgaW50byBidWc1MzI5MCBzZWxlY3QgKiBmcm9tIGJ1ZzUzMjkwOworaW5zZXJ0IGlu
dG8gYnVnNTMyOTAgc2VsZWN0ICogZnJvbSBidWc1MzI5MDsKK2luc2VydCBpbnRvIGJ1ZzUzMjkw
IHNlbGVjdCAqIGZyb20gYnVnNTMyOTA7CitpbnNlcnQgaW50byBidWc1MzI5MCBzZWxlY3QgKiBm
cm9tIGJ1ZzUzMjkwOworaW5zZXJ0IGludG8gYnVnNTMyOTAgc2VsZWN0ICogZnJvbSBidWc1MzI5
MDsKK2luc2VydCBpbnRvIGJ1ZzUzMjkwIHNlbGVjdCAqIGZyb20gYnVnNTMyOTA7CitpbnNlcnQg
aW50byBidWc1MzI5MCBzZWxlY3QgKiBmcm9tIGJ1ZzUzMjkwOworaW5zZXJ0IGludG8gYnVnNTMy
OTAgc2VsZWN0ICogZnJvbSBidWc1MzI5MDsKK2luc2VydCBpbnRvIGJ1ZzUzMjkwIHNlbGVjdCAq
IGZyb20gYnVnNTMyOTA7CitpbnNlcnQgaW50byBidWc1MzI5MCBzZWxlY3QgKiBmcm9tIGJ1ZzUz
MjkwOworaW5zZXJ0IGludG8gYnVnNTMyOTAgc2VsZWN0ICogZnJvbSBidWc1MzI5MDsKK2luc2Vy
dCBpbnRvIGJ1ZzUzMjkwIHNlbGVjdCAqIGZyb20gYnVnNTMyOTA7CisKK2FsdGVyIHRhYmxlIGJ1
ZzUzMjkwIGFkZCB1bmlxdWUgaW5kZXggYGlkeGAgKHgpOworCitkcm9wIHRhYmxlIGJ1ZzUzMjkw
OwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wY21wLmgn
Ci0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wY21wLmgJMjAwOS0wOS0yOCAxNzoz
NDoyMyArMDAwMAorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcmVtMGNtcC5oCTIwMTAt
MDUtMTEgMTY6MTg6MjggKzAwMDAKQEAgLTE0OCw3ICsxNDgsOSBAQCBjbXBfcmVjX3JlY19zaW1w
bGUoCiAJY29uc3QgcmVjX3QqCQlyZWMyLAkvKiE8IGluOiBwaHlzaWNhbCByZWNvcmQgKi8KIAlj
b25zdCB1bGludCoJCW9mZnNldHMxLC8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMxLCAuLi4p
ICovCiAJY29uc3QgdWxpbnQqCQlvZmZzZXRzMiwvKiE8IGluOiByZWNfZ2V0X29mZnNldHMocmVj
MiwgLi4uKSAqLwotCWNvbnN0IGRpY3RfaW5kZXhfdCoJaW5kZXgpOwkvKiE8IGluOiBkYXRhIGRp
Y3Rpb25hcnkgaW5kZXggKi8KKwljb25zdCBkaWN0X2luZGV4X3QqCWluZGV4LAkvKiE8IGluOiBk
YXRhIGRpY3Rpb25hcnkgaW5kZXggKi8KKwlpYm9vbCoJCQludWxsX2VxKTsvKiE8IG91dDogc2V0
IHRvIFRSVUUgaWYKKwkJCQkJZm91bmQgbWF0Y2hpbmcgbnVsbCB2YWx1ZXMgKi8KIC8qKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8q
KgogVGhpcyBmdW5jdGlvbiBpcyB1c2VkIHRvIGNvbXBhcmUgdHdvIHBoeXNpY2FsIHJlY29yZHMu
IE9ubHkgdGhlIGNvbW1vbgogZmlyc3QgZmllbGRzIGFyZSBjb21wYXJlZCwgYW5kIGlmIGFuIGV4
dGVybmFsbHkgc3RvcmVkIGZpZWxkIGlzCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
YmFzZS9yZW0vcmVtMGNtcC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3JlbS9yZW0wY21wLmMJ
MjAwOS0wOS0yOCAxNzozNDoyMyArMDAwMAorKysgYi9zdG9yYWdlL2lubm9iYXNlL3JlbS9yZW0w
Y21wLmMJMjAxMC0wNS0xMSAxNjoxODoyOCArMDAwMApAQCAtNzA2LDcgKzcwNiw5IEBAIGNtcF9y
ZWNfcmVjX3NpbXBsZSgKIAljb25zdCByZWNfdCoJCXJlYzIsCS8qITwgaW46IHBoeXNpY2FsIHJl
Y29yZCAqLwogCWNvbnN0IHVsaW50KgkJb2Zmc2V0czEsLyohPCBpbjogcmVjX2dldF9vZmZzZXRz
KHJlYzEsIC4uLikgKi8KIAljb25zdCB1bGludCoJCW9mZnNldHMyLC8qITwgaW46IHJlY19nZXRf
b2Zmc2V0cyhyZWMyLCAuLi4pICovCi0JY29uc3QgZGljdF9pbmRleF90KglpbmRleCkJLyohPCBp
bjogZGF0YSBkaWN0aW9uYXJ5IGluZGV4ICovCisJY29uc3QgZGljdF9pbmRleF90KglpbmRleCwJ
LyohPCBpbjogZGF0YSBkaWN0aW9uYXJ5IGluZGV4ICovCisJaWJvb2wqCQkJbnVsbF9lcSkvKiE8
IG91dDogc2V0IHRvIFRSVUUgaWYKKwkJCQkJZm91bmQgbWF0Y2hpbmcgbnVsbCB2YWx1ZXMgKi8K
IHsKIAl1bGludAkJcmVjMV9mX2xlbjsJLyohPCBsZW5ndGggb2YgY3VycmVudCBmaWVsZCBpbiBy
ZWMxICovCiAJY29uc3QgYnl0ZSoJcmVjMV9iX3B0cjsJLyohPCBwb2ludGVyIHRvIHRoZSBjdXJy
ZW50IGJ5dGUKQEAgLTc1Myw2ICs3NTUsOSBAQCBjbXBfcmVjX3JlY19zaW1wbGUoCiAJCSAgICB8
fCByZWMyX2ZfbGVuID09IFVOSVZfU1FMX05VTEwpIHsKIAogCQkJaWYgKHJlYzFfZl9sZW4gPT0g
cmVjMl9mX2xlbikgeworCQkJCWlmIChudWxsX2VxKSB7CisJCQkJCSpudWxsX2VxID0gVFJVRTsK
KwkJCQl9CiAKIAkJCQlnb3RvIG5leHRfZmllbGQ7CiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9iYXNlL3Jvdy9yb3cwbWVyZ2UuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cv
cm93MG1lcmdlLmMJMjAxMC0wNS0xMCAxMjozNDoxNCArMDAwMAorKysgYi9zdG9yYWdlL2lubm9i
YXNlL3Jvdy9yb3cwbWVyZ2UuYwkyMDEwLTA1LTExIDE2OjE4OjI4ICswMDAwCkBAIC0xMDkxLDEx
ICsxMDkxLDE0IEBAIHJvd19tZXJnZV9jbXAoCiAJCQkJCQlyZWNvcmQgdG8gYmUgY29tcGFyZWQg
Ki8KIAljb25zdCB1bGludCoJCW9mZnNldHMxLAkvKiE8IGluOiBmaXJzdCByZWNvcmQgb2Zmc2V0
cyAqLwogCWNvbnN0IHVsaW50KgkJb2Zmc2V0czIsCS8qITwgaW46IHNlY29uZCByZWNvcmQgb2Zm
c2V0cyAqLwotCWNvbnN0IGRpY3RfaW5kZXhfdCoJaW5kZXgpCQkvKiE8IGluOiBpbmRleCAqLwor
CWNvbnN0IGRpY3RfaW5kZXhfdCoJaW5kZXgsCQkvKiE8IGluOiBpbmRleCAqLworCWlib29sKgkJ
CW51bGxfZXEpCS8qITwgb3V0OiBzZXQgdG8gVFJVRSBpZgorCQkJCQkJZm91bmQgbWF0Y2hpbmcg
bnVsbCB2YWx1ZXMgKi8KIHsKIAlpbnQJY21wOwogCi0JY21wID0gY21wX3JlY19yZWNfc2ltcGxl
KG1yZWMxLCBtcmVjMiwgb2Zmc2V0czEsIG9mZnNldHMyLCBpbmRleCk7CisJY21wID0gY21wX3Jl
Y19yZWNfc2ltcGxlKG1yZWMxLCBtcmVjMiwgb2Zmc2V0czEsIG9mZnNldHMyLCBpbmRleCwKKwkJ
CQkgbnVsbF9lcSk7CiAKICNpZmRlZiBVTklWX0RFQlVHCiAJaWYgKHJvd19tZXJnZV9wcmludF9j
bXApIHsKQEAgLTE0NjEsMTEgKzE0NjQsMTMgQEAgY29ycnVwdDoKIAl9CiAKIAl3aGlsZSAobXJl
YzAgJiYgbXJlYzEpIHsKKwkJaWJvb2wJbnVsbF9lcSA9IEZBTFNFOwogCQlzd2l0Y2ggKHJvd19t
ZXJnZV9jbXAobXJlYzAsIG1yZWMxLAotCQkJCSAgICAgIG9mZnNldHMwLCBvZmZzZXRzMSwgaW5k
ZXgpKSB7CisJCQkJICAgICAgb2Zmc2V0czAsIG9mZnNldHMxLCBpbmRleCwKKwkJCQkgICAgICAm
bnVsbF9lcSkpIHsKIAkJY2FzZSAwOgogCQkJaWYgKFVOSVZfVU5MSUtFTFkKLQkJCSAgICAoZGlj
dF9pbmRleF9pc191bmlxdWUoaW5kZXgpKSkgeworCQkJICAgIChkaWN0X2luZGV4X2lzX3VuaXF1
ZShpbmRleCkgJiYgIW51bGxfZXEpKSB7CiAJCQkJaW5ub2Jhc2VfcmVjX3RvX215c3FsKHRhYmxl
LCBtcmVjMCwKIAkJCQkJCSAgICAgIGluZGV4LCBvZmZzZXRzMCk7CiAJCQkJbWVtX2hlYXBfZnJl
ZShoZWFwKTsKCg==

--===============0564745622==
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: b4b7c2c9059557e85ae91cc4cd109ff66cf6a777
# timestamp: 2010-05-11 19:18:38 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   4ipeglopbpdiwzy0
# 
# Begin bundle
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
nChIYuO/lwA=


--===============0564745622==--