From: marko.makela
Date: April 26 2010 11:09am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3418 to 3419) Bug#52745
List-Archive: http://lists.mysql.com/commits/106507
X-Bug: 52745
Message-Id: <201004261109.o3QAVYHc009686@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1165685767=="

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

IDM0MTkgTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yNgogICAgICBBZGQgYSB0ZXN0IGNhc2UgZm9y
IEJ1ZyAjNTI3NDUuCgogICAgYWRkZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3Bs
dWdpbi9yL2lubm9kYl9idWc1Mjc0NS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5v
ZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzUyNzQ1LnRlc3QKIDM0MTggTWFya28gTcOka2Vsw6QJMjAx
MC0wNC0yNiBbbWVyZ2VdCiAgICAgIE1lcmdlIFZhc2lsIERpbW92IDIwMTAtMDQtMjYgQnVtcCBJ
bm5vREIgUGx1Z2luIHZlcnNpb24gbnVtYmVyIGFmdGVyIDEuMC43CgogICAgbW9kaWZpZWQ6CiAg
ICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3VuaXYuaQo9PT0gYWRkZWQgZmlsZSAn
bXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiX2J1ZzUyNzQ1LnJlc3VsdCcK
LS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiX2J1ZzUyNzQ1LnJl
c3VsdAkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiX3BsdWdpbi9yL2lubm9kYl9idWc1Mjc0NS5yZXN1bHQJMjAxMC0wNC0yNiAxMTowODo1NiAr
MDAwMApAQCAtMCwwICsxLDEzMCBAQAorU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9mb3JtYXQ9J0Jh
cnJhY3VkYSc7CitTRVQgR0xPQkFMIGlubm9kYl9maWxlX3Blcl90YWJsZT1vbjsKK0NSRUFURSBU
QUJMRSBidWc1Mjc0NSAoCithMiBpbnQoMTApIHVuc2lnbmVkIERFRkFVTFQgTlVMTCwKK2NvbDM3
IHRpbWUgREVGQVVMVCBOVUxMLAorY29sMzggY2hhcigyMjkpIENIQVJBQ1RFUiBTRVQgdXRmOCBE
RUZBVUxUIE5VTEwsCitjb2wzOSB0ZXh0LAorY29sNDAgdGltZXN0YW1wIE5PVCBOVUxMIERFRkFV
TFQgQ1VSUkVOVF9USU1FU1RBTVAgT04gVVBEQVRFIENVUlJFTlRfVElNRVNUQU1QLAorY29sNDEg
aW50KDEwKSB1bnNpZ25lZCBERUZBVUxUIE5VTEwsCitjb2w0MiB2YXJjaGFyKDI0OCkgQ0hBUkFD
VEVSIFNFVCB1dGY4IERFRkFVTFQgTlVMTCwKK2NvbDQzIHNtYWxsaW50KDUpIHVuc2lnbmVkIHpl
cm9maWxsIERFRkFVTFQgTlVMTCwKK2NvbDQ0IHZhcmNoYXIoMTUwKSBDSEFSQUNURVIgU0VUIHV0
ZjggREVGQVVMVCBOVUxMLAorY29sNDUgZmxvYXQgdW5zaWduZWQgemVyb2ZpbGwgREVGQVVMVCBO
VUxMLAorY29sNDYgYmluYXJ5KDEpIERFRkFVTFQgTlVMTCwKK2NvbDQ3IHRpbnlpbnQoNCkgREVG
QVVMVCBOVUxMLAorY29sNDggdGlueWludCgxKSBERUZBVUxUIE5VTEwsCitjb2w0OSB0aW1lc3Rh
bXAgTk9UIE5VTEwgREVGQVVMVCAnMDAwMC0wMC0wMCAwMDowMDowMCcsCitjb2w1MCBiaW5hcnko
MSkgREVGQVVMVCBOVUxMLAorY29sNTEgZG91YmxlIHVuc2lnbmVkIHplcm9maWxsIERFRkFVTFQg
TlVMTCwKK2NvbDUyIGludCgxMCkgdW5zaWduZWQgREVGQVVMVCBOVUxMLAorY29sNTMgdGltZSBE
RUZBVUxUIE5VTEwsCitjb2w1NCBkb3VibGUgdW5zaWduZWQgREVGQVVMVCBOVUxMLAorY29sNTUg
dGltZSBERUZBVUxUIE5VTEwsCitjb2w1NiBtZWRpdW10ZXh0IENIQVJBQ1RFUiBTRVQgbGF0aW4y
LAorY29sNTcgYmxvYiwKK2NvbDU4IGRlY2ltYWwoNTIsMTYpIHVuc2lnbmVkIHplcm9maWxsIE5P
VCBOVUxMIERFRkFVTFQgJzAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4wMDAw
MDAwMDAwMDAwMDAwJywKK2NvbDU5IGJpbmFyeSgxKSBERUZBVUxUIE5VTEwsCitjb2w2MCBsb25n
YmxvYiwKK2NvbDYxIHRpbWUgREVGQVVMVCBOVUxMLAorY29sNjIgbG9uZ3RleHQgQ0hBUkFDVEVS
IFNFVCB1dGY4IENPTExBVEUgdXRmOF9wZXJzaWFuX2NpLAorY29sNjMgdGltZXN0YW1wIE5PVCBO
VUxMIERFRkFVTFQgJzAwMDAtMDAtMDAgMDA6MDA6MDAnLAorY29sNjQgaW50KDEwKSB1bnNpZ25l
ZCBERUZBVUxUIE5VTEwsCitjb2w2NSBkYXRlIERFRkFVTFQgTlVMTCwKK2NvbDY2IHRpbWVzdGFt
cCBOT1QgTlVMTCBERUZBVUxUICcwMDAwLTAwLTAwIDAwOjAwOjAwJywKK2NvbDY3IGJpbmFyeSgx
KSBERUZBVUxUIE5VTEwsCitjb2w2OCB0aW55YmxvYiwKK2NvbDY5IGRhdGUgREVGQVVMVCBOVUxM
LAorY29sNzAgdGlueWludCgzKSB1bnNpZ25lZCB6ZXJvZmlsbCBERUZBVUxUIE5VTEwsCitjb2w3
MSB2YXJjaGFyKDQ0KSBDSEFSQUNURVIgU0VUIHV0ZjggREVGQVVMVCBOVUxMLAorY29sNzIgZGF0
ZXRpbWUgREVGQVVMVCBOVUxMLAorY29sNzMgc21hbGxpbnQoNSkgdW5zaWduZWQgemVyb2ZpbGwg
REVGQVVMVCBOVUxMLAorY29sNzQgbG9uZ2Jsb2IsCitjb2w3NSBiaXQoMzQpIERFRkFVTFQgTlVM
TCwKK2NvbDc2IGZsb2F0IHVuc2lnbmVkIHplcm9maWxsIERFRkFVTFQgTlVMTCwKK2NvbDc3IHll
YXIoMikgREVGQVVMVCBOVUxMLAorY29sNzggdGlueWludCgzKSB1bnNpZ25lZCBERUZBVUxUIE5V
TEwsCitjb2w3OSBzZXQoJ21zZmhlb3doJywndGJweGJnZicsJ2J5Jywnd2FobnJqdycsJ215cWZh
c3h6JywncnNva3l1bXJ0JykgQ0hBUkFDVEVSIFNFVCBsYXRpbjIgREVGQVVMVCBOVUxMLAorY29s
ODAgZGF0ZXRpbWUgREVGQVVMVCBOVUxMLAorY29sODEgc21hbGxpbnQoNikgREVGQVVMVCBOVUxM
LAorY29sODIgZW51bSgneHRhdXJucWZxeicsJ3JpZnJzZScsJ2t1endwYnZiJywnbmlpc2Fiaycs
J3p4YXZybycsJ3JidmFzdicsJycsJ3V1bHJmYW92ZScsJycsJycpIERFRkFVTFQgTlVMTCwKK2Nv
bDgzIGJpZ2ludCgyMCkgdW5zaWduZWQgemVyb2ZpbGwgREVGQVVMVCBOVUxMLAorY29sODQgZmxv
YXQgdW5zaWduZWQgemVyb2ZpbGwgREVGQVVMVCBOVUxMLAorY29sODUgZG91YmxlIERFRkFVTFQg
TlVMTCwKK2NvbDg2IGVudW0oJ3lsYW5udicsJycsJ3Zsa2h5Y3FjJywnc25rZScsJ2N4aWZ1c3Rw
JywneGlheGFzd3pwJywnb3hsJykgQ0hBUkFDVEVSIFNFVCBsYXRpbjEgQ09MTEFURSBsYXRpbjFf
Z2VybWFuMl9jaSBERUZBVUxUIE5VTEwsCitjb2w4NyB2YXJiaW5hcnkoMjIxKSBERUZBVUxUIE5V
TEwsCitjb2w4OCBkb3VibGUgdW5zaWduZWQgREVGQVVMVCBOVUxMLAorY29sODkgZmxvYXQgdW5z
aWduZWQgemVyb2ZpbGwgREVGQVVMVCBOVUxMLAorY29sOTAgdGlueWJsb2IKKykgRU5HSU5FPUlu
bm9EQiBERUZBVUxUIENIQVJTRVQ9bGF0aW4xIFJPV19GT1JNQVQ9Q09NUFJFU1NFRCBLRVlfQkxP
Q0tfU0laRT0xOworV2FybmluZ3M6CitOb3RlCTEyOTEJQ29sdW1uICdjb2w4MicgaGFzIGR1cGxp
Y2F0ZWQgdmFsdWUgJycgaW4gRU5VTQorTm90ZQkxMjkxCUNvbHVtbiAnY29sODInIGhhcyBkdXBs
aWNhdGVkIHZhbHVlICcnIGluIEVOVU0KK0lOU0VSVCBJTlRPIGJ1ZzUyNzQ1IFNFVAorY29sNDA9
JzAwMDAtMDAtMDAgMDA6MDA6MDAnLAorY29sNTE9MTY1NDcsCitjb2w1Mz0nNzcxMTQ4NCcsCitj
b2w1ND0tMjg2MDQsCitjb2w1NT0nNzExMjYxMicsCitjb2w1Nj0nd2FrZWZ1bG5lc3NcJycsCitj
b2w1Nz1yZXBlYXQoJ2Fic29yYmVmYWNpZW50XCcnLDEwNiksCitjb2w1OD0xMTAyNywKK2NvbDU5
PSdBTTA5Z1c3JywKK2NvbDYwPXJlcGVhdCgnTm9lbGFuaVwnJywxNiksCitjb2w2MT0nMjUyMDU3
NicsCitjb2w2Mj0nc3Vic3RpdHV0aXYnLAorY29sNjM9JzE5OTUwMTA2MTU1MTEyJywKK2NvbDY0
PS0xMjAzOCwKK2NvbDY1PSc4NjIzODgwNicsCitjb2w2Nj0nMTk2MDA3MTkwODAyNTYnLAorY29s
Njg9cmVwZWF0KCdTYWdpdHRhcml1c1wnJyw1NCksCitjb2w2OT0nMzg5NDM5MDInLAorY29sNzA9
MTIzMiwKK2NvbDcxPSdFbG9yYVwnJywKK2NvbDc0PXJlcGVhdCgnemlwcCcsMTEpLAorY29sNzU9
JzAnLAorY29sNzY9MjMyNTQsCitjb2w3OD0xMzI0NywKK2NvbDc5PSc1NjIxOScsCitjb2w4MD0n
MjA1MDA2MDkwMzU3MjQnLAorY29sODE9MTE2MzIsCitjb2w4Mj03LAorY29sODQ9LTIzODYzLAor
Y29sODU9NjM0MSwKK2NvbDg3PSdIWmRrZi40IHM3dCw1Um1xCThzbyBmbXIscnVHTFVHMjVUcnRJ
LnlRCTJTdUhxME1MN3J3Ny40IGIyeWYyRTVUSnhPdEJCWkltZXpEbnpwaix1UFlmem5uRVVETjFl
OWFRb08gMkRzcGxCN1RGV3kJb1FKIGJyICBITEYgOkYsZVEgcDRpMW9Xc3IgbEwzUEcsaGpDejZo
WXFOIGgxUVRqTENqcnY6UUNkU3pwWUJpYkpBdFpDeExPazNsNkJsc2guVycsCitjb2w4OD0xNjg5
NCwKK2NvbDg5PTYxNjEsCitjb2w5MD1yZXBlYXQoJ2dhbGUnLDQ4KTsKK1dhcm5pbmdzOgorV2Fy
bmluZwkxMjY1CURhdGEgdHJ1bmNhdGVkIGZvciBjb2x1bW4gJ2NvbDUzJyBhdCByb3cgMQorV2Fy
bmluZwkxMjY0CU91dCBvZiByYW5nZSB2YWx1ZSBmb3IgY29sdW1uICdjb2w1NCcgYXQgcm93IDEK
K1dhcm5pbmcJMTI2NQlEYXRhIHRydW5jYXRlZCBmb3IgY29sdW1uICdjb2w1OScgYXQgcm93IDEK
K1dhcm5pbmcJMTI2NQlEYXRhIHRydW5jYXRlZCBmb3IgY29sdW1uICdjb2w2MScgYXQgcm93IDEK
K1dhcm5pbmcJMTI2NAlPdXQgb2YgcmFuZ2UgdmFsdWUgZm9yIGNvbHVtbiAnY29sNjQnIGF0IHJv
dyAxCitXYXJuaW5nCTEyNjUJRGF0YSB0cnVuY2F0ZWQgZm9yIGNvbHVtbiAnY29sNjUnIGF0IHJv
dyAxCitXYXJuaW5nCTEyNjQJT3V0IG9mIHJhbmdlIHZhbHVlIGZvciBjb2x1bW4gJ2NvbDY2JyBh
dCByb3cgMQorV2FybmluZwkxMjY1CURhdGEgdHJ1bmNhdGVkIGZvciBjb2x1bW4gJ2NvbDY4JyBh
dCByb3cgMQorV2FybmluZwkxMjY1CURhdGEgdHJ1bmNhdGVkIGZvciBjb2x1bW4gJ2NvbDY5JyBh
dCByb3cgMQorV2FybmluZwkxMjY0CU91dCBvZiByYW5nZSB2YWx1ZSBmb3IgY29sdW1uICdjb2w3
MCcgYXQgcm93IDEKK1dhcm5pbmcJMTI2NAlPdXQgb2YgcmFuZ2UgdmFsdWUgZm9yIGNvbHVtbiAn
Y29sNzgnIGF0IHJvdyAxCitXYXJuaW5nCTEyNjUJRGF0YSB0cnVuY2F0ZWQgZm9yIGNvbHVtbiAn
Y29sNzknIGF0IHJvdyAxCitXYXJuaW5nCTEyNjQJT3V0IG9mIHJhbmdlIHZhbHVlIGZvciBjb2x1
bW4gJ2NvbDg0JyBhdCByb3cgMQorU0hPVyBXQVJOSU5HUzsKK0xldmVsCUNvZGUJTWVzc2FnZQor
V2FybmluZwkxMjY1CURhdGEgdHJ1bmNhdGVkIGZvciBjb2x1bW4gJ2NvbDUzJyBhdCByb3cgMQor
V2FybmluZwkxMjY0CU91dCBvZiByYW5nZSB2YWx1ZSBmb3IgY29sdW1uICdjb2w1NCcgYXQgcm93
IDEKK1dhcm5pbmcJMTI2NQlEYXRhIHRydW5jYXRlZCBmb3IgY29sdW1uICdjb2w1OScgYXQgcm93
IDEKK1dhcm5pbmcJMTI2NQlEYXRhIHRydW5jYXRlZCBmb3IgY29sdW1uICdjb2w2MScgYXQgcm93
IDEKK1dhcm5pbmcJMTI2NAlPdXQgb2YgcmFuZ2UgdmFsdWUgZm9yIGNvbHVtbiAnY29sNjQnIGF0
IHJvdyAxCitXYXJuaW5nCTEyNjUJRGF0YSB0cnVuY2F0ZWQgZm9yIGNvbHVtbiAnY29sNjUnIGF0
IHJvdyAxCitXYXJuaW5nCTEyNjQJT3V0IG9mIHJhbmdlIHZhbHVlIGZvciBjb2x1bW4gJ2NvbDY2
JyBhdCByb3cgMQorV2FybmluZwkxMjY1CURhdGEgdHJ1bmNhdGVkIGZvciBjb2x1bW4gJ2NvbDY4
JyBhdCByb3cgMQorV2FybmluZwkxMjY1CURhdGEgdHJ1bmNhdGVkIGZvciBjb2x1bW4gJ2NvbDY5
JyBhdCByb3cgMQorV2FybmluZwkxMjY0CU91dCBvZiByYW5nZSB2YWx1ZSBmb3IgY29sdW1uICdj
b2w3MCcgYXQgcm93IDEKK1dhcm5pbmcJMTI2NAlPdXQgb2YgcmFuZ2UgdmFsdWUgZm9yIGNvbHVt
biAnY29sNzgnIGF0IHJvdyAxCitXYXJuaW5nCTEyNjUJRGF0YSB0cnVuY2F0ZWQgZm9yIGNvbHVt
biAnY29sNzknIGF0IHJvdyAxCitXYXJuaW5nCTEyNjQJT3V0IG9mIHJhbmdlIHZhbHVlIGZvciBj
b2x1bW4gJ2NvbDg0JyBhdCByb3cgMQorRFJPUCBUQUJMRSBidWc1Mjc0NTsKK1NFVCBHTE9CQUwg
aW5ub2RiX2ZpbGVfZm9ybWF0PUFudGVsb3BlOworU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9mb3Jt
YXRfY2hlY2s9QW50ZWxvcGU7CitTRVQgR0xPQkFMIGlubm9kYl9maWxlX3Blcl90YWJsZT0wOwoK
PT09IGFkZGVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYl9i
dWc1Mjc0NS50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5v
ZGJfYnVnNTI3NDUudGVzdAkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBiL215c3FsLXRl
c3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYl9idWc1Mjc0NS50ZXN0CTIwMTAtMDQtMjYg
MTE6MDg6NTYgKzAwMDAKQEAgLTAsMCArMSwxMDkgQEAKKy0tIHNvdXJjZSBpbmNsdWRlL2hhdmVf
aW5ub2RiX3BsdWdpbi5pbmMKKworbGV0ICRmaWxlX2Zvcm1hdD1gc2VsZWN0IEBAaW5ub2RiX2Zp
bGVfZm9ybWF0YDsKK2xldCAkZmlsZV9mb3JtYXRfY2hlY2s9YHNlbGVjdCBAQGlubm9kYl9maWxl
X2Zvcm1hdF9jaGVja2A7CitsZXQgJGZpbGVfcGVyX3RhYmxlPWBzZWxlY3QgQEBpbm5vZGJfZmls
ZV9wZXJfdGFibGVgOworU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9mb3JtYXQ9J0JhcnJhY3VkYSc7
CitTRVQgR0xPQkFMIGlubm9kYl9maWxlX3Blcl90YWJsZT1vbjsKKworQ1JFQVRFIFRBQkxFIGJ1
ZzUyNzQ1ICgKKyAgYTIgaW50KDEwKSB1bnNpZ25lZCBERUZBVUxUIE5VTEwsCisgIGNvbDM3IHRp
bWUgREVGQVVMVCBOVUxMLAorICBjb2wzOCBjaGFyKDIyOSkgQ0hBUkFDVEVSIFNFVCB1dGY4IERF
RkFVTFQgTlVMTCwKKyAgY29sMzkgdGV4dCwKKyAgY29sNDAgdGltZXN0YW1wIE5PVCBOVUxMIERF
RkFVTFQgQ1VSUkVOVF9USU1FU1RBTVAgT04gVVBEQVRFIENVUlJFTlRfVElNRVNUQU1QLAorICBj
b2w0MSBpbnQoMTApIHVuc2lnbmVkIERFRkFVTFQgTlVMTCwKKyAgY29sNDIgdmFyY2hhcigyNDgp
IENIQVJBQ1RFUiBTRVQgdXRmOCBERUZBVUxUIE5VTEwsCisgIGNvbDQzIHNtYWxsaW50KDUpIHVu
c2lnbmVkIHplcm9maWxsIERFRkFVTFQgTlVMTCwKKyAgY29sNDQgdmFyY2hhcigxNTApIENIQVJB
Q1RFUiBTRVQgdXRmOCBERUZBVUxUIE5VTEwsCisgIGNvbDQ1IGZsb2F0IHVuc2lnbmVkIHplcm9m
aWxsIERFRkFVTFQgTlVMTCwKKyAgY29sNDYgYmluYXJ5KDEpIERFRkFVTFQgTlVMTCwKKyAgY29s
NDcgdGlueWludCg0KSBERUZBVUxUIE5VTEwsCisgIGNvbDQ4IHRpbnlpbnQoMSkgREVGQVVMVCBO
VUxMLAorICBjb2w0OSB0aW1lc3RhbXAgTk9UIE5VTEwgREVGQVVMVCAnMDAwMC0wMC0wMCAwMDow
MDowMCcsCisgIGNvbDUwIGJpbmFyeSgxKSBERUZBVUxUIE5VTEwsCisgIGNvbDUxIGRvdWJsZSB1
bnNpZ25lZCB6ZXJvZmlsbCBERUZBVUxUIE5VTEwsCisgIGNvbDUyIGludCgxMCkgdW5zaWduZWQg
REVGQVVMVCBOVUxMLAorICBjb2w1MyB0aW1lIERFRkFVTFQgTlVMTCwKKyAgY29sNTQgZG91Ymxl
IHVuc2lnbmVkIERFRkFVTFQgTlVMTCwKKyAgY29sNTUgdGltZSBERUZBVUxUIE5VTEwsCisgIGNv
bDU2IG1lZGl1bXRleHQgQ0hBUkFDVEVSIFNFVCBsYXRpbjIsCisgIGNvbDU3IGJsb2IsCisgIGNv
bDU4IGRlY2ltYWwoNTIsMTYpIHVuc2lnbmVkIHplcm9maWxsIE5PVCBOVUxMIERFRkFVTFQgJzAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4wMDAwMDAwMDAwMDAwMDAwJywKKyAg
Y29sNTkgYmluYXJ5KDEpIERFRkFVTFQgTlVMTCwKKyAgY29sNjAgbG9uZ2Jsb2IsCisgIGNvbDYx
IHRpbWUgREVGQVVMVCBOVUxMLAorICBjb2w2MiBsb25ndGV4dCBDSEFSQUNURVIgU0VUIHV0Zjgg
Q09MTEFURSB1dGY4X3BlcnNpYW5fY2ksCisgIGNvbDYzIHRpbWVzdGFtcCBOT1QgTlVMTCBERUZB
VUxUICcwMDAwLTAwLTAwIDAwOjAwOjAwJywKKyAgY29sNjQgaW50KDEwKSB1bnNpZ25lZCBERUZB
VUxUIE5VTEwsCisgIGNvbDY1IGRhdGUgREVGQVVMVCBOVUxMLAorICBjb2w2NiB0aW1lc3RhbXAg
Tk9UIE5VTEwgREVGQVVMVCAnMDAwMC0wMC0wMCAwMDowMDowMCcsCisgIGNvbDY3IGJpbmFyeSgx
KSBERUZBVUxUIE5VTEwsCisgIGNvbDY4IHRpbnlibG9iLAorICBjb2w2OSBkYXRlIERFRkFVTFQg
TlVMTCwKKyAgY29sNzAgdGlueWludCgzKSB1bnNpZ25lZCB6ZXJvZmlsbCBERUZBVUxUIE5VTEws
CisgIGNvbDcxIHZhcmNoYXIoNDQpIENIQVJBQ1RFUiBTRVQgdXRmOCBERUZBVUxUIE5VTEwsCisg
IGNvbDcyIGRhdGV0aW1lIERFRkFVTFQgTlVMTCwKKyAgY29sNzMgc21hbGxpbnQoNSkgdW5zaWdu
ZWQgemVyb2ZpbGwgREVGQVVMVCBOVUxMLAorICBjb2w3NCBsb25nYmxvYiwKKyAgY29sNzUgYml0
KDM0KSBERUZBVUxUIE5VTEwsCisgIGNvbDc2IGZsb2F0IHVuc2lnbmVkIHplcm9maWxsIERFRkFV
TFQgTlVMTCwKKyAgY29sNzcgeWVhcigyKSBERUZBVUxUIE5VTEwsCisgIGNvbDc4IHRpbnlpbnQo
MykgdW5zaWduZWQgREVGQVVMVCBOVUxMLAorICBjb2w3OSBzZXQoJ21zZmhlb3doJywndGJweGJn
ZicsJ2J5Jywnd2FobnJqdycsJ215cWZhc3h6JywncnNva3l1bXJ0JykgQ0hBUkFDVEVSIFNFVCBs
YXRpbjIgREVGQVVMVCBOVUxMLAorICBjb2w4MCBkYXRldGltZSBERUZBVUxUIE5VTEwsCisgIGNv
bDgxIHNtYWxsaW50KDYpIERFRkFVTFQgTlVMTCwKKyAgY29sODIgZW51bSgneHRhdXJucWZxeics
J3JpZnJzZScsJ2t1endwYnZiJywnbmlpc2FiaycsJ3p4YXZybycsJ3JidmFzdicsJycsJ3V1bHJm
YW92ZScsJycsJycpIERFRkFVTFQgTlVMTCwKKyAgY29sODMgYmlnaW50KDIwKSB1bnNpZ25lZCB6
ZXJvZmlsbCBERUZBVUxUIE5VTEwsCisgIGNvbDg0IGZsb2F0IHVuc2lnbmVkIHplcm9maWxsIERF
RkFVTFQgTlVMTCwKKyAgY29sODUgZG91YmxlIERFRkFVTFQgTlVMTCwKKyAgY29sODYgZW51bSgn
eWxhbm52JywnJywndmxraHljcWMnLCdzbmtlJywnY3hpZnVzdHAnLCd4aWF4YXN3enAnLCdveGwn
KSBDSEFSQUNURVIgU0VUIGxhdGluMSBDT0xMQVRFIGxhdGluMV9nZXJtYW4yX2NpIERFRkFVTFQg
TlVMTCwKKyAgY29sODcgdmFyYmluYXJ5KDIyMSkgREVGQVVMVCBOVUxMLAorICBjb2w4OCBkb3Vi
bGUgdW5zaWduZWQgREVGQVVMVCBOVUxMLAorICBjb2w4OSBmbG9hdCB1bnNpZ25lZCB6ZXJvZmls
bCBERUZBVUxUIE5VTEwsCisgIGNvbDkwIHRpbnlibG9iCispIEVOR0lORT1Jbm5vREIgREVGQVVM
VCBDSEFSU0VUPWxhdGluMSBST1dfRk9STUFUPUNPTVBSRVNTRUQgS0VZX0JMT0NLX1NJWkU9MTsK
KworSU5TRVJUIElOVE8gYnVnNTI3NDUgU0VUCitjb2w0MD0nMDAwMC0wMC0wMCAwMDowMDowMCcs
Citjb2w1MT0xNjU0NywKK2NvbDUzPSc3NzExNDg0JywKK2NvbDU0PS0yODYwNCwKK2NvbDU1PSc3
MTEyNjEyJywKK2NvbDU2PSd3YWtlZnVsbmVzc1wnJywKK2NvbDU3PXJlcGVhdCgnYWJzb3JiZWZh
Y2llbnRcJycsMTA2KSwKK2NvbDU4PTExMDI3LAorY29sNTk9J0FNMDlnVzcnLAorY29sNjA9cmVw
ZWF0KCdOb2VsYW5pXCcnLDE2KSwKK2NvbDYxPScyNTIwNTc2JywKK2NvbDYyPSdzdWJzdGl0dXRp
dicsCitjb2w2Mz0nMTk5NTAxMDYxNTUxMTInLAorY29sNjQ9LTEyMDM4LAorY29sNjU9Jzg2MjM4
ODA2JywKK2NvbDY2PScxOTYwMDcxOTA4MDI1NicsCitjb2w2OD1yZXBlYXQoJ1NhZ2l0dGFyaXVz
XCcnLDU0KSwKK2NvbDY5PSczODk0MzkwMicsCitjb2w3MD0xMjMyLAorY29sNzE9J0Vsb3JhXCcn
LAorY29sNzQ9cmVwZWF0KCd6aXBwJywxMSksCitjb2w3NT0nMCcsCitjb2w3Nj0yMzI1NCwKK2Nv
bDc4PTEzMjQ3LAorY29sNzk9JzU2MjE5JywKK2NvbDgwPScyMDUwMDYwOTAzNTcyNCcsCitjb2w4
MT0xMTYzMiwKK2NvbDgyPTcsCitjb2w4ND0tMjM4NjMsCitjb2w4NT02MzQxLAorY29sODc9J0ha
ZGtmLjQgczd0LDVSbXEJOHNvIGZtcixydUdMVUcyNVRydEkueVEJMlN1SHEwTUw3cnc3LjQgYjJ5
ZjJFNVRKeE90QkJaSW1lekRuenBqLHVQWWZ6bm5FVUROMWU5YVFvTyAyRHNwbEI3VEZXeQlvUUog
YnIgIEhMRiA6RixlUSBwNGkxb1dzciBsTDNQRyxoakN6NmhZcU4gaDFRVGpMQ2pydjpRQ2RTenBZ
QmliSkF0WkN4TE9rM2w2QmxzaC5XJywKK2NvbDg4PTE2ODk0LAorY29sODk9NjE2MSwKK2NvbDkw
PXJlcGVhdCgnZ2FsZScsNDgpOworCitTSE9XIFdBUk5JTkdTOworCitEUk9QIFRBQkxFIGJ1ZzUy
NzQ1OworCitFVkFMIFNFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfZm9ybWF0PSRmaWxlX2Zvcm1hdDsK
K0VWQUwgU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9mb3JtYXRfY2hlY2s9JGZpbGVfZm9ybWF0X2No
ZWNrOworRVZBTCBTRVQgR0xPQkFMIGlubm9kYl9maWxlX3Blcl90YWJsZT0kZmlsZV9wZXJfdGFi
bGU7Cgo=

--===============1165685767==
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-innodb/
# testament_sha1: e4eb5cfd1965021d71ee5a57dae60cbb50e28a3e
# timestamp: 2010-04-26 14:09:16 +0300
# base_revision_id: marko.makela@stripped\
#   2e9nzq8z0nfwxjky
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWT8eULoACKZfgEA0Xef//3//
/7T////wYA8/ekkqpAgoAAADQAAAYQAAAAAAIp6U0yfqIAAAAZBoGRpo0GgAANBxkaZMTQZMmE0y
BkNAaA0yaGAE0BjjI0yYmgyZMJpkDIaA0Bpk0MAJoDCU9JImhCanpNlN6mI1PUyANA/VMmnpAAaA
0A4yNMmJoMmTCaZAyGgNAaZNDACaAwVKICaATIAEam0AE0yaGmU2hpMAJPFNg20+5E+18z9n5XuZ
JdzE/x192TvT9tDqyxwp8eboSivvMtlaqa7i9DseFyyljvj4pytGM6K5MoFYOG6aT61CJKxvduuy
WdtcV2h/C2SJw/1L9bQP4JM7Xk7s45dYP1n9omezC171bPLTb5nsYzd0FRA4zWZkPmOwDeJ6O5nH
wrrBvC2xjeJLXHVizBOS8sOM42uAbwtsY3iS1xnizBL7Lrat7OjyKPpd/+kwUWpJHwbXQ2T7Q3Ln
2vwbNXzonldro6e/12WWWa1H2tTuqOvqaUidxE59exe/wLqMHai8x6TM4zwHj0vTZd3fSZ8oiCIi
CCJ/Xsm47pkmXQUcPadrGads6TmEPVyXM2ODFxk+ZlY/glFKLUTFvdJqe3+LWB138uFll3lfFJOM
1Cd4pNDWVXirlRaUXikIositKKN6OFyLiYNribFi4ilnF5b92F2hV67fOvjj9VVJ02Adh1xVfc3+
m+I7xtOA5zgEyETnOc4HYyet+5RKJrcK5n91Izsy1bytD+2F6xWiq9Y1MXmWulid5U+d0PS8j/T6
H/zI+Re7qyCbBPAbgRBKD2hA8xXOYCqSCIlVYgIkKSzcUdQJtUFpA94EhAgCIdAmXf2h3Zu3Xd31
KDz9GrBhBxjGPMZh1oPWsYzMrQzNZ464d8A2pXB03cfLcFtoUoM84BhRPYGDsGGiavgJmZQxguzW
0TYMpTLIux1DUMYLsTQdBsUcxLU1qNClyl6liwkXqJoe1+Tif29XDvHwHien/O65Ra08Trl6xUbz
A55n8lvD4OrrYYc7FrtwdpPq8hLU/ZlLvUv79j8o0w7KEwmZ3mlwNra4LsbFB3WK4di0WZVidQx+
0VFkTEYfiqzIZmliMhhBauy0LFVix0LmLOhkFjSZnElmBEuahA0dRgwbzMAust0YtjFi+LOseL5p
LDHLBu2A5DYvaWdpYTNY88Z6RSxgtcNbho2wWXpfPOtfXaNfbVc3sCWUbGk1lzluXtjnVLlH4Inr
aqs+vmx2ZlvzT44Z2XTpG2cTQw2NxRmaSvEcfmycTDrLcW2Zl7maHa6HM+x8/U3C/uOLPmUZ2nRS
mlkrhc2nM42TYYLGCF7ctVb0VmdYXrzT/1Ytb1y93GDS0MWhVY9LZJM6SWKaYmrY0qls9FJqXOt5
HY3trKdLz/I2ZKX0praFG8q1W95tWrVWyXqLW9uUvq9jQoq6Xe7c5yr2xiztj1sHU6HqH0ObEmWb
vqM61xrVzjuXr1Whc4+KlL3Co5lxZwLlXHLHZRa6mtYvkl9WLRVnZF5nYlykKNDcqyuWrFHgbbnP
cxyc84GpnXNbMtdrx2DIxSXKZGKqxYzOla4DGf9vkzLGbc0rHVczvHottNOhvZT0HhoL0z0OJe0N
q0ucipy0XtAvd1auoo0Kq0VUXUTM3NyrFc0PsZ3OtaeQUGPFp0L2hc0FVyxubViiwbNjJmXrFyhe
1STOoueJz3mDFUoxXLGBKJRJxVLW1UZKJqWqi01sly1axal7Y9vb52Vyi9oa2hX61GdRsZ2ocjBu
WNtGOh31jyUbl0S+wpQvVVMyiNai81r293nD4X3Nq/ZcjOsZnC3tyqjZYXtaubbRkzLkXqFzlVMG
yrQqqvzClWKjFwLViUaVSiqrg03smpmYtTgHld6asabKsGLM1Llqxc0NC7UwZlyixcssdrFkcbc3
YM6jSwaWLM0trQsnCrBm6H0rGOfJSZy3RNkIJn2vBP2z8yyDqJBPAiegmQis2FgTjrwgkqkZEByP
DDVMFG1SLttuxwOJzqszpLlqirFa5HGxciZb17Oqqo8a9kzszPp+9grZntUZ2TSq0vR+k+vuWY1b
7K2dyfrO8TSfmH/p30fItP5D5VH/H7OR8p8QTt9T9l7wbpT0Kqv2R1v4P8bm5r/t4HNIZlDWzsgs
P5bnsn+PuaH7P1Ygn+M7FJ9jzOs0FCrQ/R2Mfa6ATQtKMQtWO4VSTwsJ/jmaX/W8E6Wdwt7Y1o/J
V/iFjW0LncZj9WLYxYuF0uh7mZe0tyOqJQiO85FTrfIeFwpJHYbkWv9WgljdVp0Op/J61hk9PbV8
XeYO6ozMkVLCqSRR1tLwORwk5EwZnmdaONYvcTaTlcCjie5V2PW8zwOB7nqcYdAcLaeFrWudxtpY
xfW7jwuVhOiUpSkoGhV42KdTzPesdJKIwbEWERYGpRkaCwcAe1oNjWnjVZmS1JIxBKMmYumd8H6L
ljgJOV8j7WLlfw9LwvK8L3O4ufusfS+t7HnPWmEdj6FkTxk8SiyXKpPgutz7fLgffJjX7vqnTYk8
bFLOnB7Plq+on3tDM92tok+V+LswSZTpYSyPlfmf0k8Tu1T80nNNULFrGJx7jW02NSiZDWMn1Zyd
hJ2tSMX6ZnvaWPQieUakWJPak5jMFDgRsaM7e153ZrVGZpW6n824qEe9qcbQwRVRxveKSdqzmrSt
K05ty12XsFh9SUZmDuOfvT7G1+a3tahlYk3vi+5p15lreYYceDMobYcDlUvrFSYWX7aUpSlJRVVV
VVVWlXkEjBI0tLS0sEjSwSNLSwSMEjBIrBIwSMEjSqtLS0qwSMEjS0sEisEjSrS0tLSUV5Ap5jSt
DMhVdtoh9+NjW9CjnaT3smBZqHtcLpbB1yRxvdoWX3M85XTNz4rhhR0N/cyeAtUd+hVRWea0m2xL
ydr0r1qTNRyOn4O6PWsucCx1Sze6PS4JbGx5t9GX8LpJuvio8Lx+ryvPwNiNDiWxmm1JrSctFSNr
c6uLS5mDdW4oTpc8ud5iwlE6jWqjZzYbpM3ItIsTJZtengYlIUZTfMpYfC2FZF02E6MnTucrwrFK
DgVzI5VFGLO9DnmDdNj+njf76CiilHPK1UpNxFiOblqSW0UkaGS/ua1jCfW9NUTyPFRKE775Vp5a
EpJpV76/Jcogtf5R33MeX6FeVwujqW2pSFr9+KyOp5nd2PkdcXnZ6Xm3Nmt872PItu5OcZ2d4Jez
OhnQduTekjMzJHHPFVGKPZbvjfmJO13uf0ylME/dQpv8qwalU40/95tN+0nDDhcrvQ4XfaXnxdDo
VZNfpeAfM/4p3J9LMv7jW/BWOt33+0JsanRGUTWPO+uep3sCKbWS0ksKJG9RIPmUIjgdK5J3VX2K
JwupRMnCSxnWpVIpjO5MmpMetgRVOueIZkaEyfg673kU9XsaduhJr3kllMCkjzE2Nyc7q8fzPKqU
WyS8mib1vjth8VPFp1EmMM8/NzLXYo56tbMSZTKlKIya7I76xU2S6R82dJdYl3lQciz3SiJaXRKq
qvTqaCTjehwsZIwa4Tdg87WgvE7D7FJWiMFZJ8Htmb59TOqTB+b9n1OJC2SPnw/RzkqR5c7vkJL1
JJsedSTkzpjRQ2SJV9RPNGS2SeOyanV7Bf0MkTldT5BqZM7He5Rfesni8XiOX3sJtakfRCpk4tLs
Xa+RZq1KeNofk9eifY6ljgalbuhmbZEuc0jO3ItScykX8ZKr3M4Kp+I4qjrR6ZxezJx0lnM9WzLS
zuJSJa1yTbYSbHedy8jN0mpEwfHkXtLje9Y1UfBoSe5mXZIoozvUxwU6G1Z2LJhuf1O3Jm2ORbOG
YONBnhY0GZN7qYOtb7PlfI/FsQvao3rDO0K27krKds/4cWJLUFd+xYMFG8N6gxcq7FfyZqyfBk9b
JbFGRWSckmaGxa2vqHQwLaBsZmHL4JrXnQ2rkt3kz7VpuUKKIxRQmxe31jTKKWpKMKFjVFjlsd2x
+TutIuejmbJJ/zpJW5lNiuotJNLU1JNaDQw07V7O6CYE43M+VezNTnNLFI2mlp48Jt47IaXtvYIn
a59D4ePEvehxTgfO/hoXPK95mdb55ncCLVM7xNnR0cqyRZ2q8x7l7ofFaNDwczgo58VvM8Kp55zt
7m7JrI7cNTqYczxOCLfAvf/i7kinChIH48oXQA==


--===============1165685767==--