From: marko.makela
Date: May 5 2010 10:44am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3449)
List-Archive: http://lists.mysql.com/commits/107475
Message-Id: <201005051044.o45AOc4Y020382@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1175337234=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDUxMDQwMDEtODgzcHFp
ZXBvMzg0cXI1aAoKIDM0NDkgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNQogICAgICBGYWN0b3Ig
b3V0IGlubm9kYl9tdWx0aV91cGRhdGUudGVzdCBmcm9tIGlubm9kYi50ZXN0CgogICAgYWRkZWQ6
CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi9yL2lubm9kYl9tdWx0aV91cGRh
dGUucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2Rpc2FibGVk
LmRlZgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfbXVsdGlf
dXBkYXRlLnRlc3QKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9w
bHVnaW4vci9pbm5vZGIucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdp
bi90L2lubm9kYi50ZXN0Cj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9k
Yl9wbHVnaW4vci9pbm5vZGIucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYl9w
bHVnaW4vci9pbm5vZGIucmVzdWx0CTIwMTAtMDQtMDkgMTM6MDc6NDEgKzAwMDAKKysrIGIvbXlz
cWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiLnJlc3VsdAkyMDEwLTA1LTA1IDEw
OjQ0OjI1ICswMDAwCkBAIC0xMTg0LDgyICsxMTg0LDYgQEAgYQliCiA4CTgKIDkJOQogZHJvcCB0
YWJsZSB0MTsKLUNSRUFURSBUQUJMRSB0MSAoYSBpbnQgbm90IG51bGwgcHJpbWFyeSBrZXksIGIg
aW50IG5vdCBudWxsLCBrZXkgKGIpKSBlbmdpbmU9aW5ub2RiOwotQ1JFQVRFIFRBQkxFIHQyIChh
IGludCBub3QgbnVsbCBwcmltYXJ5IGtleSwgYiBpbnQgbm90IG51bGwsIGtleSAoYikpIGVuZ2lu
ZT1pbm5vZGI7Ci1JTlNFUlQgSU5UTyB0MSB2YWx1ZXMgKDEsMSksKDIsMiksKDMsMyksKDQsNCks
KDUsNSksKDYsNiksKDcsNyksKDgsOCksKDksOSksKDEwLDEwKSwoMTEsMTEpLCgxMiwxMik7Ci1J
TlNFUlQgSU5UTyB0MiB2YWx1ZXMgKDEsMSksKDIsMiksKDMsMyksKDQsNCksKDUsNSksKDYsNiks
KDcsNyksKDgsOCksKDksOSk7Ci11cGRhdGUgdDEsdDIgc2V0IHQxLmE9dDEuYSsxMDA7Ci1zZWxl
Y3QgKiBmcm9tIHQxOwotYQliCi0xMDEJMQotMTAyCTIKLTEwMwkzCi0xMDQJNAotMTA1CTUKLTEw
Ngk2Ci0xMDcJNwotMTA4CTgKLTEwOQk5Ci0xMTAJMTAKLTExMQkxMQotMTEyCTEyCi11cGRhdGUg
dDEsdDIgc2V0IHQxLmE9dDEuYSsxMDAgd2hlcmUgdDEuYT0xMDE7Ci1zZWxlY3QgKiBmcm9tIHQx
OwotYQliCi0yMDEJMQotMTAyCTIKLTEwMwkzCi0xMDQJNAotMTA1CTUKLTEwNgk2Ci0xMDcJNwot
MTA4CTgKLTEwOQk5Ci0xMTAJMTAKLTExMQkxMQotMTEyCTEyCi11cGRhdGUgdDEsdDIgc2V0IHQx
LmI9dDEuYisxMCB3aGVyZSB0MS5iPTI7Ci1zZWxlY3QgKiBmcm9tIHQxOwotYQliCi0yMDEJMQot
MTAzCTMKLTEwNAk0Ci0xMDUJNQotMTA2CTYKLTEwNwk3Ci0xMDgJOAotMTA5CTkKLTExMAkxMAot
MTExCTExCi0xMDIJMTIKLTExMgkxMgotdXBkYXRlIHQxLHQyIHNldCB0MS5iPXQxLmIrMix0Mi5i
PXQxLmIrMTAgd2hlcmUgdDEuYiBiZXR3ZWVuIDMgYW5kIDUgYW5kIHQxLmE9dDIuYSsxMDA7Ci1z
ZWxlY3QgKiBmcm9tIHQxOwotYQliCi0yMDEJMQotMTAzCTUKLTEwNAk2Ci0xMDYJNgotMTA1CTcK
LTEwNwk3Ci0xMDgJOAotMTA5CTkKLTExMAkxMAotMTExCTExCi0xMDIJMTIKLTExMgkxMgotc2Vs
ZWN0ICogZnJvbSB0MjsKLWEJYgotMQkxCi0yCTIKLTYJNgotNwk3Ci04CTgKLTkJOQotMwkxMwot
NAkxNAotNQkxNQotZHJvcCB0YWJsZSB0MSx0MjsKIENSRUFURSBUQUJMRSB0MiAoICAgTkVYVF9U
ICAgICAgICAgQklHSU5UIE5PVCBOVUxMIFBSSU1BUlkgS0VZKSBFTkdJTkU9TXlJU0FNOwogQ1JF
QVRFIFRBQkxFIHQxICggIEJfSUQgICAgICAgICAgIElOVEVHRVIgTk9UIE5VTEwgUFJJTUFSWSBL
RVkpIEVOR0lORT1Jbm5vREI7CiBTRVQgQVVUT0NPTU1JVD0wOwpAQCAtMTc1MiwxMCArMTY3Niwx
MCBAQCB2YXJpYWJsZV92YWx1ZSAtIEBpbm5vZGJfcm93c19kZWxldGVkX29yCiA3MQogU0VMRUNU
IHZhcmlhYmxlX3ZhbHVlIC0gQGlubm9kYl9yb3dzX2luc2VydGVkX29yaWcgRlJPTSBpbmZvcm1h
dGlvbl9zY2hlbWEuZ2xvYmFsX3N0YXR1cyBXSEVSRSBMT1dFUih2YXJpYWJsZV9uYW1lKSA9ICdp
bm5vZGJfcm93c19pbnNlcnRlZCc7CiB2YXJpYWJsZV92YWx1ZSAtIEBpbm5vZGJfcm93c19pbnNl
cnRlZF9vcmlnCi0xMDg3CisxMDY2CiBTRUxFQ1QgdmFyaWFibGVfdmFsdWUgLSBAaW5ub2RiX3Jv
d3NfdXBkYXRlZF9vcmlnIEZST00gaW5mb3JtYXRpb25fc2NoZW1hLmdsb2JhbF9zdGF0dXMgV0hF
UkUgTE9XRVIodmFyaWFibGVfbmFtZSkgPSAnaW5ub2RiX3Jvd3NfdXBkYXRlZCc7CiB2YXJpYWJs
ZV92YWx1ZSAtIEBpbm5vZGJfcm93c191cGRhdGVkX29yaWcKLTg4NQorODY1CiBTRUxFQ1QgdmFy
aWFibGVfdmFsdWUgLSBAaW5ub2RiX3Jvd19sb2NrX3dhaXRzX29yaWcgRlJPTSBpbmZvcm1hdGlv
bl9zY2hlbWEuZ2xvYmFsX3N0YXR1cyBXSEVSRSBMT1dFUih2YXJpYWJsZV9uYW1lKSA9ICdpbm5v
ZGJfcm93X2xvY2tfd2FpdHMnOwogdmFyaWFibGVfdmFsdWUgLSBAaW5ub2RiX3Jvd19sb2NrX3dh
aXRzX29yaWcKIDAKCj09PSBhZGRlZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVn
aW4vci9pbm5vZGJfbXVsdGlfdXBkYXRlLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGJfcGx1Z2luL3IvaW5ub2RiX211bHRpX3VwZGF0ZS5yZXN1bHQJMTk3MC0wMS0wMSAwMDow
MDowMCArMDAwMAorKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGJf
bXVsdGlfdXBkYXRlLnJlc3VsdAkyMDEwLTA1LTA1IDEwOjQ0OjI1ICswMDAwCkBAIC0wLDAgKzEs
NzYgQEAKK0NSRUFURSBUQUJMRSBidWczODk5OV8xIChhIGludCBub3QgbnVsbCBwcmltYXJ5IGtl
eSwgYiBpbnQgbm90IG51bGwsIGtleSAoYikpIGVuZ2luZT1pbm5vZGI7CitDUkVBVEUgVEFCTEUg
YnVnMzg5OTlfMiAoYSBpbnQgbm90IG51bGwgcHJpbWFyeSBrZXksIGIgaW50IG5vdCBudWxsLCBr
ZXkgKGIpKSBlbmdpbmU9aW5ub2RiOworSU5TRVJUIElOVE8gYnVnMzg5OTlfMSB2YWx1ZXMgKDEs
MSksKDIsMiksKDMsMyksKDQsNCksKDUsNSksKDYsNiksKDcsNyksKDgsOCksKDksOSksKDEwLDEw
KSwoMTEsMTEpLCgxMiwxMik7CitJTlNFUlQgSU5UTyBidWczODk5OV8yIHZhbHVlcyAoMSwxKSwo
MiwyKSwoMywzKSwoNCw0KSwoNSw1KSwoNiw2KSwoNyw3KSwoOCw4KSwoOSw5KTsKK3VwZGF0ZSBi
dWczODk5OV8xLGJ1ZzM4OTk5XzIgc2V0IGJ1ZzM4OTk5XzEuYT1idWczODk5OV8xLmErMTAwOwor
c2VsZWN0ICogZnJvbSBidWczODk5OV8xOworYQliCisxMDEJMQorMTAyCTIKKzEwMwkzCisxMDQJ
NAorMTA1CTUKKzEwNgk2CisxMDcJNworMTA4CTgKKzEwOQk5CisxMTAJMTAKKzExMQkxMQorMTEy
CTEyCit1cGRhdGUgYnVnMzg5OTlfMSxidWczODk5OV8yIHNldCBidWczODk5OV8xLmE9YnVnMzg5
OTlfMS5hKzEwMCB3aGVyZSBidWczODk5OV8xLmE9MTAxOworc2VsZWN0ICogZnJvbSBidWczODk5
OV8xOworYQliCisyMDEJMQorMTAyCTIKKzEwMwkzCisxMDQJNAorMTA1CTUKKzEwNgk2CisxMDcJ
NworMTA4CTgKKzEwOQk5CisxMTAJMTAKKzExMQkxMQorMTEyCTEyCit1cGRhdGUgYnVnMzg5OTlf
MSxidWczODk5OV8yIHNldCBidWczODk5OV8xLmI9YnVnMzg5OTlfMS5iKzEwIHdoZXJlIGJ1ZzM4
OTk5XzEuYj0yOworc2VsZWN0ICogZnJvbSBidWczODk5OV8xOworYQliCisyMDEJMQorMTAzCTMK
KzEwNAk0CisxMDUJNQorMTA2CTYKKzEwNwk3CisxMDgJOAorMTA5CTkKKzExMAkxMAorMTExCTEx
CisxMDIJMTIKKzExMgkxMgordXBkYXRlIGJ1ZzM4OTk5XzEsYnVnMzg5OTlfMiBzZXQgYnVnMzg5
OTlfMS5iPWJ1ZzM4OTk5XzEuYisyLGJ1ZzM4OTk5XzIuYj1idWczODk5OV8xLmIrMTAgd2hlcmUg
YnVnMzg5OTlfMS5iIGJldHdlZW4gMyBhbmQgNSBhbmQgYnVnMzg5OTlfMS5hPWJ1ZzM4OTk5XzIu
YSsxMDA7CitzZWxlY3QgKiBmcm9tIGJ1ZzM4OTk5XzE7CithCWIKKzIwMQkxCisxMDMJNQorMTA0
CTYKKzEwNgk2CisxMDUJNworMTA3CTcKKzEwOAk4CisxMDkJOQorMTEwCTEwCisxMTEJMTEKKzEw
MgkxMgorMTEyCTEyCitzZWxlY3QgKiBmcm9tIGJ1ZzM4OTk5XzI7CithCWIKKzEJMQorMgkyCis2
CTYKKzcJNworOAk4Cis5CTkKKzMJMTMKKzQJMTQKKzUJMTUKK2Ryb3AgdGFibGUgYnVnMzg5OTlf
MSxidWczODk5OV8yOwoKPT09IGFkZGVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3Bs
dWdpbi90L2Rpc2FibGVkLmRlZicKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2lu
L3QvZGlzYWJsZWQuZGVmCTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysrIGIvbXlzcWwtdGVz
dC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvZGlzYWJsZWQuZGVmCTIwMTAtMDUtMDUgMTA6NDQ6MjUg
KzAwMDAKQEAgLTAsMCArMSwxMiBAQAorIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCisjCisjICBMaXN0
IHRoZSB0ZXN0IGNhc2VzIHRoYXQgYXJlIHRvIGJlIGRpc2FibGVkIHRlbXBvcmFyaWx5LgorIwor
IyAgU2VwYXJhdGUgdGhlIHRlc3QgY2FzZSBuYW1lIGFuZCB0aGUgY29tbWVudCB3aXRoICc6Jy4K
KyMKKyMgICAgPHRlc3RjYXNlbmFtZT4gOiBCVUcjPHh4eHg+IDxkYXRlIGRpc2FibGVkPiA8ZGlz
YWJsZXI+IDxjb21tZW50PgorIworIyAgRG8gbm90IHVzZSBhbnkgVEFCIGNoYXJhY3RlcnMgZm9y
IHdoaXRlc3BhY2UuCisjCisjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKK2lubm9kYl9tdWx0aV91cGRh
dGU6IEJ1ZyAjMzg5OTkgMjAxMC0wNS0wNSBtbWFrZWxhIFZhbGdyaW5kIHdhcm5pbmdzCgo9PT0g
bW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiLnRl
c3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYi50ZXN0CTIw
MTAtMDQtMDkgMTM6MDc6NDEgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1
Z2luL3QvaW5ub2RiLnRlc3QJMjAxMC0wNS0wNSAxMDo0NDoyNSArMDAwMApAQCAtOTE1LDMzICs5
MTUsNiBAQCBVUERBVEUgdDEgc2V0IGE9YSsxMDAgd2hlcmUgYiBiZXR3ZWVuIDIKIFNFTEVDVCAq
IGZyb20gdDE7CiBkcm9wIHRhYmxlIHQxOwogCi0jCi0jIFRlc3QgbXVsdGkgdXBkYXRlIHdpdGgg
ZGlmZmVyZW50IGpvaW4gbWV0aG9kcwotIwotCi1DUkVBVEUgVEFCTEUgdDEgKGEgaW50IG5vdCBu
dWxsIHByaW1hcnkga2V5LCBiIGludCBub3QgbnVsbCwga2V5IChiKSkgZW5naW5lPWlubm9kYjsK
LUNSRUFURSBUQUJMRSB0MiAoYSBpbnQgbm90IG51bGwgcHJpbWFyeSBrZXksIGIgaW50IG5vdCBu
dWxsLCBrZXkgKGIpKSBlbmdpbmU9aW5ub2RiOwotSU5TRVJUIElOVE8gdDEgdmFsdWVzICgxLDEp
LCgyLDIpLCgzLDMpLCg0LDQpLCg1LDUpLCg2LDYpLCg3LDcpLCg4LDgpLCg5LDkpLCgxMCwxMCks
KDExLDExKSwoMTIsMTIpOwotSU5TRVJUIElOVE8gdDIgdmFsdWVzICgxLDEpLCgyLDIpLCgzLDMp
LCg0LDQpLCg1LDUpLCg2LDYpLCg3LDcpLCg4LDgpLCg5LDkpOwotCi0jIEZ1bGwgam9pbiwgd2l0
aG91dCBrZXkKLXVwZGF0ZSB0MSx0MiBzZXQgdDEuYT10MS5hKzEwMDsKLXNlbGVjdCAqIGZyb20g
dDE7Ci0KLSMgdW5pcXVlIGtleQotdXBkYXRlIHQxLHQyIHNldCB0MS5hPXQxLmErMTAwIHdoZXJl
IHQxLmE9MTAxOwotc2VsZWN0ICogZnJvbSB0MTsKLQotIyByZWYga2V5Ci11cGRhdGUgdDEsdDIg
c2V0IHQxLmI9dDEuYisxMCB3aGVyZSB0MS5iPTI7Ci1zZWxlY3QgKiBmcm9tIHQxOwotCi0jIFJh
bmdlIGtleSAoaW4gdDEpCi11cGRhdGUgdDEsdDIgc2V0IHQxLmI9dDEuYisyLHQyLmI9dDEuYisx
MCB3aGVyZSB0MS5iIGJldHdlZW4gMyBhbmQgNSBhbmQgdDEuYT10Mi5hKzEwMDsKLXNlbGVjdCAq
IGZyb20gdDE7Ci1zZWxlY3QgKiBmcm9tIHQyOwotCi1kcm9wIHRhYmxlIHQxLHQyOwogQ1JFQVRF
IFRBQkxFIHQyICggICBORVhUX1QgICAgICAgICBCSUdJTlQgTk9UIE5VTEwgUFJJTUFSWSBLRVkp
IEVOR0lORT1NeUlTQU07CiBDUkVBVEUgVEFCTEUgdDEgKCAgQl9JRCAgICAgICAgICAgSU5URUdF
UiBOT1QgTlVMTCBQUklNQVJZIEtFWSkgRU5HSU5FPUlubm9EQjsKIFNFVCBBVVRPQ09NTUlUPTA7
Cgo9PT0gYWRkZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2Ri
X211bHRpX3VwZGF0ZS50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4v
dC9pbm5vZGJfbXVsdGlfdXBkYXRlLnRlc3QJMTk3MC0wMS0wMSAwMDowMDowMCArMDAwMAorKysg
Yi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfbXVsdGlfdXBkYXRlLnRl
c3QJMjAxMC0wNS0wNSAxMDo0NDoyNSArMDAwMApAQCAtMCwwICsxLDI5IEBACistLSBzb3VyY2Ug
aW5jbHVkZS9oYXZlX2lubm9kYi5pbmMKKworIworIyBUZXN0IG11bHRpIHVwZGF0ZSB3aXRoIGRp
ZmZlcmVudCBqb2luIG1ldGhvZHMKKyMKKworQ1JFQVRFIFRBQkxFIGJ1ZzM4OTk5XzEgKGEgaW50
IG5vdCBudWxsIHByaW1hcnkga2V5LCBiIGludCBub3QgbnVsbCwga2V5IChiKSkgZW5naW5lPWlu
bm9kYjsKK0NSRUFURSBUQUJMRSBidWczODk5OV8yIChhIGludCBub3QgbnVsbCBwcmltYXJ5IGtl
eSwgYiBpbnQgbm90IG51bGwsIGtleSAoYikpIGVuZ2luZT1pbm5vZGI7CitJTlNFUlQgSU5UTyBi
dWczODk5OV8xIHZhbHVlcyAoMSwxKSwoMiwyKSwoMywzKSwoNCw0KSwoNSw1KSwoNiw2KSwoNyw3
KSwoOCw4KSwoOSw5KSwoMTAsMTApLCgxMSwxMSksKDEyLDEyKTsKK0lOU0VSVCBJTlRPIGJ1ZzM4
OTk5XzIgdmFsdWVzICgxLDEpLCgyLDIpLCgzLDMpLCg0LDQpLCg1LDUpLCg2LDYpLCg3LDcpLCg4
LDgpLCg5LDkpOworCisjIEZ1bGwgam9pbiwgd2l0aG91dCBrZXkKK3VwZGF0ZSBidWczODk5OV8x
LGJ1ZzM4OTk5XzIgc2V0IGJ1ZzM4OTk5XzEuYT1idWczODk5OV8xLmErMTAwOworc2VsZWN0ICog
ZnJvbSBidWczODk5OV8xOworCisjIHVuaXF1ZSBrZXkKK3VwZGF0ZSBidWczODk5OV8xLGJ1ZzM4
OTk5XzIgc2V0IGJ1ZzM4OTk5XzEuYT1idWczODk5OV8xLmErMTAwIHdoZXJlIGJ1ZzM4OTk5XzEu
YT0xMDE7CitzZWxlY3QgKiBmcm9tIGJ1ZzM4OTk5XzE7CisKKyMgcmVmIGtleQordXBkYXRlIGJ1
ZzM4OTk5XzEsYnVnMzg5OTlfMiBzZXQgYnVnMzg5OTlfMS5iPWJ1ZzM4OTk5XzEuYisxMCB3aGVy
ZSBidWczODk5OV8xLmI9MjsKK3NlbGVjdCAqIGZyb20gYnVnMzg5OTlfMTsKKworIyBSYW5nZSBr
ZXkgKGluIGJ1ZzM4OTk5XzEpCit1cGRhdGUgYnVnMzg5OTlfMSxidWczODk5OV8yIHNldCBidWcz
ODk5OV8xLmI9YnVnMzg5OTlfMS5iKzIsYnVnMzg5OTlfMi5iPWJ1ZzM4OTk5XzEuYisxMCB3aGVy
ZSBidWczODk5OV8xLmIgYmV0d2VlbiAzIGFuZCA1IGFuZCBidWczODk5OV8xLmE9YnVnMzg5OTlf
Mi5hKzEwMDsKK3NlbGVjdCAqIGZyb20gYnVnMzg5OTlfMTsKK3NlbGVjdCAqIGZyb20gYnVnMzg5
OTlfMjsKKworZHJvcCB0YWJsZSBidWczODk5OV8xLGJ1ZzM4OTk5XzI7Cgo=

--===============1175337234==
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: 947460ec7b60d3743d1e4827b5cfbede24312e89
# timestamp: 2010-05-05 13:44:33 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   883pqiepo384qr5h
# 
# Begin bundle
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
LsfUfKc+71jd/d50rP9R59t9UvrPYbfS67oJwa96d5P9e2Ph4T3549L5pfF5tSkn8fJIYE5DtkM8
ddHkexrNLoYyHyMI1kVGMpL0Xp+prb0eaj5dUa7oacSvI0+kknH0Q4eHyvJaSoyOM5zUM7Dxx6qv
tqlzHQnDDqGj0NcZsVZ6VrUjNJff8NMtUVDCosvLemXRFyJ2omeHrleKRVQuFpmv9ez/lkPGZ0Ty
1ek/stI7pI1E87pNOr+CLDTdKtNMN/gk9Ofb2sGthdWHRUd/f3yaeUGZNB5M8u24fVNJp0q/H6X2
JM02w8JhHNy3d9bnulLEXUPOVbmvS270uuSe45/fjG+pdpnYkzZ8/OdlpDXO9bLukZe9mOTRM9Ml
sxTS05sTTRkquhOlv0c6K7q5xm4l6cyYM5LRoky92blCpMaRmFRjFFu7X5I0sBdNnhVrDoFqtldK
UYZN99+ZinzI2r16H91X7Iw2aLu29R8hXbqi9FYLGy122h0sHWrRtG6ZJK3qZVJfGfQvdDtnXr7K
Pv8Ig0R82oZrj0hzaml4C7vGPPdRRzuvTNvDeTlNno6LmjrUjs+1oM8i52aVw1dEZ7jK7uSX27/t
mhuh8q/n7077u1na+3I//F3JFOFCQcsRYVw=


--===============1175337234==--