From: marko.makela
Date: May 11 2010 3:46pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3081)
List-Archive: http://lists.mysql.com/commits/107998
Message-Id: <201005111546.o4BE2U0J008734@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1439266222=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS41LWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTExNTQyNDQtN3A0dDhv
M3k1bjNsaHFpegoKIDMwODEgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xMQogICAgICBNZXJnZSBm
cm9tIG15c3FsLTUuMS1pbm5vZGI6CiAgICAgIAogICAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICAgIHJldm5vOiAz
NDU4CiAgICAgICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTEx
MTA1MDEyLWIydDd3dno2bXU2YmxsNzQKICAgICAgICBwYXJlbnQ6IG1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTAwNTExMTA0OTEwLW5pbThrZ2d1YXdwaXM3em8KICAgICAgICBjb21taXR0ZXI6
IE1hcmtvIE3DpGtlbMOkIDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgICBicmFuY2gg
bmljazogbXlzcWwtNS4xLWlubm9kYgogICAgICAgIHRpbWVzdGFtcDogVHVlIDIwMTAtMDUtMTEg
MTM6NTA6MTIgKzAzMDAKICAgICAgICBtZXNzYWdlOgogICAgICAgICAgRG8gbm90IGRlbWFuZCB0
aGF0IGJ1Zl9wYWdlX3QgYmUgZnVsbHkgaW5pdGlhbGl6ZWQgb24gNjQtYml0IHN5c3RlbXMuCiAg
ICAgICAgICBUaGVyZSBtYXkgYmUgcGFkZGluZyBiZWZvcmUgYnVmX3BhZ2VfdDo6emlwLiAoQnVn
ICM1MzMwNykKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGxy
dS5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYwYnVmLmljCj09PSBtb2RpZmll
ZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwbHJ1LmMnCi0tLSBhL3N0b3JhZ2UvaW5u
b2Jhc2UvYnVmL2J1ZjBscnUuYwkyMDEwLTA0LTE5IDE1OjQ0OjE1ICswMDAwCisrKyBiL3N0b3Jh
Z2UvaW5ub2Jhc2UvYnVmL2J1ZjBscnUuYwkyMDEwLTA1LTExIDE1OjQ2OjE3ICswMDAwCkBAIC0x
NDcyLDcgKzE0NzIsMTIgQEAgYnVmX0xSVV9mcmVlX2Jsb2NrKAogCXV0X2FkKGJ1Zl9wYWdlX2lu
X2ZpbGUoYnBhZ2UpKTsKIAl1dF9hZChicGFnZS0+aW5fTFJVX2xpc3QpOwogCXV0X2FkKCFicGFn
ZS0+aW5fZmx1c2hfbGlzdCA9PSAhYnBhZ2UtPm9sZGVzdF9tb2RpZmljYXRpb24pOworI2lmIFVO
SVZfV09SRF9TSVpFID09IDQKKwkvKiBPbiAzMi1iaXQgc3lzdGVtcywgdGhlcmUgaXMgbm8gcGFk
ZGluZyBpbiBidWZfcGFnZV90LiAgT24KKwlvdGhlciBzeXN0ZW1zLCBWYWxncmluZCBjb3VsZCBj
b21wbGFpbiBhYm91dCB1bmluaXRpYWxpemVkIHBhZAorCWJ5dGVzLiAqLwogCVVOSVZfTUVNX0FT
U0VSVF9SVyhicGFnZSwgc2l6ZW9mICpicGFnZSk7CisjZW5kaWYKIAogCWlmICghYnVmX3BhZ2Vf
Y2FuX3JlbG9jYXRlKGJwYWdlKSkgewogCkBAIC0xNzc5LDcgKzE3ODQsMTIgQEAgYnVmX0xSVV9i
bG9ja19yZW1vdmVfaGFzaGVkX3BhZ2UoCiAJdXRfYShidWZfcGFnZV9nZXRfaW9fZml4KGJwYWdl
KSA9PSBCVUZfSU9fTk9ORSk7CiAJdXRfYShicGFnZS0+YnVmX2ZpeF9jb3VudCA9PSAwKTsKIAor
I2lmIFVOSVZfV09SRF9TSVpFID09IDQKKwkvKiBPbiAzMi1iaXQgc3lzdGVtcywgdGhlcmUgaXMg
bm8gcGFkZGluZyBpbgorCWJ1Zl9wYWdlX3QuICBPbiBvdGhlciBzeXN0ZW1zLCBWYWxncmluZCBj
b3VsZCBjb21wbGFpbgorCWFib3V0IHVuaW5pdGlhbGl6ZWQgcGFkIGJ5dGVzLiAqLwogCVVOSVZf
TUVNX0FTU0VSVF9SVyhicGFnZSwgc2l6ZW9mICpicGFnZSk7CisjZW5kaWYKIAogCWJ1Zl9MUlVf
cmVtb3ZlX2Jsb2NrKGJwYWdlKTsKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh
c2UvaW5jbHVkZS9idWYwYnVmLmljJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnVm
MGJ1Zi5pYwkyMDEwLTA0LTE5IDE1OjQ0OjE1ICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9idWYwYnVmLmljCTIwMTAtMDUtMTEgMTU6NDY6MTcgKzAwMDAKQEAgLTk3NSw3ICs5
NzUsMTIgQEAgYnVmX3BhZ2VfaGFzaF9nZXRfbG93KAogCQl1dF9hKGJ1Zl9wYWdlX2luX2ZpbGUo
YnBhZ2UpKTsKIAkJdXRfYWQoYnBhZ2UtPmluX3BhZ2VfaGFzaCk7CiAJCXV0X2FkKCFicGFnZS0+
aW5femlwX2hhc2gpOworI2lmIFVOSVZfV09SRF9TSVpFID09IDQKKwkJLyogT24gMzItYml0IHN5
c3RlbXMsIHRoZXJlIGlzIG5vIHBhZGRpbmcgaW4KKwkJYnVmX3BhZ2VfdC4gIE9uIG90aGVyIHN5
c3RlbXMsIFZhbGdyaW5kIGNvdWxkIGNvbXBsYWluCisJCWFib3V0IHVuaW5pdGlhbGl6ZWQgcGFk
IGJ5dGVzLiAqLwogCQlVTklWX01FTV9BU1NFUlRfUlcoYnBhZ2UsIHNpemVvZiAqYnBhZ2UpOwor
I2VuZGlmCiAJfQogCiAJcmV0dXJuKGJwYWdlKTsKCg==

--===============1439266222==
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: 23d05603534bd39e491bc31750ad045ab0c6f4b9
# timestamp: 2010-05-11 18:46:26 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   7p4t8o3y5n3lhqiz
# 
# Begin bundle
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
XVA=


--===============1439266222==--