From: marko.makela
Date: May 5 2010 11:03am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3066 to 3067)
List-Archive: http://lists.mysql.com/commits/107490
Message-Id: <201005051103.o45A6KwV008676@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0277839636=="

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

IDMwNjcgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNQogICAgICBNZXJnZSBmcm9tIG15c3FsLTUu
MS1pbm5vZGI6CiAgICAgIAogICAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICAgIHJldm5vOiAzNDQ5CiAgICAgICAg
cmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTA1MTA0NDI1LTM5eTZx
YmZmZ290cmhjazIKICAgICAgICBwYXJlbnQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAw
NTA1MTA0MDAxLTg4M3BxaWVwbzM4NHFyNWgKICAgICAgICBjb21taXR0ZXI6IE1hcmtvIE3DpGtl
bMOkIDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgICBicmFuY2ggbmljazogNS4xLWlu
bm9kYgogICAgICAgIHRpbWVzdGFtcDogV2VkIDIwMTAtMDUtMDUgMTM6NDQ6MjUgKzAzMDAKICAg
ICAgICBtZXNzYWdlOgogICAgICAgICAgRmFjdG9yIG91dCBpbm5vZGJfbXVsdGlfdXBkYXRlLnRl
c3QgZnJvbSBpbm5vZGIudGVzdAoKICAgIGFkZGVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lu
bm9kYi9yL2lubm9kYl9tdWx0aV91cGRhdGUucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUv
aW5ub2RiL3QvaW5ub2RiX211bHRpX3VwZGF0ZS50ZXN0CiAgICBtb2RpZmllZDoKICAgICAgbXlz
cWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGIucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3Vp
dGUvaW5ub2RiL3QvZGlzYWJsZWQuZGVmCiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3Qv
aW5ub2RiLnRlc3QKIDMwNjYgVmFzaWwgRGltb3YJMjAxMC0wNS0wNSBbbWVyZ2VdCiAgICAgIE1l
cmdlIGZyb20gYmstaW50ZXJuYWwgaW50byBteSBsb2NhbCBicmFuY2gKCiAgICBtb2RpZmllZDoK
ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jCj09PSBtb2RpZmllZCBmaWxlICdt
eXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYi5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qv
c3VpdGUvaW5ub2RiL3IvaW5ub2RiLnJlc3VsdAkyMDEwLTA0LTE5IDExOjEwOjQzICswMDAwCisr
KyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLnJlc3VsdAkyMDEwLTA1LTA1IDEx
OjAzOjE0ICswMDAwCkBAIC0xMTg0LDgyICsxMTg0LDYgQEAgYQliCiA4CTgKIDkJOQogZHJvcCB0
YWJsZSB0MTsKLUNSRUFURSBUQUJMRSB0MSAoYSBpbnQgbm90IG51bGwgcHJpbWFyeSBrZXksIGIg
aW50IG5vdCBudWxsLCBrZXkgKGIpKSBlbmdpbmU9aW5ub2RiOwotQ1JFQVRFIFRBQkxFIHQyIChh
IGludCBub3QgbnVsbCBwcmltYXJ5IGtleSwgYiBpbnQgbm90IG51bGwsIGtleSAoYikpIGVuZ2lu
ZT1pbm5vZGI7Ci1JTlNFUlQgSU5UTyB0MSB2YWx1ZXMgKDEsMSksKDIsMiksKDMsMyksKDQsNCks
KDUsNSksKDYsNiksKDcsNyksKDgsOCksKDksOSksKDEwLDEwKSwoMTEsMTEpLCgxMiwxMik7Ci1J
TlNFUlQgSU5UTyB0MiB2YWx1ZXMgKDEsMSksKDIsMiksKDMsMyksKDQsNCksKDUsNSksKDYsNiks
KDcsNyksKDgsOCksKDksOSk7Ci11cGRhdGUgdDEsdDIgc2V0IHQxLmE9dDEuYSsxMDA7Ci1zZWxl
Y3QgKiBmcm9tIHQxOwotYQliCi0xMDEJMQotMTAyCTIKLTEwMwkzCi0xMDQJNAotMTA1CTUKLTEw
Ngk2Ci0xMDcJNwotMTA4CTgKLTEwOQk5Ci0xMTAJMTAKLTExMQkxMQotMTEyCTEyCi11cGRhdGUg
dDEsdDIgc2V0IHQxLmE9dDEuYSsxMDAgd2hlcmUgdDEuYT0xMDE7Ci1zZWxlY3QgKiBmcm9tIHQx
OwotYQliCi0yMDEJMQotMTAyCTIKLTEwMwkzCi0xMDQJNAotMTA1CTUKLTEwNgk2Ci0xMDcJNwot
MTA4CTgKLTEwOQk5Ci0xMTAJMTAKLTExMQkxMQotMTEyCTEyCi11cGRhdGUgdDEsdDIgc2V0IHQx
LmI9dDEuYisxMCB3aGVyZSB0MS5iPTI7Ci1zZWxlY3QgKiBmcm9tIHQxOwotYQliCi0yMDEJMQot
MTAzCTMKLTEwNAk0Ci0xMDUJNQotMTA2CTYKLTEwNwk3Ci0xMDgJOAotMTA5CTkKLTExMAkxMAot
MTExCTExCi0xMDIJMTIKLTExMgkxMgotdXBkYXRlIHQxLHQyIHNldCB0MS5iPXQxLmIrMix0Mi5i
PXQxLmIrMTAgd2hlcmUgdDEuYiBiZXR3ZWVuIDMgYW5kIDUgYW5kIHQxLmE9dDIuYSsxMDA7Ci1z
ZWxlY3QgKiBmcm9tIHQxOwotYQliCi0yMDEJMQotMTAzCTUKLTEwNAk2Ci0xMDYJNgotMTA1CTcK
LTEwNwk3Ci0xMDgJOAotMTA5CTkKLTExMAkxMAotMTExCTExCi0xMDIJMTIKLTExMgkxMgotc2Vs
ZWN0ICogZnJvbSB0MjsKLWEJYgotMQkxCi0yCTIKLTYJNgotNwk3Ci04CTgKLTkJOQotMwkxMwot
NAkxNAotNQkxNQotZHJvcCB0YWJsZSB0MSx0MjsKIENSRUFURSBUQUJMRSB0MiAoICAgTkVYVF9U
ICAgICAgICAgQklHSU5UIE5PVCBOVUxMIFBSSU1BUlkgS0VZKSBFTkdJTkU9TXlJU0FNOwogQ1JF
QVRFIFRBQkxFIHQxICggIEJfSUQgICAgICAgICAgIElOVEVHRVIgTk9UIE5VTEwgUFJJTUFSWSBL
RVkpIEVOR0lORT1Jbm5vREI7CiBTRVQgQVVUT0NPTU1JVD0wOwpAQCAtMTc0NiwxMCArMTY3MCwx
MCBAQCB2YXJpYWJsZV92YWx1ZSAtIEBpbm5vZGJfcm93c19kZWxldGVkX29yCiA3MQogU0VMRUNU
IHZhcmlhYmxlX3ZhbHVlIC0gQGlubm9kYl9yb3dzX2luc2VydGVkX29yaWcgRlJPTSBpbmZvcm1h
dGlvbl9zY2hlbWEuZ2xvYmFsX3N0YXR1cyBXSEVSRSBMT1dFUih2YXJpYWJsZV9uYW1lKSA9ICdp
bm5vZGJfcm93c19pbnNlcnRlZCc7CiB2YXJpYWJsZV92YWx1ZSAtIEBpbm5vZGJfcm93c19pbnNl
cnRlZF9vcmlnCi0xMDg2CisxMDY1CiBTRUxFQ1QgdmFyaWFibGVfdmFsdWUgLSBAaW5ub2RiX3Jv
d3NfdXBkYXRlZF9vcmlnIEZST00gaW5mb3JtYXRpb25fc2NoZW1hLmdsb2JhbF9zdGF0dXMgV0hF
UkUgTE9XRVIodmFyaWFibGVfbmFtZSkgPSAnaW5ub2RiX3Jvd3NfdXBkYXRlZCc7CiB2YXJpYWJs
ZV92YWx1ZSAtIEBpbm5vZGJfcm93c191cGRhdGVkX29yaWcKLTg4NQorODY1CiBTRUxFQ1QgdmFy
aWFibGVfdmFsdWUgLSBAaW5ub2RiX3Jvd19sb2NrX3dhaXRzX29yaWcgRlJPTSBpbmZvcm1hdGlv
bl9zY2hlbWEuZ2xvYmFsX3N0YXR1cyBXSEVSRSBMT1dFUih2YXJpYWJsZV9uYW1lKSA9ICdpbm5v
ZGJfcm93X2xvY2tfd2FpdHMnOwogdmFyaWFibGVfdmFsdWUgLSBAaW5ub2RiX3Jvd19sb2NrX3dh
aXRzX29yaWcKIDAKCj09PSBhZGRlZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lu
bm9kYl9tdWx0aV91cGRhdGUucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi9y
L2lubm9kYl9tdWx0aV91cGRhdGUucmVzdWx0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysr
IGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfbXVsdGlfdXBkYXRlLnJlc3VsdAky
MDEwLTA1LTA1IDExOjAzOjE0ICswMDAwCkBAIC0wLDAgKzEsNzYgQEAKK0NSRUFURSBUQUJMRSBi
dWczODk5OV8xIChhIGludCBub3QgbnVsbCBwcmltYXJ5IGtleSwgYiBpbnQgbm90IG51bGwsIGtl
eSAoYikpIGVuZ2luZT1pbm5vZGI7CitDUkVBVEUgVEFCTEUgYnVnMzg5OTlfMiAoYSBpbnQgbm90
IG51bGwgcHJpbWFyeSBrZXksIGIgaW50IG5vdCBudWxsLCBrZXkgKGIpKSBlbmdpbmU9aW5ub2Ri
OworSU5TRVJUIElOVE8gYnVnMzg5OTlfMSB2YWx1ZXMgKDEsMSksKDIsMiksKDMsMyksKDQsNCks
KDUsNSksKDYsNiksKDcsNyksKDgsOCksKDksOSksKDEwLDEwKSwoMTEsMTEpLCgxMiwxMik7CitJ
TlNFUlQgSU5UTyBidWczODk5OV8yIHZhbHVlcyAoMSwxKSwoMiwyKSwoMywzKSwoNCw0KSwoNSw1
KSwoNiw2KSwoNyw3KSwoOCw4KSwoOSw5KTsKK3VwZGF0ZSBidWczODk5OV8xLGJ1ZzM4OTk5XzIg
c2V0IGJ1ZzM4OTk5XzEuYT1idWczODk5OV8xLmErMTAwOworc2VsZWN0ICogZnJvbSBidWczODk5
OV8xOworYQliCisxMDEJMQorMTAyCTIKKzEwMwkzCisxMDQJNAorMTA1CTUKKzEwNgk2CisxMDcJ
NworMTA4CTgKKzEwOQk5CisxMTAJMTAKKzExMQkxMQorMTEyCTEyCit1cGRhdGUgYnVnMzg5OTlf
MSxidWczODk5OV8yIHNldCBidWczODk5OV8xLmE9YnVnMzg5OTlfMS5hKzEwMCB3aGVyZSBidWcz
ODk5OV8xLmE9MTAxOworc2VsZWN0ICogZnJvbSBidWczODk5OV8xOworYQliCisyMDEJMQorMTAy
CTIKKzEwMwkzCisxMDQJNAorMTA1CTUKKzEwNgk2CisxMDcJNworMTA4CTgKKzEwOQk5CisxMTAJ
MTAKKzExMQkxMQorMTEyCTEyCit1cGRhdGUgYnVnMzg5OTlfMSxidWczODk5OV8yIHNldCBidWcz
ODk5OV8xLmI9YnVnMzg5OTlfMS5iKzEwIHdoZXJlIGJ1ZzM4OTk5XzEuYj0yOworc2VsZWN0ICog
ZnJvbSBidWczODk5OV8xOworYQliCisyMDEJMQorMTAzCTMKKzEwNAk0CisxMDUJNQorMTA2CTYK
KzEwNwk3CisxMDgJOAorMTA5CTkKKzExMAkxMAorMTExCTExCisxMDIJMTIKKzExMgkxMgordXBk
YXRlIGJ1ZzM4OTk5XzEsYnVnMzg5OTlfMiBzZXQgYnVnMzg5OTlfMS5iPWJ1ZzM4OTk5XzEuYisy
LGJ1ZzM4OTk5XzIuYj1idWczODk5OV8xLmIrMTAgd2hlcmUgYnVnMzg5OTlfMS5iIGJldHdlZW4g
MyBhbmQgNSBhbmQgYnVnMzg5OTlfMS5hPWJ1ZzM4OTk5XzIuYSsxMDA7CitzZWxlY3QgKiBmcm9t
IGJ1ZzM4OTk5XzE7CithCWIKKzIwMQkxCisxMDMJNQorMTA0CTYKKzEwNgk2CisxMDUJNworMTA3
CTcKKzEwOAk4CisxMDkJOQorMTEwCTEwCisxMTEJMTEKKzEwMgkxMgorMTEyCTEyCitzZWxlY3Qg
KiBmcm9tIGJ1ZzM4OTk5XzI7CithCWIKKzEJMQorMgkyCis2CTYKKzcJNworOAk4Cis5CTkKKzMJ
MTMKKzQJMTQKKzUJMTUKK2Ryb3AgdGFibGUgYnVnMzg5OTlfMSxidWczODk5OV8yOwoKPT09IG1v
ZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvZGlzYWJsZWQuZGVmJwotLS0g
YS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2Rpc2FibGVkLmRlZgkyMDEwLTA0LTE5IDExOjA3
OjM1ICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvZGlzYWJsZWQuZGVmCTIw
MTAtMDUtMDUgMTE6MDM6MTQgKzAwMDAKQEAgLTAsMCArMSwxMiBAQAorIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjCisjCisjICBMaXN0IHRoZSB0ZXN0IGNhc2VzIHRoYXQgYXJlIHRvIGJlIGRpc2FibGVk
IHRlbXBvcmFyaWx5LgorIworIyAgU2VwYXJhdGUgdGhlIHRlc3QgY2FzZSBuYW1lIGFuZCB0aGUg
Y29tbWVudCB3aXRoICc6Jy4KKyMKKyMgICAgPHRlc3RjYXNlbmFtZT4gOiBCVUcjPHh4eHg+IDxk
YXRlIGRpc2FibGVkPiA8ZGlzYWJsZXI+IDxjb21tZW50PgorIworIyAgRG8gbm90IHVzZSBhbnkg
VEFCIGNoYXJhY3RlcnMgZm9yIHdoaXRlc3BhY2UuCisjCisjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMK
K2lubm9kYl9tdWx0aV91cGRhdGU6IEJ1ZyAjMzg5OTkgMjAxMC0wNS0wNSBtbWFrZWxhIFZhbGdy
aW5kIHdhcm5pbmdzCgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIv
dC9pbm5vZGIudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGIudGVz
dAkyMDEwLTA0LTE5IDExOjA3OjM1ICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2Ri
L3QvaW5ub2RiLnRlc3QJMjAxMC0wNS0wNSAxMTowMzoxNCArMDAwMApAQCAtOTE1LDMzICs5MTUs
NiBAQCBVUERBVEUgdDEgc2V0IGE9YSsxMDAgd2hlcmUgYiBiZXR3ZWVuIDIKIFNFTEVDVCAqIGZy
b20gdDE7CiBkcm9wIHRhYmxlIHQxOwogCi0jCi0jIFRlc3QgbXVsdGkgdXBkYXRlIHdpdGggZGlm
ZmVyZW50IGpvaW4gbWV0aG9kcwotIwotCi1DUkVBVEUgVEFCTEUgdDEgKGEgaW50IG5vdCBudWxs
IHByaW1hcnkga2V5LCBiIGludCBub3QgbnVsbCwga2V5IChiKSkgZW5naW5lPWlubm9kYjsKLUNS
RUFURSBUQUJMRSB0MiAoYSBpbnQgbm90IG51bGwgcHJpbWFyeSBrZXksIGIgaW50IG5vdCBudWxs
LCBrZXkgKGIpKSBlbmdpbmU9aW5ub2RiOwotSU5TRVJUIElOVE8gdDEgdmFsdWVzICgxLDEpLCgy
LDIpLCgzLDMpLCg0LDQpLCg1LDUpLCg2LDYpLCg3LDcpLCg4LDgpLCg5LDkpLCgxMCwxMCksKDEx
LDExKSwoMTIsMTIpOwotSU5TRVJUIElOVE8gdDIgdmFsdWVzICgxLDEpLCgyLDIpLCgzLDMpLCg0
LDQpLCg1LDUpLCg2LDYpLCg3LDcpLCg4LDgpLCg5LDkpOwotCi0jIEZ1bGwgam9pbiwgd2l0aG91
dCBrZXkKLXVwZGF0ZSB0MSx0MiBzZXQgdDEuYT10MS5hKzEwMDsKLXNlbGVjdCAqIGZyb20gdDE7
Ci0KLSMgdW5pcXVlIGtleQotdXBkYXRlIHQxLHQyIHNldCB0MS5hPXQxLmErMTAwIHdoZXJlIHQx
LmE9MTAxOwotc2VsZWN0ICogZnJvbSB0MTsKLQotIyByZWYga2V5Ci11cGRhdGUgdDEsdDIgc2V0
IHQxLmI9dDEuYisxMCB3aGVyZSB0MS5iPTI7Ci1zZWxlY3QgKiBmcm9tIHQxOwotCi0jIFJhbmdl
IGtleSAoaW4gdDEpCi11cGRhdGUgdDEsdDIgc2V0IHQxLmI9dDEuYisyLHQyLmI9dDEuYisxMCB3
aGVyZSB0MS5iIGJldHdlZW4gMyBhbmQgNSBhbmQgdDEuYT10Mi5hKzEwMDsKLXNlbGVjdCAqIGZy
b20gdDE7Ci1zZWxlY3QgKiBmcm9tIHQyOwotCi1kcm9wIHRhYmxlIHQxLHQyOwogQ1JFQVRFIFRB
QkxFIHQyICggICBORVhUX1QgICAgICAgICBCSUdJTlQgTk9UIE5VTEwgUFJJTUFSWSBLRVkpIEVO
R0lORT1NeUlTQU07CiBDUkVBVEUgVEFCTEUgdDEgKCAgQl9JRCAgICAgICAgICAgSU5URUdFUiBO
T1QgTlVMTCBQUklNQVJZIEtFWSkgRU5HSU5FPUlubm9EQjsKIFNFVCBBVVRPQ09NTUlUPTA7Cgo9
PT0gYWRkZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfbXVsdGlfdXBk
YXRlLnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX211bHRpX3Vw
ZGF0ZS50ZXN0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0
ZS9pbm5vZGIvdC9pbm5vZGJfbXVsdGlfdXBkYXRlLnRlc3QJMjAxMC0wNS0wNSAxMTowMzoxNCAr
MDAwMApAQCAtMCwwICsxLDI5IEBACistLSBzb3VyY2UgaW5jbHVkZS9oYXZlX2lubm9kYi5pbmMK
KworIworIyBUZXN0IG11bHRpIHVwZGF0ZSB3aXRoIGRpZmZlcmVudCBqb2luIG1ldGhvZHMKKyMK
KworQ1JFQVRFIFRBQkxFIGJ1ZzM4OTk5XzEgKGEgaW50IG5vdCBudWxsIHByaW1hcnkga2V5LCBi
IGludCBub3QgbnVsbCwga2V5IChiKSkgZW5naW5lPWlubm9kYjsKK0NSRUFURSBUQUJMRSBidWcz
ODk5OV8yIChhIGludCBub3QgbnVsbCBwcmltYXJ5IGtleSwgYiBpbnQgbm90IG51bGwsIGtleSAo
YikpIGVuZ2luZT1pbm5vZGI7CitJTlNFUlQgSU5UTyBidWczODk5OV8xIHZhbHVlcyAoMSwxKSwo
MiwyKSwoMywzKSwoNCw0KSwoNSw1KSwoNiw2KSwoNyw3KSwoOCw4KSwoOSw5KSwoMTAsMTApLCgx
MSwxMSksKDEyLDEyKTsKK0lOU0VSVCBJTlRPIGJ1ZzM4OTk5XzIgdmFsdWVzICgxLDEpLCgyLDIp
LCgzLDMpLCg0LDQpLCg1LDUpLCg2LDYpLCg3LDcpLCg4LDgpLCg5LDkpOworCisjIEZ1bGwgam9p
biwgd2l0aG91dCBrZXkKK3VwZGF0ZSBidWczODk5OV8xLGJ1ZzM4OTk5XzIgc2V0IGJ1ZzM4OTk5
XzEuYT1idWczODk5OV8xLmErMTAwOworc2VsZWN0ICogZnJvbSBidWczODk5OV8xOworCisjIHVu
aXF1ZSBrZXkKK3VwZGF0ZSBidWczODk5OV8xLGJ1ZzM4OTk5XzIgc2V0IGJ1ZzM4OTk5XzEuYT1i
dWczODk5OV8xLmErMTAwIHdoZXJlIGJ1ZzM4OTk5XzEuYT0xMDE7CitzZWxlY3QgKiBmcm9tIGJ1
ZzM4OTk5XzE7CisKKyMgcmVmIGtleQordXBkYXRlIGJ1ZzM4OTk5XzEsYnVnMzg5OTlfMiBzZXQg
YnVnMzg5OTlfMS5iPWJ1ZzM4OTk5XzEuYisxMCB3aGVyZSBidWczODk5OV8xLmI9MjsKK3NlbGVj
dCAqIGZyb20gYnVnMzg5OTlfMTsKKworIyBSYW5nZSBrZXkgKGluIGJ1ZzM4OTk5XzEpCit1cGRh
dGUgYnVnMzg5OTlfMSxidWczODk5OV8yIHNldCBidWczODk5OV8xLmI9YnVnMzg5OTlfMS5iKzIs
YnVnMzg5OTlfMi5iPWJ1ZzM4OTk5XzEuYisxMCB3aGVyZSBidWczODk5OV8xLmIgYmV0d2VlbiAz
IGFuZCA1IGFuZCBidWczODk5OV8xLmE9YnVnMzg5OTlfMi5hKzEwMDsKK3NlbGVjdCAqIGZyb20g
YnVnMzg5OTlfMTsKK3NlbGVjdCAqIGZyb20gYnVnMzg5OTlfMjsKKworZHJvcCB0YWJsZSBidWcz
ODk5OV8xLGJ1ZzM4OTk5XzI7Cgo=

--===============0277839636==
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: cf2345a79e32550c20c0483135fcdc6d8105652e
# timestamp: 2010-05-05 14:03:42 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   3asmflpm0cbhnaec
# 
# Begin bundle
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


--===============0277839636==--