From: marko.makela
Date: May 11 2010 5:04pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3082 to 3083)
List-Archive: http://lists.mysql.com/commits/108027
Message-Id: <201005111704.o4BH35dM029435@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0325746518=="

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

IDMwODMgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xMQogICAgICBNZXJnZSBmcm9tIG15c3FsLTUu
MS1pbm5vZGI6CiAgICAgIAogICAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICAgIHJldm5vOiAzNDU5CiAgICAgICAg
cmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTExMTY1ODQ1LWxzdzdz
ZWl4ZnRnenBmcXQKICAgICAgICBwYXJlbnQ6IHZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMDA1
MTExMTAwMjktMTh4dnV1NnI3aGFyOHRvaAogICAgICAgIGNvbW1pdHRlcjogTWFya28gTcOka2Vs
w6QgPG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tPgogICAgICAgIGJyYW5jaCBuaWNrOiBteXNxbC01
LjEtaW5ub2RiMgogICAgICAgIHRpbWVzdGFtcDogVHVlIDIwMTAtMDUtMTEgMTk6NTg6NDUgKzAz
MDAKICAgICAgICBtZXNzYWdlOgogICAgICAgICAgRml4IHN5c192YXJzLnR4X2lzb2xhdGlvbl9m
dW5jLnRlc3QsIHdoaWNoIHdhcyBicm9rZW4gaW4gcmV2bm8gMzQzMgogICAgICAgICAgd2hlbiBt
YWtpbmcgUkVBRCBVTkNPTU1JVFRFRCBsb2NrIGFzIGxpdHRsZSBhcyBSRUFEIENPTU1JVFRFRC4K
CiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy9yL3R4X2lzb2xh
dGlvbl9mdW5jLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3QvdHhfaXNv
bGF0aW9uX2Z1bmMudGVzdAogMzA4MiBNYXJrbyBNw6RrZWzDpAkyMDEwLTA1LTExCiAgICAgIE1l
cmdlIGZyb20gbXlzcWwtNS4xLWlubm9kYjoKICAgICAgCiAgICAgICAgLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgICAgcmV2
bm86IDM0NTkKICAgICAgICByZXZpc2lvbi1pZDogbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MDA1MTExMDUzMDgtZ3JwMnQzcHJoM3RxaXZ3MAogICAgICAgIHBhcmVudDogbWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMDA1MTExMDUwMTItYjJ0N3d2ejZtdTZibGw3NAogICAgICAgIHBhcmVu
dDogbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDUxMjM5MDEteGp4dTkzaDF4bmJrZmtx
MAogICAgICAgIGNvbW1pdHRlcjogTWFya28gTcOka2Vsw6QgPG1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tPgogICAgICAgIGJyYW5jaCBuaWNrOiBteXNxbC01LjEtaW5ub2RiCiAgICAgICAgdGltZXN0
YW1wOiBUdWUgMjAxMC0wNS0xMSAxMzo1MzowOCArMDMwMAogICAgICAgIG1lc3NhZ2U6CiAgICAg
ICAgICBNZXJnZSBhIHBhdGNoIGZyb20gRmFjZWJvb2sgdG8gZml4IEJ1ZyAjNTMyOTAKICAgICAg
CiAgICAgICAgICBjb21taXQgZTc1OWJjNjRlYjVjNWVlZDRmNzU2NzdhZDY3MjQ2Nzk3ZDQ4NjQ2
MAogICAgICAgICAgQXV0aG9yOiBSeWFuIE1hY2sKICAgICAgICAgIERhdGU6ICAgMyBkYXlzIGFn
bwogICAgICAKICAgICAgICAgICAgICBCdWdmaXggZm9yIDUzMjkwLCBmYXN0IHVuaXF1ZSBpbmRl
eCBjcmVhdGlvbiBmYWlscyBvbiBkdXBsaWNhdGUgbnVsbCB2YWx1ZXMKICAgICAgCiAgICAgICAg
ICAgICAgU3VtbWFyeToKICAgICAgICAgICAgICBCdWcgaW4gdGhlIGZhc3QgaW5kZXggY3JlYXRp
b24gY29kZSBpbmNvcnJlY3RseSBjb25zaWRlcnMgbnVsbAogICAgICAgICAgICAgIHZhbHVlcyB0
byBiZSBkdXBsaWNhdGVzIGR1cmluZyBibG9jayBtZXJnaW5nLiAgSW5ub2RiIHBvbGljeSBpcyB0
aGF0CiAgICAgICAgICAgICAgbXVsdGlwbGUgbnVsbCB2YWx1ZXMgYXJlIGFsbG93ZWQgaW4gYSB1
bmlxdWUgaW5kZXguICBOdWxsIGR1cGxpY2F0ZXMKICAgICAgICAgICAgICB3ZXJlIGNvcnJlY3Rs
eSBpZ25vcmVkIHdoaWxlIHNvcnRpbmcgaW5kaXZpZHVhbCBibG9ja3MgYW5kIHdpdGggc2xvdwog
ICAgICAgICAgICAgIGluZGV4IGNyZWF0aW9uLgogICAgICAKICAgICAgICAgICAgICBUZXN0IFBs
YW46CiAgICAgICAgICAgICAgbXRyLCBpbmNsdWRpbmcgbmV3IHRlc3QsIGxvYWQgZGJzIHVzaW5n
IGRlZmVycmVkIGluZGV4IGNyZWF0aW9uCiAgICAgIAogICAgICAgICAgICAgIExpY2Vuc2U6CiAg
ICAgICAgICAgICAgQ29weXJpZ2h0IChDKSAyMDA5LTIwMTAgRmFjZWJvb2ssIEluYy4gIEFsbCBS
aWdodHMgUmVzZXJ2ZWQuCiAgICAgIAogICAgICAgICAgICAgIER1YWwgbGljZW5zZWQgdW5kZXIg
QlNEIGxpY2Vuc2UgYW5kIEdQTHYyLgogICAgICAKICAgICAgICAgICAgICBSZWRpc3RyaWJ1dGlv
biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAg
ICAgICAgICAgICBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg
Zm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlIG1ldDoKICAgICAgICAgICAgICAxLiBSZWRpc3RyaWJ1
dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodCBub3Rp
Y2UsCiAgICAgICAgICAgICAgICAgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs
b3dpbmcgZGlzY2xhaW1lci4KICAgICAgICAgICAgICAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmlu
YXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodCBub3RpY2UsCiAgICAg
ICAgICAgICAgICAgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz
Y2xhaW1lciBpbiB0aGUgZG9jdW1lbnRhdGlvbgogICAgICAgICAgICAgICAgIGFuZC9vciBvdGhl
ciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgogICAgICAKICAgICAg
ICAgICAgICBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEZBQ0VCT09LLCBJTkMuIGBgQVMg
SVMnJyBBTkQgQU5ZIEVYUFJFU1MgT1IKICAgICAgICAgICAgICBJTVBMSUVEIFdBUlJBTlRJRVMs
IElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9G
CiAgICAgICAgICAgICAgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VM
QVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElOIE5PCiAgICAgICAgICAgICAgRVZFTlQgU0hB
TEwgRkFDRUJPT0ssIElOQy4gQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5D
SURFTlRBTCwKICAgICAgICAgICAgICBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJ
QUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCiAgICAgICAgICAgICAg
UFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0Us
IERBVEEsIE9SIFBST0ZJVFM7CiAgICAgICAgICAgICAgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9O
KSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksCiAgICAgICAg
ICAgICAgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5D
TFVESU5HIE5FR0xJR0VOQ0UgT1IKICAgICAgICAgICAgICBPVEhFUldJU0UpIEFSSVNJTkcgSU4g
QU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGCiAgICAgICAg
ICAgICAgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgICAgIAog
ICAgICAgICAgICAgIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlz
dHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5IGl0CiAgICAgICAgICAgICAgdW5kZXIgdGhlIHRlcm1z
IG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZy
ZWUKICAgICAgICAgICAgICBTb2Z0d2FyZSBGb3VuZGF0aW9uOyB2ZXJzaW9uIDIgb2YgdGhlIExp
Y2Vuc2UuCiAgICAgIAogICAgICAgICAgICAgIFRoaXMgcHJvZ3JhbSBpcyBkaXN0cmlidXRlZCBp
biB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLCBidXQgV0lUSE9VVAogICAgICAgICAg
ICAgIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mIE1F
UkNIQU5UQUJJTElUWSBvcgogICAgICAgICAgICAgIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQ
VVJQT1NFLiAgU2VlIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IKICAgICAgICAg
ICAgICBtb3JlIGRldGFpbHMuCiAgICAgIAogICAgICAgICAgICAgIFlvdSBzaG91bGQgaGF2ZSBy
ZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFsb25nIHdp
dGgKICAgICAgICAgICAgICB0aGlzIHByb2dyYW07IGlmIG5vdCwgd3JpdGUgdG8gdGhlIEZyZWUg
U29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLiwgNTkgVGVtcGxlCiAgICAgICAgICAgICAgUGxhY2Us
IFN1aXRlIDMzMCwgQm9zdG9uLCBNQSAgMDIxMTEtMTMwNyAgVVNBCiAgICAgICAgICAgIC0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQog
ICAgICAgICAgICByZXZubzogMzQ1My4yLjEKICAgICAgICAgICAgcmV2aXNpb24taWQ6IG1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTA1MTIzOTAxLXhqeHU5M2gxeG5ia2ZrcTAKICAgICAg
ICAgICAgcGFyZW50OiBtYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUwNTEyMDU1NS11a29x
MWdrbHBoZXNscnhzCiAgICAgICAgICAgIGNvbW1pdHRlcjogTWFya28gTcOka2Vsw6QgPG1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tPgogICAgICAgICAgICBicmFuY2ggbmljazogNS4xLWlubm9kYgog
ICAgICAgICAgICB0aW1lc3RhbXA6IFdlZCAyMDEwLTA1LTA1IDE1OjM5OjAxICswMzAwCiAgICAg
ICAgICAgIG1lc3NhZ2U6CiAgICAgICAgICAgICAgTWVyZ2UgYSBjb250cmlidXRpb24gZnJvbSBS
eWFuIE1hY2sgYXQgRmFjZWJvb2s6CiAgICAgIAogICAgICAgICAgICAgIEJ1Z2ZpeCBmb3IgNTMy
OTAsIGZhc3QgdW5pcXVlIGluZGV4IGNyZWF0aW9uIGZhaWxzIG9uIGR1cGxpY2F0ZSBudWxsIHZh
bHVlcwogICAgICAKICAgICAgICAgICAgICAgICAgU3VtbWFyeToKICAgICAgICAgICAgICAgICAg
QnVnIGluIHRoZSBmYXN0IGluZGV4IGNyZWF0aW9uIGNvZGUgaW5jb3JyZWN0bHkgY29uc2lkZXJz
IG51bGwKICAgICAgICAgICAgICAgICAgdmFsdWVzIHRvIGJlIGR1cGxpY2F0ZXMgZHVyaW5nIGJs
b2NrIG1lcmdpbmcuICBJbm5vZGIgcG9saWN5IGlzIHRoYXQKICAgICAgICAgICAgICAgICAgbXVs
dGlwbGUgbnVsbCB2YWx1ZXMgYXJlIGFsbG93ZWQgaW4gYSB1bmlxdWUgaW5kZXguICBOdWxsIGR1
cGxpY2F0ZXMKICAgICAgICAgICAgICAgICAgd2VyZSBjb3JyZWN0bHkgaWdub3JlZCB3aGlsZSBz
b3J0aW5nIGluZGl2aWR1YWwgYmxvY2tzIGFuZCB3aXRoIHNsb3cKICAgICAgICAgICAgICAgICAg
aW5kZXggY3JlYXRpb24uCiAgICAgIAogICAgICAgICAgICAgICAgICBUZXN0IFBsYW46CiAgICAg
ICAgICAgICAgICAgIG10ciwgaW5jbHVkaW5nIG5ldyB0ZXN0LCBsb2FkIGRicyB1c2luZyBkZWZl
cnJlZCBpbmRleCBjcmVhdGlvbgogICAgICAKICAgICAgICAgICAgICAgICAgRGlmZkNhbXAgUmV2
aXNpb246IDExMDg0MAogICAgICAgICAgICAgICAgICBSZXZpZXdlZCBCeTogbWNhbGxhZ2hhbgog
ICAgICAgICAgICAgICAgICBDQzogbWNhbGxhZ2hhbiwgbXlzcWwtZGV2ZWxAbGlzdHMKICAgICAg
ICAgICAgICAgICAgUmV2ZXJ0IFBsYW46CiAgICAgICAgICAgICAgICAgIE9LCgogICAgYWRkZWQ6
CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZzUzMjkwLnJlc3VsdAog
ICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc1MzI5MC50ZXN0CiAgICBt
b2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JlbTBjbXAuaAogICAgICBz
dG9yYWdlL2lubm9iYXNlL3JlbS9yZW0wY21wLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cv
cm93MG1lcmdlLmMKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMv
ci90eF9pc29sYXRpb25fZnVuYy5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvc3lzX3Zh
cnMvci90eF9pc29sYXRpb25fZnVuYy5yZXN1bHQJMjAwOC0xMi0xOSAxNToxMjoxNSArMDAwMAor
KysgYi9teXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3IvdHhfaXNvbGF0aW9uX2Z1bmMucmVzdWx0
CTIwMTAtMDUtMTEgMTc6MDI6NDkgKzAwMDAKQEAgLTk1LDEwICs5NSw3IEBAIGEJYgogMjIJMTAK
IDI0CTEwCiBJTlNFUlQgSU5UTyB0MSBWQUxVRVMoMjMsIDIzKTsKLUVSUk9SIEhZMDAwOiBMb2Nr
IHdhaXQgdGltZW91dCBleGNlZWRlZDsgdHJ5IHJlc3RhcnRpbmcgdHJhbnNhY3Rpb24KIElOU0VS
VCBJTlRPIHQxIFZBTFVFUygyNSwgMjUpOwotRVJST1IgSFkwMDA6IExvY2sgd2FpdCB0aW1lb3V0
IGV4Y2VlZGVkOyB0cnkgcmVzdGFydGluZyB0cmFuc2FjdGlvbgotQnVnOiBPbmx5IGV2ZW4gcm93
cyBhcmUgYmVpbmcgbG9ja2VkLCBlcnJvciAxMjA1IHNob3VsZCdudCBoYXZlIG9jY3VyZWQKIFNF
TEVDVCAqIEZST00gdDE7CiBhCWIKIDIJMTAKQEAgLTEwOSw3ICsxMDYsOSBAQCBhCWIKIDE4CTEw
CiAyMAkxMAogMjIJMTAKKzIzCTIzCiAyNAkxMAorMjUJMjUKIENPTU1JVDsKICoqIENvbm5lY3Rp
b24gY29uMCAqKgogQ09NTUlUOwpAQCAtMTQ0LDcgKzE0Myw5IEBAIGEJYgogMTgJMTAKIDIwCTEw
CiAyMgkxMAorMjMJMjMKIDI0CTEwCisyNQkyNQogSU5TRVJUIElOVE8gdDEgVkFMVUVTKDUsIDUp
OwogSU5TRVJUIElOVE8gdDEgVkFMVUVTKDcsIDcpOwogU0VMRUNUICogRlJPTSB0MTsKQEAgLTE1
OSw3ICsxNjAsOSBAQCBhCWIKIDE4CTEwCiAyMAkxMAogMjIJMTAKKzIzCTIzCiAyNAkxMAorMjUJ
MjUKIENPTU1JVDsKICoqIENvbm5lY3Rpb24gY29uMCAqKgogQ09NTUlUOwpAQCAtMTk2LDcgKzE5
OSw5IEBAIGEJYgogMTgJMTEKIDIwCTExCiAyMgkxMQorMjMJMjMKIDI0CTExCisyNQkyNQogSU5T
RVJUIElOVE8gdDEgVkFMVUVTKDksIDkpOwogRVJST1IgSFkwMDA6IExvY2sgd2FpdCB0aW1lb3V0
IGV4Y2VlZGVkOyB0cnkgcmVzdGFydGluZyB0cmFuc2FjdGlvbgogSU5TRVJUIElOVE8gdDEgVkFM
VUVTKDEzLCAxMyk7CkBAIC0yMTQsNyArMjE5LDkgQEAgYQliCiAxOAkxMQogMjAJMTEKIDIyCTEx
CisyMwkyMwogMjQJMTEKKzI1CTI1CiBDT01NSVQ7CiAqKiBDb25uZWN0aW9uIGNvbjAgKioKIENP
TU1JVDsKQEAgLTIyNSw2ICsyMzIsOCBAQCBTRUxFQ1QgKiBGUk9NIHQxIFdIRVJFIGEgSU4gKDIs
NCw2LDgsMTAsCiBhCWIKIDUJNQogNwk3CisyMwkyMworMjUJMjUKIFVQREFURSB0MSBTRVQgYiA9
IDEzIFdIRVJFIGEgSU4gKDIsNCw2LDgsMTAsMTIsMTQsMTYsMTgsMjAsMjIsMjQsMjYpID0gMDsK
ICoqIENvbm5lY3Rpb24gY29uMSAqKgogU1RBUlQgVFJBTlNBQ1RJT047CkBAIC0yNDAsNyArMjQ5
LDkgQEAgYQliCiAxOAkxMgogMjAJMTIKIDIyCTEyCisyMwkyMwogMjQJMTIKKzI1CTI1CiBJTlNF
UlQgSU5UTyB0MSBWQUxVRVMoOSwgOSk7CiBFUlJPUiBIWTAwMDogTG9jayB3YWl0IHRpbWVvdXQg
ZXhjZWVkZWQ7IHRyeSByZXN0YXJ0aW5nIHRyYW5zYWN0aW9uCiBJTlNFUlQgSU5UTyB0MSBWQUxV
RVMoMTMsIDEzKTsKQEAgLTI1OCw3ICsyNjksOSBAQCBhCWIKIDE4CTEyCiAyMAkxMgogMjIJMTIK
KzIzCTIzCiAyNAkxMgorMjUJMjUKIENPTU1JVDsKICoqIENvbm5lY3Rpb24gY29uMCAqKgogQ09N
TUlUOwpAQCAtMjczLDcgKzI4Niw5IEBAIGEJYgogMTgJMTIKIDIwCTEyCiAyMgkxMgorMjMJMTMK
IDI0CTEyCisyNQkxMwogVVBEQVRFIHQxIFNFVCBiID0gMTQgV0hFUkUgYSBJTiAoMiw0LDYsOCkg
PSAwOwogKiogQ29ubmVjdGlvbiBjb24xICoqCiBTVEFSVCBUUkFOU0FDVElPTjsKQEAgLTI4OSw3
ICszMDQsOSBAQCBhCWIKIDE4CTEyCiAyMAkxMgogMjIJMTIKKzIzCTEzCiAyNAkxMgorMjUJMTMK
IElOU0VSVCBJTlRPIHQxIFZBTFVFUyg5LCA5KTsKIEVSUk9SIEhZMDAwOiBMb2NrIHdhaXQgdGlt
ZW91dCBleGNlZWRlZDsgdHJ5IHJlc3RhcnRpbmcgdHJhbnNhY3Rpb24KIElOU0VSVCBJTlRPIHQx
IFZBTFVFUygxMywgMTMpOwpAQCAtMzA3LDcgKzMyNCw5IEBAIGEJYgogMTgJMTIKIDIwCTEyCiAy
MgkxMgorMjMJMTMKIDI0CTEyCisyNQkxMwogQ09NTUlUOwogKiogQ29ubmVjdGlvbiBjb24wICoq
CiBDT01NSVQ7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90
L3R4X2lzb2xhdGlvbl9mdW5jLnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMv
dC90eF9pc29sYXRpb25fZnVuYy50ZXN0CTIwMDgtMTItMTkgMTU6MTI6MTUgKzAwMDAKKysrIGIv
bXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L3R4X2lzb2xhdGlvbl9mdW5jLnRlc3QJMjAxMC0w
NS0xMSAxNzowMjo0OSArMDAwMApAQCAtMTM0LDEyICsxMzQsOSBAQCBTVEFSVCBUUkFOU0FDVElP
TjsKIAogU0VMRUNUICogRlJPTSB0MTsKIAotLS1lcnJvciBFUl9MT0NLX1dBSVRfVElNRU9VVAog
SU5TRVJUIElOVE8gdDEgVkFMVUVTKDIzLCAyMyk7CiAKLS0tZXJyb3IgRVJfTE9DS19XQUlUX1RJ
TUVPVVQKIElOU0VSVCBJTlRPIHQxIFZBTFVFUygyNSwgMjUpOwotLS1lY2hvIEJ1ZzogT25seSBl
dmVuIHJvd3MgYXJlIGJlaW5nIGxvY2tlZCwgZXJyb3IgMTIwNSBzaG91bGQnbnQgaGF2ZSBvY2N1
cmVkCiAKIFNFTEVDVCAqIEZST00gdDE7CiAKCg==

--===============0325746518==
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: 17962fe0567b8166123eae6e6022b835a0fe908e
# timestamp: 2010-05-11 20:04:32 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   9reevde6i3sjlwuc
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQYGf0AAA4NfgEAwWW///38j
lgC////wYAZc+PdgAAd3dVKUAVwkoSnlPUbTU2IyE9qNTAIZDTQAA0OYTAJgBMJhNMAAAmTTQMNV
P9RNGkGgDQGgAAABpkYQGnqiMqaGn6m1E02oyepoaAZAAaMIBzCYBMAJhMJpgAAEyaaBhJEEaATR
onoEjT0TTVPU/U9NTKANBtRKVKqugAkhJYL27gwwgAACABM5fH7H1UbW/cxektUbIzTIElIUmGG2
S3TXCiloCnB72TKwY2lGhfAqhFpiHec4UnuFIRkVzjwX6lBgZgEzf4/qki7Zm41+GQbbMK9kINJi
jDxlArYlOEB50qIkbJ/zpVMjR2Ypa6lRzKpyE3JNDXhUUi0oNNrFI1LC4n0MOerDJrXlBToQ+pLS
0ttmGa0HomUgkQkLT9cDWEcWqap+J+BkuIa+viyD42wbAG2sLklpD5PEwF5eDZN/Esxxl8A6PRJd
C4paobunyLjlIIEC8CY47GDd+JcMhN8hLuS+O1Ycqj2RxLjEqEYskvFhQYO+UIP10eXpMScBmEmQ
3eBH1g8w/Ylxihe1kSZSQDKJEvUNT0fBCBoYuzvCuwgQKRkyFCsPv5uQ9KzBojROiEzgrGwiYlH4
3y4foLELBYlyIMtqiPFhbigz4Jv9DDsoOBt3I7boyNChWp3KJoMf7RhfVm2Vu6N9mLYb45ILGQmH
GGKOvcPZI0AtIyuHLwJpEwIBjN6MVjFqueQTpBVI1JlZiXHidD5FwgoJp5s2d94WzMCsKpDmhpBo
DsNz9YFGjR4dw5FugWkg+JopRi7tXDDdXPKLlQOFQ5xGdmjfwcwGksLjcXlhKuwDqqEzyLzU/5Uk
EyhLu7sHuN5LvnUMbj3khRNLuJ4j3jmh4cE2W0pgs4GhcGpv/cjMnUOZY5OzLAZb2xYz7wK8QmdC
BYcT8smA/ONqk9uFeM4RLtIgbFgcpZ11nQ+h5xwzLCCLNXiYq9i8GPgZlCB89Dv0wkxuvW1Azq/V
yq0xGOZMrNDgBZHOyAVkRgMo7MZSsMcHozTAtiQKSYH3Xl5MkZcC9oMxIgZqrP0z7Vfb1y3XboEN
uhiOnCOi0ROjAIXL0qYzZBXapRT3E3OnkQzOVfs3HjfQ5Qe59pWDIQJkAYcJIJKPj0ASIwqQZ+oa
BEgRRdljDAWJQ0oET3Ez4Sah13bTCDuwgF0GYrO0S4WWJKTkTUexQmf3SX4tMliWFDD4teg5Fgl4
aYs8FsS8xj2lM850nUXDuOIs3fQHMVk7CaFkZnSS37cKTLRjHYzMgbypS6s33iffrEZJN9kBiY41
DmJ7mBqfgwC+Rg1xgJEEqnMS3E2QeYVd46cafEZRyAmMx3nVMMbyvSR2UCnLvVqijy0NpMwuOdRk
Gp8/wgLdQJK5MJzbnsPOmocy/RTGLJ5q4gI8RiaLiKGErRAXYCgeVK2vUxmVUc7VRiG69XBLTF5g
U5xEO4/Y7Gp4Rw7LmVgP1E2uX1JCJEC83gKys5rL5NQ47tAKzquOHNLeSUuJ2Rk2wtX79ZTtFRJg
4iLaVRJwshHXQIj2AgWgvh+Ewk+RDcABaIw18C0IiVaV5smXJJkQPI23fweR4msexpkW+KsMBB9R
K7Q9uxD/JAGOCrUYdc10DmXEKixc6H/iU+I7lR9RxKa3pe0iaJMPUB9gIGtbq88186hRYTJ4eQA3
Jlp1Pg/xSbokFEB5wRokpotXgeEFu46lyNhA2hz58w2yVAy3F/KlBtPoBgHubbGOffmVQcwBG09T
wPdedSCGXD0YzZQYtKqgC1a3Yy0CcyoZhk651kWGbTRevKTKxalOoiBorAglw2szXBYi8YtQzW5+
d8MSdOnkSJkyJ6A5qPkOWhUt+mJFWJVeViLQ+gxUwblUfMyYbCZZsWzfckYkzXoJ66KlKTK4OLz2
gqRhVfNDQJcOgvxP7PcuVyTZF6OjiKcZu/2MCMJHYwKihsy2BwH3rixqpijYK/8XckU4UJAGBn9A


--===============0325746518==--