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

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS41LWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMDUwNTEwMTc0OC0zYXNtZmxw
bTBjYmhuYWVjCgogMzA2NyBNYXJrbyBNw6RrZWzDpAkyMDEwLTA1LTA1CiAgICAgIE1lcmdlIGZy
b20gbXlzcWwtNS4xLWlubm9kYjoKICAgICAgCiAgICAgICAgLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgICAgcmV2bm86IDM0
NDkKICAgICAgICByZXZpc2lvbi1pZDogbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDUx
MDQ0MjUtMzl5NnFiZmZnb3RyaGNrMgogICAgICAgIHBhcmVudDogbWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMDA1MDUxMDQwMDEtODgzcHFpZXBvMzg0cXI1aAogICAgICAgIGNvbW1pdHRlcjog
TWFya28gTcOka2Vsw6QgPG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tPgogICAgICAgIGJyYW5jaCBu
aWNrOiA1LjEtaW5ub2RiCiAgICAgICAgdGltZXN0YW1wOiBXZWQgMjAxMC0wNS0wNSAxMzo0NDoy
NSArMDMwMAogICAgICAgIG1lc3NhZ2U6CiAgICAgICAgICBGYWN0b3Igb3V0IGlubm9kYl9tdWx0
aV91cGRhdGUudGVzdCBmcm9tIGlubm9kYi50ZXN0CgogICAgYWRkZWQ6CiAgICAgIG15c3FsLXRl
c3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX211bHRpX3VwZGF0ZS5yZXN1bHQKICAgICAgbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfbXVsdGlfdXBkYXRlLnRlc3QKICAgIG1vZGlmaWVk
OgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYi5yZXN1bHQKICAgICAgbXlz
cWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9kaXNhYmxlZC5kZWYKICAgICAgbXlzcWwtdGVzdC9zdWl0
ZS9pbm5vZGIvdC9pbm5vZGIudGVzdAo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0
ZS9pbm5vZGIvci9pbm5vZGIucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi9y
L2lubm9kYi5yZXN1bHQJMjAxMC0wNC0xOSAxMToxMDo0MyArMDAwMAorKysgYi9teXNxbC10ZXN0
L3N1aXRlL2lubm9kYi9yL2lubm9kYi5yZXN1bHQJMjAxMC0wNS0wNSAxMTowMzoxNCArMDAwMApA
QCAtMTE4NCw4MiArMTE4NCw2IEBAIGEJYgogOAk4CiA5CTkKIGRyb3AgdGFibGUgdDE7Ci1DUkVB
VEUgVEFCTEUgdDEgKGEgaW50IG5vdCBudWxsIHByaW1hcnkga2V5LCBiIGludCBub3QgbnVsbCwg
a2V5IChiKSkgZW5naW5lPWlubm9kYjsKLUNSRUFURSBUQUJMRSB0MiAoYSBpbnQgbm90IG51bGwg
cHJpbWFyeSBrZXksIGIgaW50IG5vdCBudWxsLCBrZXkgKGIpKSBlbmdpbmU9aW5ub2RiOwotSU5T
RVJUIElOVE8gdDEgdmFsdWVzICgxLDEpLCgyLDIpLCgzLDMpLCg0LDQpLCg1LDUpLCg2LDYpLCg3
LDcpLCg4LDgpLCg5LDkpLCgxMCwxMCksKDExLDExKSwoMTIsMTIpOwotSU5TRVJUIElOVE8gdDIg
dmFsdWVzICgxLDEpLCgyLDIpLCgzLDMpLCg0LDQpLCg1LDUpLCg2LDYpLCg3LDcpLCg4LDgpLCg5
LDkpOwotdXBkYXRlIHQxLHQyIHNldCB0MS5hPXQxLmErMTAwOwotc2VsZWN0ICogZnJvbSB0MTsK
LWEJYgotMTAxCTEKLTEwMgkyCi0xMDMJMwotMTA0CTQKLTEwNQk1Ci0xMDYJNgotMTA3CTcKLTEw
OAk4Ci0xMDkJOQotMTEwCTEwCi0xMTEJMTEKLTExMgkxMgotdXBkYXRlIHQxLHQyIHNldCB0MS5h
PXQxLmErMTAwIHdoZXJlIHQxLmE9MTAxOwotc2VsZWN0ICogZnJvbSB0MTsKLWEJYgotMjAxCTEK
LTEwMgkyCi0xMDMJMwotMTA0CTQKLTEwNQk1Ci0xMDYJNgotMTA3CTcKLTEwOAk4Ci0xMDkJOQot
MTEwCTEwCi0xMTEJMTEKLTExMgkxMgotdXBkYXRlIHQxLHQyIHNldCB0MS5iPXQxLmIrMTAgd2hl
cmUgdDEuYj0yOwotc2VsZWN0ICogZnJvbSB0MTsKLWEJYgotMjAxCTEKLTEwMwkzCi0xMDQJNAot
MTA1CTUKLTEwNgk2Ci0xMDcJNwotMTA4CTgKLTEwOQk5Ci0xMTAJMTAKLTExMQkxMQotMTAyCTEy
Ci0xMTIJMTIKLXVwZGF0ZSB0MSx0MiBzZXQgdDEuYj10MS5iKzIsdDIuYj10MS5iKzEwIHdoZXJl
IHQxLmIgYmV0d2VlbiAzIGFuZCA1IGFuZCB0MS5hPXQyLmErMTAwOwotc2VsZWN0ICogZnJvbSB0
MTsKLWEJYgotMjAxCTEKLTEwMwk1Ci0xMDQJNgotMTA2CTYKLTEwNQk3Ci0xMDcJNwotMTA4CTgK
LTEwOQk5Ci0xMTAJMTAKLTExMQkxMQotMTAyCTEyCi0xMTIJMTIKLXNlbGVjdCAqIGZyb20gdDI7
Ci1hCWIKLTEJMQotMgkyCi02CTYKLTcJNwotOAk4Ci05CTkKLTMJMTMKLTQJMTQKLTUJMTUKLWRy
b3AgdGFibGUgdDEsdDI7CiBDUkVBVEUgVEFCTEUgdDIgKCAgIE5FWFRfVCAgICAgICAgIEJJR0lO
VCBOT1QgTlVMTCBQUklNQVJZIEtFWSkgRU5HSU5FPU15SVNBTTsKIENSRUFURSBUQUJMRSB0MSAo
ICBCX0lEICAgICAgICAgICBJTlRFR0VSIE5PVCBOVUxMIFBSSU1BUlkgS0VZKSBFTkdJTkU9SW5u
b0RCOwogU0VUIEFVVE9DT01NSVQ9MDsKQEAgLTE3NDYsMTAgKzE2NzAsMTAgQEAgdmFyaWFibGVf
dmFsdWUgLSBAaW5ub2RiX3Jvd3NfZGVsZXRlZF9vcgogNzEKIFNFTEVDVCB2YXJpYWJsZV92YWx1
ZSAtIEBpbm5vZGJfcm93c19pbnNlcnRlZF9vcmlnIEZST00gaW5mb3JtYXRpb25fc2NoZW1hLmds
b2JhbF9zdGF0dXMgV0hFUkUgTE9XRVIodmFyaWFibGVfbmFtZSkgPSAnaW5ub2RiX3Jvd3NfaW5z
ZXJ0ZWQnOwogdmFyaWFibGVfdmFsdWUgLSBAaW5ub2RiX3Jvd3NfaW5zZXJ0ZWRfb3JpZwotMTA4
NgorMTA2NQogU0VMRUNUIHZhcmlhYmxlX3ZhbHVlIC0gQGlubm9kYl9yb3dzX3VwZGF0ZWRfb3Jp
ZyBGUk9NIGluZm9ybWF0aW9uX3NjaGVtYS5nbG9iYWxfc3RhdHVzIFdIRVJFIExPV0VSKHZhcmlh
YmxlX25hbWUpID0gJ2lubm9kYl9yb3dzX3VwZGF0ZWQnOwogdmFyaWFibGVfdmFsdWUgLSBAaW5u
b2RiX3Jvd3NfdXBkYXRlZF9vcmlnCi04ODUKKzg2NQogU0VMRUNUIHZhcmlhYmxlX3ZhbHVlIC0g
QGlubm9kYl9yb3dfbG9ja193YWl0c19vcmlnIEZST00gaW5mb3JtYXRpb25fc2NoZW1hLmdsb2Jh
bF9zdGF0dXMgV0hFUkUgTE9XRVIodmFyaWFibGVfbmFtZSkgPSAnaW5ub2RiX3Jvd19sb2NrX3dh
aXRzJzsKIHZhcmlhYmxlX3ZhbHVlIC0gQGlubm9kYl9yb3dfbG9ja193YWl0c19vcmlnCiAwCgo9
PT0gYWRkZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfbXVsdGlfdXBk
YXRlLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfbXVsdGlf
dXBkYXRlLnJlc3VsdAkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBiL215c3FsLXRlc3Qv
c3VpdGUvaW5ub2RiL3IvaW5ub2RiX211bHRpX3VwZGF0ZS5yZXN1bHQJMjAxMC0wNS0wNSAxMTow
MzoxNCArMDAwMApAQCAtMCwwICsxLDc2IEBACitDUkVBVEUgVEFCTEUgYnVnMzg5OTlfMSAoYSBp
bnQgbm90IG51bGwgcHJpbWFyeSBrZXksIGIgaW50IG5vdCBudWxsLCBrZXkgKGIpKSBlbmdpbmU9
aW5ub2RiOworQ1JFQVRFIFRBQkxFIGJ1ZzM4OTk5XzIgKGEgaW50IG5vdCBudWxsIHByaW1hcnkg
a2V5LCBiIGludCBub3QgbnVsbCwga2V5IChiKSkgZW5naW5lPWlubm9kYjsKK0lOU0VSVCBJTlRP
IGJ1ZzM4OTk5XzEgdmFsdWVzICgxLDEpLCgyLDIpLCgzLDMpLCg0LDQpLCg1LDUpLCg2LDYpLCg3
LDcpLCg4LDgpLCg5LDkpLCgxMCwxMCksKDExLDExKSwoMTIsMTIpOworSU5TRVJUIElOVE8gYnVn
Mzg5OTlfMiB2YWx1ZXMgKDEsMSksKDIsMiksKDMsMyksKDQsNCksKDUsNSksKDYsNiksKDcsNyks
KDgsOCksKDksOSk7Cit1cGRhdGUgYnVnMzg5OTlfMSxidWczODk5OV8yIHNldCBidWczODk5OV8x
LmE9YnVnMzg5OTlfMS5hKzEwMDsKK3NlbGVjdCAqIGZyb20gYnVnMzg5OTlfMTsKK2EJYgorMTAx
CTEKKzEwMgkyCisxMDMJMworMTA0CTQKKzEwNQk1CisxMDYJNgorMTA3CTcKKzEwOAk4CisxMDkJ
OQorMTEwCTEwCisxMTEJMTEKKzExMgkxMgordXBkYXRlIGJ1ZzM4OTk5XzEsYnVnMzg5OTlfMiBz
ZXQgYnVnMzg5OTlfMS5hPWJ1ZzM4OTk5XzEuYSsxMDAgd2hlcmUgYnVnMzg5OTlfMS5hPTEwMTsK
K3NlbGVjdCAqIGZyb20gYnVnMzg5OTlfMTsKK2EJYgorMjAxCTEKKzEwMgkyCisxMDMJMworMTA0
CTQKKzEwNQk1CisxMDYJNgorMTA3CTcKKzEwOAk4CisxMDkJOQorMTEwCTEwCisxMTEJMTEKKzEx
MgkxMgordXBkYXRlIGJ1ZzM4OTk5XzEsYnVnMzg5OTlfMiBzZXQgYnVnMzg5OTlfMS5iPWJ1ZzM4
OTk5XzEuYisxMCB3aGVyZSBidWczODk5OV8xLmI9MjsKK3NlbGVjdCAqIGZyb20gYnVnMzg5OTlf
MTsKK2EJYgorMjAxCTEKKzEwMwkzCisxMDQJNAorMTA1CTUKKzEwNgk2CisxMDcJNworMTA4CTgK
KzEwOQk5CisxMTAJMTAKKzExMQkxMQorMTAyCTEyCisxMTIJMTIKK3VwZGF0ZSBidWczODk5OV8x
LGJ1ZzM4OTk5XzIgc2V0IGJ1ZzM4OTk5XzEuYj1idWczODk5OV8xLmIrMixidWczODk5OV8yLmI9
YnVnMzg5OTlfMS5iKzEwIHdoZXJlIGJ1ZzM4OTk5XzEuYiBiZXR3ZWVuIDMgYW5kIDUgYW5kIGJ1
ZzM4OTk5XzEuYT1idWczODk5OV8yLmErMTAwOworc2VsZWN0ICogZnJvbSBidWczODk5OV8xOwor
YQliCisyMDEJMQorMTAzCTUKKzEwNAk2CisxMDYJNgorMTA1CTcKKzEwNwk3CisxMDgJOAorMTA5
CTkKKzExMAkxMAorMTExCTExCisxMDIJMTIKKzExMgkxMgorc2VsZWN0ICogZnJvbSBidWczODk5
OV8yOworYQliCisxCTEKKzIJMgorNgk2Cis3CTcKKzgJOAorOQk5CiszCTEzCis0CTE0Cis1CTE1
Citkcm9wIHRhYmxlIGJ1ZzM4OTk5XzEsYnVnMzg5OTlfMjsKCj09PSBtb2RpZmllZCBmaWxlICdt
eXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2Rpc2FibGVkLmRlZicKLS0tIGEvbXlzcWwtdGVzdC9z
dWl0ZS9pbm5vZGIvdC9kaXNhYmxlZC5kZWYJMjAxMC0wNC0xOSAxMTowNzozNSArMDAwMAorKysg
Yi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2Rpc2FibGVkLmRlZgkyMDEwLTA1LTA1IDExOjAz
OjE0ICswMDAwCkBAIC0wLDAgKzEsMTIgQEAKKyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIworIworIyAg
TGlzdCB0aGUgdGVzdCBjYXNlcyB0aGF0IGFyZSB0byBiZSBkaXNhYmxlZCB0ZW1wb3JhcmlseS4K
KyMKKyMgIFNlcGFyYXRlIHRoZSB0ZXN0IGNhc2UgbmFtZSBhbmQgdGhlIGNvbW1lbnQgd2l0aCAn
OicuCisjCisjICAgIDx0ZXN0Y2FzZW5hbWU+IDogQlVHIzx4eHh4PiA8ZGF0ZSBkaXNhYmxlZD4g
PGRpc2FibGVyPiA8Y29tbWVudD4KKyMKKyMgIERvIG5vdCB1c2UgYW55IFRBQiBjaGFyYWN0ZXJz
IGZvciB3aGl0ZXNwYWNlLgorIworIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCitpbm5vZGJfbXVsdGlf
dXBkYXRlOiBCdWcgIzM4OTk5IDIwMTAtMDUtMDUgbW1ha2VsYSBWYWxncmluZCB3YXJuaW5ncwoK
PT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLnRlc3Qn
Ci0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLnRlc3QJMjAxMC0wNC0xOSAx
MTowNzozNSArMDAwMAorKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi50ZXN0
CTIwMTAtMDUtMDUgMTE6MDM6MTQgKzAwMDAKQEAgLTkxNSwzMyArOTE1LDYgQEAgVVBEQVRFIHQx
IHNldCBhPWErMTAwIHdoZXJlIGIgYmV0d2VlbiAyCiBTRUxFQ1QgKiBmcm9tIHQxOwogZHJvcCB0
YWJsZSB0MTsKIAotIwotIyBUZXN0IG11bHRpIHVwZGF0ZSB3aXRoIGRpZmZlcmVudCBqb2luIG1l
dGhvZHMKLSMKLQotQ1JFQVRFIFRBQkxFIHQxIChhIGludCBub3QgbnVsbCBwcmltYXJ5IGtleSwg
YiBpbnQgbm90IG51bGwsIGtleSAoYikpIGVuZ2luZT1pbm5vZGI7Ci1DUkVBVEUgVEFCTEUgdDIg
KGEgaW50IG5vdCBudWxsIHByaW1hcnkga2V5LCBiIGludCBub3QgbnVsbCwga2V5IChiKSkgZW5n
aW5lPWlubm9kYjsKLUlOU0VSVCBJTlRPIHQxIHZhbHVlcyAoMSwxKSwoMiwyKSwoMywzKSwoNCw0
KSwoNSw1KSwoNiw2KSwoNyw3KSwoOCw4KSwoOSw5KSwoMTAsMTApLCgxMSwxMSksKDEyLDEyKTsK
LUlOU0VSVCBJTlRPIHQyIHZhbHVlcyAoMSwxKSwoMiwyKSwoMywzKSwoNCw0KSwoNSw1KSwoNiw2
KSwoNyw3KSwoOCw4KSwoOSw5KTsKLQotIyBGdWxsIGpvaW4sIHdpdGhvdXQga2V5Ci11cGRhdGUg
dDEsdDIgc2V0IHQxLmE9dDEuYSsxMDA7Ci1zZWxlY3QgKiBmcm9tIHQxOwotCi0jIHVuaXF1ZSBr
ZXkKLXVwZGF0ZSB0MSx0MiBzZXQgdDEuYT10MS5hKzEwMCB3aGVyZSB0MS5hPTEwMTsKLXNlbGVj
dCAqIGZyb20gdDE7Ci0KLSMgcmVmIGtleQotdXBkYXRlIHQxLHQyIHNldCB0MS5iPXQxLmIrMTAg
d2hlcmUgdDEuYj0yOwotc2VsZWN0ICogZnJvbSB0MTsKLQotIyBSYW5nZSBrZXkgKGluIHQxKQot
dXBkYXRlIHQxLHQyIHNldCB0MS5iPXQxLmIrMix0Mi5iPXQxLmIrMTAgd2hlcmUgdDEuYiBiZXR3
ZWVuIDMgYW5kIDUgYW5kIHQxLmE9dDIuYSsxMDA7Ci1zZWxlY3QgKiBmcm9tIHQxOwotc2VsZWN0
ICogZnJvbSB0MjsKLQotZHJvcCB0YWJsZSB0MSx0MjsKIENSRUFURSBUQUJMRSB0MiAoICAgTkVY
VF9UICAgICAgICAgQklHSU5UIE5PVCBOVUxMIFBSSU1BUlkgS0VZKSBFTkdJTkU9TXlJU0FNOwog
Q1JFQVRFIFRBQkxFIHQxICggIEJfSUQgICAgICAgICAgIElOVEVHRVIgTk9UIE5VTEwgUFJJTUFS
WSBLRVkpIEVOR0lORT1Jbm5vREI7CiBTRVQgQVVUT0NPTU1JVD0wOwoKPT09IGFkZGVkIGZpbGUg
J215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX211bHRpX3VwZGF0ZS50ZXN0JwotLS0g
YS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9tdWx0aV91cGRhdGUudGVzdAkxOTcw
LTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5u
b2RiX211bHRpX3VwZGF0ZS50ZXN0CTIwMTAtMDUtMDUgMTE6MDM6MTQgKzAwMDAKQEAgLTAsMCAr
MSwyOSBAQAorLS0gc291cmNlIGluY2x1ZGUvaGF2ZV9pbm5vZGIuaW5jCisKKyMKKyMgVGVzdCBt
dWx0aSB1cGRhdGUgd2l0aCBkaWZmZXJlbnQgam9pbiBtZXRob2RzCisjCisKK0NSRUFURSBUQUJM
RSBidWczODk5OV8xIChhIGludCBub3QgbnVsbCBwcmltYXJ5IGtleSwgYiBpbnQgbm90IG51bGws
IGtleSAoYikpIGVuZ2luZT1pbm5vZGI7CitDUkVBVEUgVEFCTEUgYnVnMzg5OTlfMiAoYSBpbnQg
bm90IG51bGwgcHJpbWFyeSBrZXksIGIgaW50IG5vdCBudWxsLCBrZXkgKGIpKSBlbmdpbmU9aW5u
b2RiOworSU5TRVJUIElOVE8gYnVnMzg5OTlfMSB2YWx1ZXMgKDEsMSksKDIsMiksKDMsMyksKDQs
NCksKDUsNSksKDYsNiksKDcsNyksKDgsOCksKDksOSksKDEwLDEwKSwoMTEsMTEpLCgxMiwxMik7
CitJTlNFUlQgSU5UTyBidWczODk5OV8yIHZhbHVlcyAoMSwxKSwoMiwyKSwoMywzKSwoNCw0KSwo
NSw1KSwoNiw2KSwoNyw3KSwoOCw4KSwoOSw5KTsKKworIyBGdWxsIGpvaW4sIHdpdGhvdXQga2V5
Cit1cGRhdGUgYnVnMzg5OTlfMSxidWczODk5OV8yIHNldCBidWczODk5OV8xLmE9YnVnMzg5OTlf
MS5hKzEwMDsKK3NlbGVjdCAqIGZyb20gYnVnMzg5OTlfMTsKKworIyB1bmlxdWUga2V5Cit1cGRh
dGUgYnVnMzg5OTlfMSxidWczODk5OV8yIHNldCBidWczODk5OV8xLmE9YnVnMzg5OTlfMS5hKzEw
MCB3aGVyZSBidWczODk5OV8xLmE9MTAxOworc2VsZWN0ICogZnJvbSBidWczODk5OV8xOworCisj
IHJlZiBrZXkKK3VwZGF0ZSBidWczODk5OV8xLGJ1ZzM4OTk5XzIgc2V0IGJ1ZzM4OTk5XzEuYj1i
dWczODk5OV8xLmIrMTAgd2hlcmUgYnVnMzg5OTlfMS5iPTI7CitzZWxlY3QgKiBmcm9tIGJ1ZzM4
OTk5XzE7CisKKyMgUmFuZ2Uga2V5IChpbiBidWczODk5OV8xKQordXBkYXRlIGJ1ZzM4OTk5XzEs
YnVnMzg5OTlfMiBzZXQgYnVnMzg5OTlfMS5iPWJ1ZzM4OTk5XzEuYisyLGJ1ZzM4OTk5XzIuYj1i
dWczODk5OV8xLmIrMTAgd2hlcmUgYnVnMzg5OTlfMS5iIGJldHdlZW4gMyBhbmQgNSBhbmQgYnVn
Mzg5OTlfMS5hPWJ1ZzM4OTk5XzIuYSsxMDA7CitzZWxlY3QgKiBmcm9tIGJ1ZzM4OTk5XzE7Citz
ZWxlY3QgKiBmcm9tIGJ1ZzM4OTk5XzI7CisKK2Ryb3AgdGFibGUgYnVnMzg5OTlfMSxidWczODk5
OV8yOwoK

--===============1286049907==
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:23 +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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


--===============1286049907==--