From: marko.makela
Date: May 11 2010 10:53am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3459) Bug#53290
List-Archive: http://lists.mysql.com/commits/107945
X-Bug: 53290
Message-Id: <201005111053.o4BAnMXh006211@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0899190891=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwtNS4xLWlubm9kYjIvIGJh
c2VkIG9uIHJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTExMTA1MDEyLWIydDd3
dno2bXU2YmxsNzQKCiAzNDU5IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMTEgW21lcmdlXQogICAg
ICBNZXJnZSBhIHBhdGNoIGZyb20gRmFjZWJvb2sgdG8gZml4IEJ1ZyAjNTMyOTAKICAgICAgCiAg
ICAgIGNvbW1pdCBlNzU5YmM2NGViNWM1ZWVkNGY3NTY3N2FkNjcyNDY3OTdkNDg2NDYwCiAgICAg
IEF1dGhvcjogUnlhbiBNYWNrCiAgICAgIERhdGU6ICAgMyBkYXlzIGFnbwogICAgICAKICAgICAg
ICAgIEJ1Z2ZpeCBmb3IgNTMyOTAsIGZhc3QgdW5pcXVlIGluZGV4IGNyZWF0aW9uIGZhaWxzIG9u
IGR1cGxpY2F0ZSBudWxsIHZhbHVlcwogICAgICAKICAgICAgICAgIFN1bW1hcnk6CiAgICAgICAg
ICBCdWcgaW4gdGhlIGZhc3QgaW5kZXggY3JlYXRpb24gY29kZSBpbmNvcnJlY3RseSBjb25zaWRl
cnMgbnVsbAogICAgICAgICAgdmFsdWVzIHRvIGJlIGR1cGxpY2F0ZXMgZHVyaW5nIGJsb2NrIG1l
cmdpbmcuICBJbm5vZGIgcG9saWN5IGlzIHRoYXQKICAgICAgICAgIG11bHRpcGxlIG51bGwgdmFs
dWVzIGFyZSBhbGxvd2VkIGluIGEgdW5pcXVlIGluZGV4LiAgTnVsbCBkdXBsaWNhdGVzCiAgICAg
ICAgICB3ZXJlIGNvcnJlY3RseSBpZ25vcmVkIHdoaWxlIHNvcnRpbmcgaW5kaXZpZHVhbCBibG9j
a3MgYW5kIHdpdGggc2xvdwogICAgICAgICAgaW5kZXggY3JlYXRpb24uCiAgICAgIAogICAgICAg
ICAgVGVzdCBQbGFuOgogICAgICAgICAgbXRyLCBpbmNsdWRpbmcgbmV3IHRlc3QsIGxvYWQgZGJz
IHVzaW5nIGRlZmVycmVkIGluZGV4IGNyZWF0aW9uCiAgICAgIAogICAgICAgICAgTGljZW5zZToK
ICAgICAgICAgIENvcHlyaWdodCAoQykgMjAwOS0yMDEwIEZhY2Vib29rLCBJbmMuICBBbGwgUmln
aHRzIFJlc2VydmVkLgogICAgICAKICAgICAgICAgIER1YWwgbGljZW5zZWQgdW5kZXIgQlNEIGxp
Y2Vuc2UgYW5kIEdQTHYyLgogICAgICAKICAgICAgICAgIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug
aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICAgICAgICAgbW9k
aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k
aXRpb25zIGFyZSBtZXQ6CiAgICAgICAgICAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNv
ZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodCBub3RpY2UsCiAgICAgICAgICAgICB0
aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgogICAg
ICAgICAgMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRo
ZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlLAogICAgICAgICAgICAgdGhpcyBsaXN0IG9mIGNvbmRp
dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUgZG9jdW1lbnRhdGlvbgog
ICAgICAgICAgICAgYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0
cmlidXRpb24uCiAgICAgIAogICAgICAgICAgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBG
QUNFQk9PSywgSU5DLiBgYEFTIElTJycgQU5EIEFOWSBFWFBSRVNTIE9SCiAgICAgICAgICBJTVBM
SUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElF
RCBXQVJSQU5USUVTIE9GCiAgICAgICAgICBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9S
IEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8KICAgICAgICAgIEVW
RU5UIFNIQUxMIEZBQ0VCT09LLCBJTkMuIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJF
Q1QsIElOQ0lERU5UQUwsCiAgICAgICAgICBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVF
TlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCiAgICAgICAgICBQ
Uk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwg
REFUQSwgT1IgUFJPRklUUzsKICAgICAgICAgIE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9X
RVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLAogICAgICAgICAgV0hF
VEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5F
R0xJR0VOQ0UgT1IKICAgICAgICAgIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBP
RiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYKICAgICAgICAgIEFEVklTRUQgT0Yg
VEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICAgICAKICAgICAgICAgIFRoaXMgcHJv
Z3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9k
aWZ5IGl0CiAgICAgICAgICB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1Ymxp
YyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZQogICAgICAgICAgU29mdHdhcmUgRm91
bmRhdGlvbjsgdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNlLgogICAgICAKICAgICAgICAgIFRoaXMg
cHJvZ3JhbSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVs
LCBidXQgV0lUSE9VVAogICAgICAgICAgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGlt
cGxpZWQgd2FycmFudHkgb2YgTUVSQ0hBTlRBQklMSVRZIG9yCiAgICAgICAgICBGSVRORVNTIEZP
UiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vu
c2UgZm9yCiAgICAgICAgICBtb3JlIGRldGFpbHMuCiAgICAgIAogICAgICAgICAgWW91IHNob3Vs
ZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2Ug
YWxvbmcgd2l0aAogICAgICAgICAgdGhpcyBwcm9ncmFtOyBpZiBub3QsIHdyaXRlIHRvIHRoZSBG
cmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDU5IFRlbXBsZQogICAgICAgICAgUGxhY2Us
IFN1aXRlIDMzMCwgQm9zdG9uLCBNQSAgMDIxMTEtMTMwNyAgVVNBCgogICAgYWRkZWQ6CiAgICAg
IG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi9yL2lubm9kYl9idWc1MzI5MC5yZXN1bHQK
ICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzUzMjkwLnRl
c3QKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9yZW0w
Y21wLmgKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3JlbS9yZW0wY21wLmMKICAgICAgc3Rv
cmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwbWVyZ2UuYwo9PT0gYWRkZWQgZmlsZSAnbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiX2J1ZzUzMjkwLnJlc3VsdCcKLS0tIGEv
bXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiX2J1ZzUzMjkwLnJlc3VsdAkx
OTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3Bs
dWdpbi9yL2lubm9kYl9idWc1MzI5MC5yZXN1bHQJMjAxMC0wNS0wNSAxMjozOTowMSArMDAwMApA
QCAtMCwwICsxLDE3IEBACitjcmVhdGUgdGFibGUgYnVnNTMyOTAgKHggYmlnaW50KSBlbmdpbmU9
aW5ub2RiOworaW5zZXJ0IGludG8gYnVnNTMyOTAgKCkgdmFsdWVzICgpLCgpLCgpLCgpLCgpLCgp
LCgpLCgpLCgpLCgpLCgpLCgpOworaW5zZXJ0IGludG8gYnVnNTMyOTAgc2VsZWN0ICogZnJvbSBi
dWc1MzI5MDsKK2luc2VydCBpbnRvIGJ1ZzUzMjkwIHNlbGVjdCAqIGZyb20gYnVnNTMyOTA7Citp
bnNlcnQgaW50byBidWc1MzI5MCBzZWxlY3QgKiBmcm9tIGJ1ZzUzMjkwOworaW5zZXJ0IGludG8g
YnVnNTMyOTAgc2VsZWN0ICogZnJvbSBidWc1MzI5MDsKK2luc2VydCBpbnRvIGJ1ZzUzMjkwIHNl
bGVjdCAqIGZyb20gYnVnNTMyOTA7CitpbnNlcnQgaW50byBidWc1MzI5MCBzZWxlY3QgKiBmcm9t
IGJ1ZzUzMjkwOworaW5zZXJ0IGludG8gYnVnNTMyOTAgc2VsZWN0ICogZnJvbSBidWc1MzI5MDsK
K2luc2VydCBpbnRvIGJ1ZzUzMjkwIHNlbGVjdCAqIGZyb20gYnVnNTMyOTA7CitpbnNlcnQgaW50
byBidWc1MzI5MCBzZWxlY3QgKiBmcm9tIGJ1ZzUzMjkwOworaW5zZXJ0IGludG8gYnVnNTMyOTAg
c2VsZWN0ICogZnJvbSBidWc1MzI5MDsKK2luc2VydCBpbnRvIGJ1ZzUzMjkwIHNlbGVjdCAqIGZy
b20gYnVnNTMyOTA7CitpbnNlcnQgaW50byBidWc1MzI5MCBzZWxlY3QgKiBmcm9tIGJ1ZzUzMjkw
OworaW5zZXJ0IGludG8gYnVnNTMyOTAgc2VsZWN0ICogZnJvbSBidWc1MzI5MDsKK2FsdGVyIHRh
YmxlIGJ1ZzUzMjkwIGFkZCB1bmlxdWUgaW5kZXggYGlkeGAgKHgpOworZHJvcCB0YWJsZSBidWc1
MzI5MDsKCj09PSBhZGRlZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9p
bm5vZGJfYnVnNTMyOTAudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2lu
L3QvaW5ub2RiX2J1ZzUzMjkwLnRlc3QJMTk3MC0wMS0wMSAwMDowMDowMCArMDAwMAorKysgYi9t
eXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVnNTMyOTAudGVzdAkyMDEw
LTA1LTA1IDEyOjM5OjAxICswMDAwCkBAIC0wLDAgKzEsMjIgQEAKKy0tIHNvdXJjZSBpbmNsdWRl
L2hhdmVfaW5ub2RiX3BsdWdpbi5pbmMKKworY3JlYXRlIHRhYmxlIGJ1ZzUzMjkwICh4IGJpZ2lu
dCkgZW5naW5lPWlubm9kYjsKKworaW5zZXJ0IGludG8gYnVnNTMyOTAgKCkgdmFsdWVzICgpLCgp
LCgpLCgpLCgpLCgpLCgpLCgpLCgpLCgpLCgpLCgpOworaW5zZXJ0IGludG8gYnVnNTMyOTAgc2Vs
ZWN0ICogZnJvbSBidWc1MzI5MDsKK2luc2VydCBpbnRvIGJ1ZzUzMjkwIHNlbGVjdCAqIGZyb20g
YnVnNTMyOTA7CitpbnNlcnQgaW50byBidWc1MzI5MCBzZWxlY3QgKiBmcm9tIGJ1ZzUzMjkwOwor
aW5zZXJ0IGludG8gYnVnNTMyOTAgc2VsZWN0ICogZnJvbSBidWc1MzI5MDsKK2luc2VydCBpbnRv
IGJ1ZzUzMjkwIHNlbGVjdCAqIGZyb20gYnVnNTMyOTA7CitpbnNlcnQgaW50byBidWc1MzI5MCBz
ZWxlY3QgKiBmcm9tIGJ1ZzUzMjkwOworaW5zZXJ0IGludG8gYnVnNTMyOTAgc2VsZWN0ICogZnJv
bSBidWc1MzI5MDsKK2luc2VydCBpbnRvIGJ1ZzUzMjkwIHNlbGVjdCAqIGZyb20gYnVnNTMyOTA7
CitpbnNlcnQgaW50byBidWc1MzI5MCBzZWxlY3QgKiBmcm9tIGJ1ZzUzMjkwOworaW5zZXJ0IGlu
dG8gYnVnNTMyOTAgc2VsZWN0ICogZnJvbSBidWc1MzI5MDsKK2luc2VydCBpbnRvIGJ1ZzUzMjkw
IHNlbGVjdCAqIGZyb20gYnVnNTMyOTA7CitpbnNlcnQgaW50byBidWc1MzI5MCBzZWxlY3QgKiBm
cm9tIGJ1ZzUzMjkwOworaW5zZXJ0IGludG8gYnVnNTMyOTAgc2VsZWN0ICogZnJvbSBidWc1MzI5
MDsKKworYWx0ZXIgdGFibGUgYnVnNTMyOTAgYWRkIHVuaXF1ZSBpbmRleCBgaWR4YCAoeCk7CisK
K2Ryb3AgdGFibGUgYnVnNTMyOTA7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJf
cGx1Z2luL2luY2x1ZGUvcmVtMGNtcC5oJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5j
bHVkZS9yZW0wY21wLmgJMjAwOS0wOC0wNiAyMjowNDowMyArMDAwMAorKysgYi9zdG9yYWdlL2lu
bm9kYl9wbHVnaW4vaW5jbHVkZS9yZW0wY21wLmgJMjAxMC0wNS0wNSAxMjozOTowMSArMDAwMApA
QCAtMTQ4LDcgKzE0OCw5IEBAIGNtcF9yZWNfcmVjX3NpbXBsZSgKIAljb25zdCByZWNfdCoJCXJl
YzIsCS8qITwgaW46IHBoeXNpY2FsIHJlY29yZCAqLwogCWNvbnN0IHVsaW50KgkJb2Zmc2V0czEs
LyohPCBpbjogcmVjX2dldF9vZmZzZXRzKHJlYzEsIC4uLikgKi8KIAljb25zdCB1bGludCoJCW9m
ZnNldHMyLC8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMyLCAuLi4pICovCi0JY29uc3QgZGlj
dF9pbmRleF90KglpbmRleCk7CS8qITwgaW46IGRhdGEgZGljdGlvbmFyeSBpbmRleCAqLworCWNv
bnN0IGRpY3RfaW5kZXhfdCoJaW5kZXgsCS8qITwgaW46IGRhdGEgZGljdGlvbmFyeSBpbmRleCAq
LworCWlib29sKgkJCW51bGxfZXEpOy8qITwgb3V0OiBzZXQgdG8gVFJVRSBpZgorCQkJCQlmb3Vu
ZCBtYXRjaGluZyBudWxsIHZhbHVlcyAqLwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBUaGlzIGZ1bmN0aW9uIGlzIHVz
ZWQgdG8gY29tcGFyZSB0d28gcGh5c2ljYWwgcmVjb3Jkcy4gT25seSB0aGUgY29tbW9uCiBmaXJz
dCBmaWVsZHMgYXJlIGNvbXBhcmVkLCBhbmQgaWYgYW4gZXh0ZXJuYWxseSBzdG9yZWQgZmllbGQg
aXMKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vcmVtL3JlbTBjbXAu
YycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3JlbS9yZW0wY21wLmMJMjAwOS0wOC0wNiAy
MjowNDowMyArMDAwMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcmVtL3JlbTBjbXAuYwky
MDEwLTA1LTA1IDEyOjM5OjAxICswMDAwCkBAIC03MDYsNyArNzA2LDkgQEAgY21wX3JlY19yZWNf
c2ltcGxlKAogCWNvbnN0IHJlY190KgkJcmVjMiwJLyohPCBpbjogcGh5c2ljYWwgcmVjb3JkICov
CiAJY29uc3QgdWxpbnQqCQlvZmZzZXRzMSwvKiE8IGluOiByZWNfZ2V0X29mZnNldHMocmVjMSwg
Li4uKSAqLwogCWNvbnN0IHVsaW50KgkJb2Zmc2V0czIsLyohPCBpbjogcmVjX2dldF9vZmZzZXRz
KHJlYzIsIC4uLikgKi8KLQljb25zdCBkaWN0X2luZGV4X3QqCWluZGV4KQkvKiE8IGluOiBkYXRh
IGRpY3Rpb25hcnkgaW5kZXggKi8KKwljb25zdCBkaWN0X2luZGV4X3QqCWluZGV4LAkvKiE8IGlu
OiBkYXRhIGRpY3Rpb25hcnkgaW5kZXggKi8KKwlpYm9vbCoJCQludWxsX2VxKS8qITwgb3V0OiBz
ZXQgdG8gVFJVRSBpZgorCQkJCQlmb3VuZCBtYXRjaGluZyBudWxsIHZhbHVlcyAqLwogewogCXVs
aW50CQlyZWMxX2ZfbGVuOwkvKiE8IGxlbmd0aCBvZiBjdXJyZW50IGZpZWxkIGluIHJlYzEgKi8K
IAljb25zdCBieXRlKglyZWMxX2JfcHRyOwkvKiE8IHBvaW50ZXIgdG8gdGhlIGN1cnJlbnQgYnl0
ZQpAQCAtNzUzLDYgKzc1NSw5IEBAIGNtcF9yZWNfcmVjX3NpbXBsZSgKIAkJICAgIHx8IHJlYzJf
Zl9sZW4gPT0gVU5JVl9TUUxfTlVMTCkgewogCiAJCQlpZiAocmVjMV9mX2xlbiA9PSByZWMyX2Zf
bGVuKSB7CisJCQkJaWYgKG51bGxfZXEpIHsKKwkJCQkJKm51bGxfZXEgPSBUUlVFOworCQkJCX0K
IAogCQkJCWdvdG8gbmV4dF9maWVsZDsKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9yb3cvcm93MG1lcmdlLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9y
b3cvcm93MG1lcmdlLmMJMjAxMC0wNS0wNSAxMToyNDoxMSArMDAwMAorKysgYi9zdG9yYWdlL2lu
bm9kYl9wbHVnaW4vcm93L3JvdzBtZXJnZS5jCTIwMTAtMDUtMDUgMTI6Mzk6MDEgKzAwMDAKQEAg
LTEwNzUsMTEgKzEwNzUsMTQgQEAgcm93X21lcmdlX2NtcCgKIAkJCQkJCXJlY29yZCB0byBiZSBj
b21wYXJlZCAqLwogCWNvbnN0IHVsaW50KgkJb2Zmc2V0czEsCS8qITwgaW46IGZpcnN0IHJlY29y
ZCBvZmZzZXRzICovCiAJY29uc3QgdWxpbnQqCQlvZmZzZXRzMiwJLyohPCBpbjogc2Vjb25kIHJl
Y29yZCBvZmZzZXRzICovCi0JY29uc3QgZGljdF9pbmRleF90KglpbmRleCkJCS8qITwgaW46IGlu
ZGV4ICovCisJY29uc3QgZGljdF9pbmRleF90KglpbmRleCwJCS8qITwgaW46IGluZGV4ICovCisJ
aWJvb2wqCQkJbnVsbF9lcSkJLyohPCBvdXQ6IHNldCB0byBUUlVFIGlmCisJCQkJCQlmb3VuZCBt
YXRjaGluZyBudWxsIHZhbHVlcyAqLwogewogCWludAljbXA7CiAKLQljbXAgPSBjbXBfcmVjX3Jl
Y19zaW1wbGUobXJlYzEsIG1yZWMyLCBvZmZzZXRzMSwgb2Zmc2V0czIsIGluZGV4KTsKKwljbXAg
PSBjbXBfcmVjX3JlY19zaW1wbGUobXJlYzEsIG1yZWMyLCBvZmZzZXRzMSwgb2Zmc2V0czIsIGlu
ZGV4LAorCQkJCSBudWxsX2VxKTsKIAogI2lmZGVmIFVOSVZfREVCVUcKIAlpZiAocm93X21lcmdl
X3ByaW50X2NtcCkgewpAQCAtMTQ0NSwxMSArMTQ0OCwxMyBAQCBjb3JydXB0OgogCX0KIAogCXdo
aWxlIChtcmVjMCAmJiBtcmVjMSkgeworCQlpYm9vbAludWxsX2VxID0gRkFMU0U7CiAJCXN3aXRj
aCAocm93X21lcmdlX2NtcChtcmVjMCwgbXJlYzEsCi0JCQkJICAgICAgb2Zmc2V0czAsIG9mZnNl
dHMxLCBpbmRleCkpIHsKKwkJCQkgICAgICBvZmZzZXRzMCwgb2Zmc2V0czEsIGluZGV4LAorCQkJ
CSAgICAgICZudWxsX2VxKSkgewogCQljYXNlIDA6CiAJCQlpZiAoVU5JVl9VTkxJS0VMWQotCQkJ
ICAgIChkaWN0X2luZGV4X2lzX3VuaXF1ZShpbmRleCkpKSB7CisJCQkgICAgKGRpY3RfaW5kZXhf
aXNfdW5pcXVlKGluZGV4KSAmJiAhbnVsbF9lcSkpIHsKIAkJCQlpbm5vYmFzZV9yZWNfdG9fbXlz
cWwodGFibGUsIG1yZWMwLAogCQkJCQkJICAgICAgaW5kZXgsIG9mZnNldHMwKTsKIAkJCQltZW1f
aGVhcF9mcmVlKGhlYXApOwoK

--===============0899190891==
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.1-innodb2/
# testament_sha1: 8c6ed5cead92bd28ade31e3b1a979c64ffa50ef1
# timestamp: 2010-05-11 13:53:19 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   b2t7wvz6mu6bll74
# 
# Begin bundle
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
oiZVDGLQQOU1GyYidV/+LuSKcKEhzWOr7A==


--===============0899190891==--