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

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA0MjYxMDUyMTUtMmU5bnpx
OHowbmZ3eGpreQoKIDM0MTkgTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yNgogICAgICBBZGQgYSB0
ZXN0IGNhc2UgZm9yIEJ1ZyAjNTI3NDUuCgogICAgYWRkZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3Vp
dGUvaW5ub2RiX3BsdWdpbi9yL2lubm9kYl9idWc1Mjc0NS5yZXN1bHQKICAgICAgbXlzcWwtdGVz
dC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzUyNzQ1LnRlc3QKPT09IGFkZGVkIGZp
bGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi9yL2lubm9kYl9idWc1Mjc0NS5yZXN1
bHQnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi9yL2lubm9kYl9idWc1Mjc0
NS5yZXN1bHQJMTk3MC0wMS0wMSAwMDowMDowMCArMDAwMAorKysgYi9teXNxbC10ZXN0L3N1aXRl
L2lubm9kYl9wbHVnaW4vci9pbm5vZGJfYnVnNTI3NDUucmVzdWx0CTIwMTAtMDQtMjYgMTE6MDg6
NTYgKzAwMDAKQEAgLTAsMCArMSwxMzAgQEAKK1NFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfZm9ybWF0
PSdCYXJyYWN1ZGEnOworU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9wZXJfdGFibGU9b247CitDUkVB
VEUgVEFCTEUgYnVnNTI3NDUgKAorYTIgaW50KDEwKSB1bnNpZ25lZCBERUZBVUxUIE5VTEwsCitj
b2wzNyB0aW1lIERFRkFVTFQgTlVMTCwKK2NvbDM4IGNoYXIoMjI5KSBDSEFSQUNURVIgU0VUIHV0
ZjggREVGQVVMVCBOVUxMLAorY29sMzkgdGV4dCwKK2NvbDQwIHRpbWVzdGFtcCBOT1QgTlVMTCBE
RUZBVUxUIENVUlJFTlRfVElNRVNUQU1QIE9OIFVQREFURSBDVVJSRU5UX1RJTUVTVEFNUCwKK2Nv
bDQxIGludCgxMCkgdW5zaWduZWQgREVGQVVMVCBOVUxMLAorY29sNDIgdmFyY2hhcigyNDgpIENI
QVJBQ1RFUiBTRVQgdXRmOCBERUZBVUxUIE5VTEwsCitjb2w0MyBzbWFsbGludCg1KSB1bnNpZ25l
ZCB6ZXJvZmlsbCBERUZBVUxUIE5VTEwsCitjb2w0NCB2YXJjaGFyKDE1MCkgQ0hBUkFDVEVSIFNF
VCB1dGY4IERFRkFVTFQgTlVMTCwKK2NvbDQ1IGZsb2F0IHVuc2lnbmVkIHplcm9maWxsIERFRkFV
TFQgTlVMTCwKK2NvbDQ2IGJpbmFyeSgxKSBERUZBVUxUIE5VTEwsCitjb2w0NyB0aW55aW50KDQp
IERFRkFVTFQgTlVMTCwKK2NvbDQ4IHRpbnlpbnQoMSkgREVGQVVMVCBOVUxMLAorY29sNDkgdGlt
ZXN0YW1wIE5PVCBOVUxMIERFRkFVTFQgJzAwMDAtMDAtMDAgMDA6MDA6MDAnLAorY29sNTAgYmlu
YXJ5KDEpIERFRkFVTFQgTlVMTCwKK2NvbDUxIGRvdWJsZSB1bnNpZ25lZCB6ZXJvZmlsbCBERUZB
VUxUIE5VTEwsCitjb2w1MiBpbnQoMTApIHVuc2lnbmVkIERFRkFVTFQgTlVMTCwKK2NvbDUzIHRp
bWUgREVGQVVMVCBOVUxMLAorY29sNTQgZG91YmxlIHVuc2lnbmVkIERFRkFVTFQgTlVMTCwKK2Nv
bDU1IHRpbWUgREVGQVVMVCBOVUxMLAorY29sNTYgbWVkaXVtdGV4dCBDSEFSQUNURVIgU0VUIGxh
dGluMiwKK2NvbDU3IGJsb2IsCitjb2w1OCBkZWNpbWFsKDUyLDE2KSB1bnNpZ25lZCB6ZXJvZmls
bCBOT1QgTlVMTCBERUZBVUxUICcwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu
MDAwMDAwMDAwMDAwMDAwMCcsCitjb2w1OSBiaW5hcnkoMSkgREVGQVVMVCBOVUxMLAorY29sNjAg
bG9uZ2Jsb2IsCitjb2w2MSB0aW1lIERFRkFVTFQgTlVMTCwKK2NvbDYyIGxvbmd0ZXh0IENIQVJB
Q1RFUiBTRVQgdXRmOCBDT0xMQVRFIHV0ZjhfcGVyc2lhbl9jaSwKK2NvbDYzIHRpbWVzdGFtcCBO
T1QgTlVMTCBERUZBVUxUICcwMDAwLTAwLTAwIDAwOjAwOjAwJywKK2NvbDY0IGludCgxMCkgdW5z
aWduZWQgREVGQVVMVCBOVUxMLAorY29sNjUgZGF0ZSBERUZBVUxUIE5VTEwsCitjb2w2NiB0aW1l
c3RhbXAgTk9UIE5VTEwgREVGQVVMVCAnMDAwMC0wMC0wMCAwMDowMDowMCcsCitjb2w2NyBiaW5h
cnkoMSkgREVGQVVMVCBOVUxMLAorY29sNjggdGlueWJsb2IsCitjb2w2OSBkYXRlIERFRkFVTFQg
TlVMTCwKK2NvbDcwIHRpbnlpbnQoMykgdW5zaWduZWQgemVyb2ZpbGwgREVGQVVMVCBOVUxMLAor
Y29sNzEgdmFyY2hhcig0NCkgQ0hBUkFDVEVSIFNFVCB1dGY4IERFRkFVTFQgTlVMTCwKK2NvbDcy
IGRhdGV0aW1lIERFRkFVTFQgTlVMTCwKK2NvbDczIHNtYWxsaW50KDUpIHVuc2lnbmVkIHplcm9m
aWxsIERFRkFVTFQgTlVMTCwKK2NvbDc0IGxvbmdibG9iLAorY29sNzUgYml0KDM0KSBERUZBVUxU
IE5VTEwsCitjb2w3NiBmbG9hdCB1bnNpZ25lZCB6ZXJvZmlsbCBERUZBVUxUIE5VTEwsCitjb2w3
NyB5ZWFyKDIpIERFRkFVTFQgTlVMTCwKK2NvbDc4IHRpbnlpbnQoMykgdW5zaWduZWQgREVGQVVM
VCBOVUxMLAorY29sNzkgc2V0KCdtc2ZoZW93aCcsJ3RicHhiZ2YnLCdieScsJ3dhaG5yancnLCdt
eXFmYXN4eicsJ3Jzb2t5dW1ydCcpIENIQVJBQ1RFUiBTRVQgbGF0aW4yIERFRkFVTFQgTlVMTCwK
K2NvbDgwIGRhdGV0aW1lIERFRkFVTFQgTlVMTCwKK2NvbDgxIHNtYWxsaW50KDYpIERFRkFVTFQg
TlVMTCwKK2NvbDgyIGVudW0oJ3h0YXVybnFmcXonLCdyaWZyc2UnLCdrdXp3cGJ2YicsJ25paXNh
YmsnLCd6eGF2cm8nLCdyYnZhc3YnLCcnLCd1dWxyZmFvdmUnLCcnLCcnKSBERUZBVUxUIE5VTEws
Citjb2w4MyBiaWdpbnQoMjApIHVuc2lnbmVkIHplcm9maWxsIERFRkFVTFQgTlVMTCwKK2NvbDg0
IGZsb2F0IHVuc2lnbmVkIHplcm9maWxsIERFRkFVTFQgTlVMTCwKK2NvbDg1IGRvdWJsZSBERUZB
VUxUIE5VTEwsCitjb2w4NiBlbnVtKCd5bGFubnYnLCcnLCd2bGtoeWNxYycsJ3Nua2UnLCdjeGlm
dXN0cCcsJ3hpYXhhc3d6cCcsJ294bCcpIENIQVJBQ1RFUiBTRVQgbGF0aW4xIENPTExBVEUgbGF0
aW4xX2dlcm1hbjJfY2kgREVGQVVMVCBOVUxMLAorY29sODcgdmFyYmluYXJ5KDIyMSkgREVGQVVM
VCBOVUxMLAorY29sODggZG91YmxlIHVuc2lnbmVkIERFRkFVTFQgTlVMTCwKK2NvbDg5IGZsb2F0
IHVuc2lnbmVkIHplcm9maWxsIERFRkFVTFQgTlVMTCwKK2NvbDkwIHRpbnlibG9iCispIEVOR0lO
RT1Jbm5vREIgREVGQVVMVCBDSEFSU0VUPWxhdGluMSBST1dfRk9STUFUPUNPTVBSRVNTRUQgS0VZ
X0JMT0NLX1NJWkU9MTsKK1dhcm5pbmdzOgorTm90ZQkxMjkxCUNvbHVtbiAnY29sODInIGhhcyBk
dXBsaWNhdGVkIHZhbHVlICcnIGluIEVOVU0KK05vdGUJMTI5MQlDb2x1bW4gJ2NvbDgyJyBoYXMg
ZHVwbGljYXRlZCB2YWx1ZSAnJyBpbiBFTlVNCitJTlNFUlQgSU5UTyBidWc1Mjc0NSBTRVQKK2Nv
bDQwPScwMDAwLTAwLTAwIDAwOjAwOjAwJywKK2NvbDUxPTE2NTQ3LAorY29sNTM9Jzc3MTE0ODQn
LAorY29sNTQ9LTI4NjA0LAorY29sNTU9JzcxMTI2MTInLAorY29sNTY9J3dha2VmdWxuZXNzXCcn
LAorY29sNTc9cmVwZWF0KCdhYnNvcmJlZmFjaWVudFwnJywxMDYpLAorY29sNTg9MTEwMjcsCitj
b2w1OT0nQU0wOWdXNycsCitjb2w2MD1yZXBlYXQoJ05vZWxhbmlcJycsMTYpLAorY29sNjE9JzI1
MjA1NzYnLAorY29sNjI9J3N1YnN0aXR1dGl2JywKK2NvbDYzPScxOTk1MDEwNjE1NTExMicsCitj
b2w2ND0tMTIwMzgsCitjb2w2NT0nODYyMzg4MDYnLAorY29sNjY9JzE5NjAwNzE5MDgwMjU2JywK
K2NvbDY4PXJlcGVhdCgnU2FnaXR0YXJpdXNcJycsNTQpLAorY29sNjk9JzM4OTQzOTAyJywKK2Nv
bDcwPTEyMzIsCitjb2w3MT0nRWxvcmFcJycsCitjb2w3ND1yZXBlYXQoJ3ppcHAnLDExKSwKK2Nv
bDc1PScwJywKK2NvbDc2PTIzMjU0LAorY29sNzg9MTMyNDcsCitjb2w3OT0nNTYyMTknLAorY29s
ODA9JzIwNTAwNjA5MDM1NzI0JywKK2NvbDgxPTExNjMyLAorY29sODI9NywKK2NvbDg0PS0yMzg2
MywKK2NvbDg1PTYzNDEsCitjb2w4Nz0nSFpka2YuNCBzN3QsNVJtcQk4c28gZm1yLHJ1R0xVRzI1
VHJ0SS55UQkyU3VIcTBNTDdydzcuNCBiMnlmMkU1VEp4T3RCQlpJbWV6RG56cGosdVBZZnpubkVV
RE4xZTlhUW9PIDJEc3BsQjdURld5CW9RSiBiciAgSExGIDpGLGVRIHA0aTFvV3NyIGxMM1BHLGhq
Q3o2aFlxTiBoMVFUakxDanJ2OlFDZFN6cFlCaWJKQXRaQ3hMT2szbDZCbHNoLlcnLAorY29sODg9
MTY4OTQsCitjb2w4OT02MTYxLAorY29sOTA9cmVwZWF0KCdnYWxlJyw0OCk7CitXYXJuaW5nczoK
K1dhcm5pbmcJMTI2NQlEYXRhIHRydW5jYXRlZCBmb3IgY29sdW1uICdjb2w1MycgYXQgcm93IDEK
K1dhcm5pbmcJMTI2NAlPdXQgb2YgcmFuZ2UgdmFsdWUgZm9yIGNvbHVtbiAnY29sNTQnIGF0IHJv
dyAxCitXYXJuaW5nCTEyNjUJRGF0YSB0cnVuY2F0ZWQgZm9yIGNvbHVtbiAnY29sNTknIGF0IHJv
dyAxCitXYXJuaW5nCTEyNjUJRGF0YSB0cnVuY2F0ZWQgZm9yIGNvbHVtbiAnY29sNjEnIGF0IHJv
dyAxCitXYXJuaW5nCTEyNjQJT3V0IG9mIHJhbmdlIHZhbHVlIGZvciBjb2x1bW4gJ2NvbDY0JyBh
dCByb3cgMQorV2FybmluZwkxMjY1CURhdGEgdHJ1bmNhdGVkIGZvciBjb2x1bW4gJ2NvbDY1JyBh
dCByb3cgMQorV2FybmluZwkxMjY0CU91dCBvZiByYW5nZSB2YWx1ZSBmb3IgY29sdW1uICdjb2w2
NicgYXQgcm93IDEKK1dhcm5pbmcJMTI2NQlEYXRhIHRydW5jYXRlZCBmb3IgY29sdW1uICdjb2w2
OCcgYXQgcm93IDEKK1dhcm5pbmcJMTI2NQlEYXRhIHRydW5jYXRlZCBmb3IgY29sdW1uICdjb2w2
OScgYXQgcm93IDEKK1dhcm5pbmcJMTI2NAlPdXQgb2YgcmFuZ2UgdmFsdWUgZm9yIGNvbHVtbiAn
Y29sNzAnIGF0IHJvdyAxCitXYXJuaW5nCTEyNjQJT3V0IG9mIHJhbmdlIHZhbHVlIGZvciBjb2x1
bW4gJ2NvbDc4JyBhdCByb3cgMQorV2FybmluZwkxMjY1CURhdGEgdHJ1bmNhdGVkIGZvciBjb2x1
bW4gJ2NvbDc5JyBhdCByb3cgMQorV2FybmluZwkxMjY0CU91dCBvZiByYW5nZSB2YWx1ZSBmb3Ig
Y29sdW1uICdjb2w4NCcgYXQgcm93IDEKK1NIT1cgV0FSTklOR1M7CitMZXZlbAlDb2RlCU1lc3Nh
Z2UKK1dhcm5pbmcJMTI2NQlEYXRhIHRydW5jYXRlZCBmb3IgY29sdW1uICdjb2w1MycgYXQgcm93
IDEKK1dhcm5pbmcJMTI2NAlPdXQgb2YgcmFuZ2UgdmFsdWUgZm9yIGNvbHVtbiAnY29sNTQnIGF0
IHJvdyAxCitXYXJuaW5nCTEyNjUJRGF0YSB0cnVuY2F0ZWQgZm9yIGNvbHVtbiAnY29sNTknIGF0
IHJvdyAxCitXYXJuaW5nCTEyNjUJRGF0YSB0cnVuY2F0ZWQgZm9yIGNvbHVtbiAnY29sNjEnIGF0
IHJvdyAxCitXYXJuaW5nCTEyNjQJT3V0IG9mIHJhbmdlIHZhbHVlIGZvciBjb2x1bW4gJ2NvbDY0
JyBhdCByb3cgMQorV2FybmluZwkxMjY1CURhdGEgdHJ1bmNhdGVkIGZvciBjb2x1bW4gJ2NvbDY1
JyBhdCByb3cgMQorV2FybmluZwkxMjY0CU91dCBvZiByYW5nZSB2YWx1ZSBmb3IgY29sdW1uICdj
b2w2NicgYXQgcm93IDEKK1dhcm5pbmcJMTI2NQlEYXRhIHRydW5jYXRlZCBmb3IgY29sdW1uICdj
b2w2OCcgYXQgcm93IDEKK1dhcm5pbmcJMTI2NQlEYXRhIHRydW5jYXRlZCBmb3IgY29sdW1uICdj
b2w2OScgYXQgcm93IDEKK1dhcm5pbmcJMTI2NAlPdXQgb2YgcmFuZ2UgdmFsdWUgZm9yIGNvbHVt
biAnY29sNzAnIGF0IHJvdyAxCitXYXJuaW5nCTEyNjQJT3V0IG9mIHJhbmdlIHZhbHVlIGZvciBj
b2x1bW4gJ2NvbDc4JyBhdCByb3cgMQorV2FybmluZwkxMjY1CURhdGEgdHJ1bmNhdGVkIGZvciBj
b2x1bW4gJ2NvbDc5JyBhdCByb3cgMQorV2FybmluZwkxMjY0CU91dCBvZiByYW5nZSB2YWx1ZSBm
b3IgY29sdW1uICdjb2w4NCcgYXQgcm93IDEKK0RST1AgVEFCTEUgYnVnNTI3NDU7CitTRVQgR0xP
QkFMIGlubm9kYl9maWxlX2Zvcm1hdD1BbnRlbG9wZTsKK1NFVCBHTE9CQUwgaW5ub2RiX2ZpbGVf
Zm9ybWF0X2NoZWNrPUFudGVsb3BlOworU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9wZXJfdGFibGU9
MDsKCj09PSBhZGRlZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5v
ZGJfYnVnNTI3NDUudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3Qv
aW5ub2RiX2J1ZzUyNzQ1LnRlc3QJMTk3MC0wMS0wMSAwMDowMDowMCArMDAwMAorKysgYi9teXNx
bC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVnNTI3NDUudGVzdAkyMDEwLTA0
LTI2IDExOjA4OjU2ICswMDAwCkBAIC0wLDAgKzEsMTA5IEBACistLSBzb3VyY2UgaW5jbHVkZS9o
YXZlX2lubm9kYl9wbHVnaW4uaW5jCisKK2xldCAkZmlsZV9mb3JtYXQ9YHNlbGVjdCBAQGlubm9k
Yl9maWxlX2Zvcm1hdGA7CitsZXQgJGZpbGVfZm9ybWF0X2NoZWNrPWBzZWxlY3QgQEBpbm5vZGJf
ZmlsZV9mb3JtYXRfY2hlY2tgOworbGV0ICRmaWxlX3Blcl90YWJsZT1gc2VsZWN0IEBAaW5ub2Ri
X2ZpbGVfcGVyX3RhYmxlYDsKK1NFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfZm9ybWF0PSdCYXJyYWN1
ZGEnOworU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9wZXJfdGFibGU9b247CisKK0NSRUFURSBUQUJM
RSBidWc1Mjc0NSAoCisgIGEyIGludCgxMCkgdW5zaWduZWQgREVGQVVMVCBOVUxMLAorICBjb2wz
NyB0aW1lIERFRkFVTFQgTlVMTCwKKyAgY29sMzggY2hhcigyMjkpIENIQVJBQ1RFUiBTRVQgdXRm
OCBERUZBVUxUIE5VTEwsCisgIGNvbDM5IHRleHQsCisgIGNvbDQwIHRpbWVzdGFtcCBOT1QgTlVM
TCBERUZBVUxUIENVUlJFTlRfVElNRVNUQU1QIE9OIFVQREFURSBDVVJSRU5UX1RJTUVTVEFNUCwK
KyAgY29sNDEgaW50KDEwKSB1bnNpZ25lZCBERUZBVUxUIE5VTEwsCisgIGNvbDQyIHZhcmNoYXIo
MjQ4KSBDSEFSQUNURVIgU0VUIHV0ZjggREVGQVVMVCBOVUxMLAorICBjb2w0MyBzbWFsbGludCg1
KSB1bnNpZ25lZCB6ZXJvZmlsbCBERUZBVUxUIE5VTEwsCisgIGNvbDQ0IHZhcmNoYXIoMTUwKSBD
SEFSQUNURVIgU0VUIHV0ZjggREVGQVVMVCBOVUxMLAorICBjb2w0NSBmbG9hdCB1bnNpZ25lZCB6
ZXJvZmlsbCBERUZBVUxUIE5VTEwsCisgIGNvbDQ2IGJpbmFyeSgxKSBERUZBVUxUIE5VTEwsCisg
IGNvbDQ3IHRpbnlpbnQoNCkgREVGQVVMVCBOVUxMLAorICBjb2w0OCB0aW55aW50KDEpIERFRkFV
TFQgTlVMTCwKKyAgY29sNDkgdGltZXN0YW1wIE5PVCBOVUxMIERFRkFVTFQgJzAwMDAtMDAtMDAg
MDA6MDA6MDAnLAorICBjb2w1MCBiaW5hcnkoMSkgREVGQVVMVCBOVUxMLAorICBjb2w1MSBkb3Vi
bGUgdW5zaWduZWQgemVyb2ZpbGwgREVGQVVMVCBOVUxMLAorICBjb2w1MiBpbnQoMTApIHVuc2ln
bmVkIERFRkFVTFQgTlVMTCwKKyAgY29sNTMgdGltZSBERUZBVUxUIE5VTEwsCisgIGNvbDU0IGRv
dWJsZSB1bnNpZ25lZCBERUZBVUxUIE5VTEwsCisgIGNvbDU1IHRpbWUgREVGQVVMVCBOVUxMLAor
ICBjb2w1NiBtZWRpdW10ZXh0IENIQVJBQ1RFUiBTRVQgbGF0aW4yLAorICBjb2w1NyBibG9iLAor
ICBjb2w1OCBkZWNpbWFsKDUyLDE2KSB1bnNpZ25lZCB6ZXJvZmlsbCBOT1QgTlVMTCBERUZBVUxU
ICcwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuMDAwMDAwMDAwMDAwMDAwMCcs
CisgIGNvbDU5IGJpbmFyeSgxKSBERUZBVUxUIE5VTEwsCisgIGNvbDYwIGxvbmdibG9iLAorICBj
b2w2MSB0aW1lIERFRkFVTFQgTlVMTCwKKyAgY29sNjIgbG9uZ3RleHQgQ0hBUkFDVEVSIFNFVCB1
dGY4IENPTExBVEUgdXRmOF9wZXJzaWFuX2NpLAorICBjb2w2MyB0aW1lc3RhbXAgTk9UIE5VTEwg
REVGQVVMVCAnMDAwMC0wMC0wMCAwMDowMDowMCcsCisgIGNvbDY0IGludCgxMCkgdW5zaWduZWQg
REVGQVVMVCBOVUxMLAorICBjb2w2NSBkYXRlIERFRkFVTFQgTlVMTCwKKyAgY29sNjYgdGltZXN0
YW1wIE5PVCBOVUxMIERFRkFVTFQgJzAwMDAtMDAtMDAgMDA6MDA6MDAnLAorICBjb2w2NyBiaW5h
cnkoMSkgREVGQVVMVCBOVUxMLAorICBjb2w2OCB0aW55YmxvYiwKKyAgY29sNjkgZGF0ZSBERUZB
VUxUIE5VTEwsCisgIGNvbDcwIHRpbnlpbnQoMykgdW5zaWduZWQgemVyb2ZpbGwgREVGQVVMVCBO
VUxMLAorICBjb2w3MSB2YXJjaGFyKDQ0KSBDSEFSQUNURVIgU0VUIHV0ZjggREVGQVVMVCBOVUxM
LAorICBjb2w3MiBkYXRldGltZSBERUZBVUxUIE5VTEwsCisgIGNvbDczIHNtYWxsaW50KDUpIHVu
c2lnbmVkIHplcm9maWxsIERFRkFVTFQgTlVMTCwKKyAgY29sNzQgbG9uZ2Jsb2IsCisgIGNvbDc1
IGJpdCgzNCkgREVGQVVMVCBOVUxMLAorICBjb2w3NiBmbG9hdCB1bnNpZ25lZCB6ZXJvZmlsbCBE
RUZBVUxUIE5VTEwsCisgIGNvbDc3IHllYXIoMikgREVGQVVMVCBOVUxMLAorICBjb2w3OCB0aW55
aW50KDMpIHVuc2lnbmVkIERFRkFVTFQgTlVMTCwKKyAgY29sNzkgc2V0KCdtc2ZoZW93aCcsJ3Ri
cHhiZ2YnLCdieScsJ3dhaG5yancnLCdteXFmYXN4eicsJ3Jzb2t5dW1ydCcpIENIQVJBQ1RFUiBT
RVQgbGF0aW4yIERFRkFVTFQgTlVMTCwKKyAgY29sODAgZGF0ZXRpbWUgREVGQVVMVCBOVUxMLAor
ICBjb2w4MSBzbWFsbGludCg2KSBERUZBVUxUIE5VTEwsCisgIGNvbDgyIGVudW0oJ3h0YXVybnFm
cXonLCdyaWZyc2UnLCdrdXp3cGJ2YicsJ25paXNhYmsnLCd6eGF2cm8nLCdyYnZhc3YnLCcnLCd1
dWxyZmFvdmUnLCcnLCcnKSBERUZBVUxUIE5VTEwsCisgIGNvbDgzIGJpZ2ludCgyMCkgdW5zaWdu
ZWQgemVyb2ZpbGwgREVGQVVMVCBOVUxMLAorICBjb2w4NCBmbG9hdCB1bnNpZ25lZCB6ZXJvZmls
bCBERUZBVUxUIE5VTEwsCisgIGNvbDg1IGRvdWJsZSBERUZBVUxUIE5VTEwsCisgIGNvbDg2IGVu
dW0oJ3lsYW5udicsJycsJ3Zsa2h5Y3FjJywnc25rZScsJ2N4aWZ1c3RwJywneGlheGFzd3pwJywn
b3hsJykgQ0hBUkFDVEVSIFNFVCBsYXRpbjEgQ09MTEFURSBsYXRpbjFfZ2VybWFuMl9jaSBERUZB
VUxUIE5VTEwsCisgIGNvbDg3IHZhcmJpbmFyeSgyMjEpIERFRkFVTFQgTlVMTCwKKyAgY29sODgg
ZG91YmxlIHVuc2lnbmVkIERFRkFVTFQgTlVMTCwKKyAgY29sODkgZmxvYXQgdW5zaWduZWQgemVy
b2ZpbGwgREVGQVVMVCBOVUxMLAorICBjb2w5MCB0aW55YmxvYgorKSBFTkdJTkU9SW5ub0RCIERF
RkFVTFQgQ0hBUlNFVD1sYXRpbjEgUk9XX0ZPUk1BVD1DT01QUkVTU0VEIEtFWV9CTE9DS19TSVpF
PTE7CisKK0lOU0VSVCBJTlRPIGJ1ZzUyNzQ1IFNFVAorY29sNDA9JzAwMDAtMDAtMDAgMDA6MDA6
MDAnLAorY29sNTE9MTY1NDcsCitjb2w1Mz0nNzcxMTQ4NCcsCitjb2w1ND0tMjg2MDQsCitjb2w1
NT0nNzExMjYxMicsCitjb2w1Nj0nd2FrZWZ1bG5lc3NcJycsCitjb2w1Nz1yZXBlYXQoJ2Fic29y
YmVmYWNpZW50XCcnLDEwNiksCitjb2w1OD0xMTAyNywKK2NvbDU5PSdBTTA5Z1c3JywKK2NvbDYw
PXJlcGVhdCgnTm9lbGFuaVwnJywxNiksCitjb2w2MT0nMjUyMDU3NicsCitjb2w2Mj0nc3Vic3Rp
dHV0aXYnLAorY29sNjM9JzE5OTUwMTA2MTU1MTEyJywKK2NvbDY0PS0xMjAzOCwKK2NvbDY1PSc4
NjIzODgwNicsCitjb2w2Nj0nMTk2MDA3MTkwODAyNTYnLAorY29sNjg9cmVwZWF0KCdTYWdpdHRh
cml1c1wnJyw1NCksCitjb2w2OT0nMzg5NDM5MDInLAorY29sNzA9MTIzMiwKK2NvbDcxPSdFbG9y
YVwnJywKK2NvbDc0PXJlcGVhdCgnemlwcCcsMTEpLAorY29sNzU9JzAnLAorY29sNzY9MjMyNTQs
Citjb2w3OD0xMzI0NywKK2NvbDc5PSc1NjIxOScsCitjb2w4MD0nMjA1MDA2MDkwMzU3MjQnLAor
Y29sODE9MTE2MzIsCitjb2w4Mj03LAorY29sODQ9LTIzODYzLAorY29sODU9NjM0MSwKK2NvbDg3
PSdIWmRrZi40IHM3dCw1Um1xCThzbyBmbXIscnVHTFVHMjVUcnRJLnlRCTJTdUhxME1MN3J3Ny40
IGIyeWYyRTVUSnhPdEJCWkltZXpEbnpwaix1UFlmem5uRVVETjFlOWFRb08gMkRzcGxCN1RGV3kJ
b1FKIGJyICBITEYgOkYsZVEgcDRpMW9Xc3IgbEwzUEcsaGpDejZoWXFOIGgxUVRqTENqcnY6UUNk
U3pwWUJpYkpBdFpDeExPazNsNkJsc2guVycsCitjb2w4OD0xNjg5NCwKK2NvbDg5PTYxNjEsCitj
b2w5MD1yZXBlYXQoJ2dhbGUnLDQ4KTsKKworU0hPVyBXQVJOSU5HUzsKKworRFJPUCBUQUJMRSBi
dWc1Mjc0NTsKKworRVZBTCBTRVQgR0xPQkFMIGlubm9kYl9maWxlX2Zvcm1hdD0kZmlsZV9mb3Jt
YXQ7CitFVkFMIFNFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfZm9ybWF0X2NoZWNrPSRmaWxlX2Zvcm1h
dF9jaGVjazsKK0VWQUwgU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9wZXJfdGFibGU9JGZpbGVfcGVy
X3RhYmxlOwoK

--===============1149117073==
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:05 +0300
# base_revision_id: marko.makela@stripped\
#   2e9nzq8z0nfwxjky
# 
# Begin bundle
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
7m7JrI7cNTqYczxOCLfAvf/i7kinChIH48oXQA==


--===============1149117073==--