From: marko.makela
Date: January 20 2011 2:15pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3446) WL#5458
List-Archive: http://lists.mysql.com/commits/129282
Message-Id: <201101201415.p0KDtBVY027704@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0740517725=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyMDA5NTA0OS00eHZq
aXZxY2xkZ2hpNzdiCgogMzQ0NiBNYXJrbyBNw6RrZWzDpAkyMDExLTAxLTIwCiAgICAgIEFkZCBz
b21lIGRlYnVnIGFzc2VydGlvbnMgYW5kIGNvcnJlY3Qgc29tZSBjb21tZW50cy4KICAgICAgVGhp
cyBpcyBwYXJ0IG9mIHRoZSBXTCM1NDU4IGNsZWFuLXVwLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvbG9jazBsb2NrLmgKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9sb2NrL2xvY2swbG9jay5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB0cnguYwo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2xvY2swbG9jay5oJwot
LS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvbG9jazBsb2NrLmgJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMTAxMjAwOTUwNDktNHh2aml2cWNsZGdoaTc3YgorKysgYi9zdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvbG9jazBsb2NrLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMTAxMjAxNDE1MjQtbXlucHhnMHcwY2Q5b2loZwpAQCAtNjEwLDcgKzYxMCw3IEBA
IGxvY2tfcHJpbnRfaW5mb19zdW1tYXJ5KAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFByaW50cyBpbmZv
IG9mIGxvY2tzIGZvciBlYWNoIHRyYW5zYWN0aW9uLiBUaGlzIGZ1bmN0aW9uIGFzc3VtZXMgdGhh
dCB0aGUKIGNhbGxlciBob2xkcyB0aGUgbG9jayBtdXRleCBhbmQgbW9yZSBpbXBvcnRhbnRseSBp
dCB3aWxsIHJlbGVhc2UgdGhlIGxvY2sKLWxvY2sgbXV0ZXggb24gYmVoYWxmIG9mIHRoZSBjYWxs
ZXIuIChUaGlzIHNob3VsZCBiZSBmaXhlZCBpbiB0aGUgZnV0dXJlKS4gKi8KK211dGV4IG9uIGJl
aGFsZiBvZiB0aGUgY2FsbGVyLiAoVGhpcyBzaG91bGQgYmUgZml4ZWQgaW4gdGhlIGZ1dHVyZSku
ICovCiBVTklWX0lOVEVSTgogdm9pZAogbG9ja19wcmludF9pbmZvX2FsbF90cmFuc2FjdGlvbnMo
Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5jJwot
LS0gYS9zdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMTAxMjAwOTUwNDktNHh2aml2cWNsZGdoaTc3YgorKysgYi9zdG9yYWdl
L2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMTAxMjAxNDE1MjQtbXlucHhnMHcwY2Q5b2loZwpAQCAtODQyLDYgKzg0Miw3IEBAIGxvY2tf
cmVzZXRfbG9ja19hbmRfdHJ4X3dhaXQoCiB7CiAJdXRfYWQobG9jay0+dHJ4LT5sb2NrLndhaXRf
bG9jayA9PSBsb2NrKTsKIAl1dF9hZChsb2NrX2dldF93YWl0KGxvY2spKTsKKwl1dF9hZChsb2Nr
X211dGV4X293bigpKTsKIAogCS8qIFJlc2V0IHRoZSBiYWNrIHBvaW50ZXIgaW4gdHJ4IHRvIHRo
aXMgd2FpdGluZyBsb2NrIHJlcXVlc3QgKi8KIApAQCAtMjM4NSw2ICsyMzg2LDcgQEAgbG9ja19y
ZWNfZGVxdWV1ZV9mcm9tX3BhZ2UoCiAJCSAgICAmJiAhbG9ja19yZWNfaGFzX3RvX3dhaXRfaW5f
cXVldWUobG9jaykpIHsKIAogCQkJLyogR3JhbnQgdGhlIGxvY2sgKi8KKwkJCXV0X2FkKGxvY2st
PnRyeCAhPSBpbl9sb2NrLT50cngpOwogCQkJbG9ja19ncmFudChsb2NrKTsKIAkJfQogCX0KQEAg
LTMzODksNiArMzM5MSw4IEBAIHZvaWQKIGxvY2tfZGVhZGxvY2tfc3RhcnRfcHJpbnQoKQogLyo9
PT09PT09PT09PT09PT09PT09PT09PSovCiB7CisJdXRfYWQobG9ja19tdXRleF9vd24oKSk7CisK
IAlyZXdpbmQobG9ja19sYXRlc3RfZXJyX2ZpbGUpOwogCXV0X3ByaW50X3RpbWVzdGFtcChsb2Nr
X2xhdGVzdF9lcnJfZmlsZSk7CiAKQEAgLTQxNDgsNiArNDE1Miw3IEBAIGxvY2tfdGFibGVfZGVx
dWV1ZSgKIAkJICAgICYmICFsb2NrX3RhYmxlX2hhc190b193YWl0X2luX3F1ZXVlKGxvY2spKSB7
CiAKIAkJCS8qIEdyYW50IHRoZSBsb2NrICovCisJCQl1dF9hZChpbl9sb2NrLT50cnggIT0gbG9j
ay0+dHJ4KTsKIAkJCWxvY2tfZ3JhbnQobG9jayk7CiAJCX0KIAl9CkBAIC00MjIxLDEzICs0MjI2
LDEzIEBAIHJlbGVhc2VkOgogCQkgICAgJiYgIWxvY2tfcmVjX2hhc190b193YWl0X2luX3F1ZXVl
KGxvY2spKSB7CiAKIAkJCS8qIEdyYW50IHRoZSBsb2NrICovCisJCQl1dF9hZCh0cnggIT0gbG9j
ay0+dHJ4KTsKIAkJCWxvY2tfZ3JhbnQobG9jayk7CiAJCX0KIAl9CiAKLQl0cnhfbXV0ZXhfZXhp
dCh0cngpOwotCiAJbG9ja19tdXRleF9leGl0KCk7CisJdHJ4X211dGV4X2V4aXQodHJ4KTsKIH0K
IAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKi8vKioKQEAgLTQ3MTMsOCArNDcxOCw4IEBAIGxvY2tfcHJpbnRfaW5m
b19zdW1tYXJ5KAogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogUHJpbnRzIGluZm8gb2YgbG9ja3MgZm9y
IGVhY2ggdHJhbnNhY3Rpb24uIFRoaXMgZnVuY3Rpb24gYXNzdW1lcyB0aGF0IHRoZQotY2FsbGVy
IGhvbGRzIHRoZSBsb2NrIG11dGV4IGFuZCBtb3JlIGltcG9ydGFudGx5IGl0IHdpbGwgcmVlYXNl
IHRoZSBsb2NrCi1sb2NrIG11dGV4IG9uIGJlaGFsZiBvZiB0aGUgY2FsbGVyLiAoVGhpcyBzaG91
bGQgYmUgZml4ZWQgaW4gdGhlIGZ1dHVyZSkuICovCitjYWxsZXIgaG9sZHMgdGhlIGxvY2sgbXV0
ZXggYW5kIG1vcmUgaW1wb3J0YW50bHkgaXQgd2lsbCByZWxlYXNlIHRoZSBsb2NrCittdXRleCBv
biBiZWhhbGYgb2YgdGhlIGNhbGxlci4gKFRoaXMgc2hvdWxkIGJlIGZpeGVkIGluIHRoZSBmdXR1
cmUpLiAqLwogVU5JVl9JTlRFUk4KIHZvaWQKIGxvY2tfcHJpbnRfaW5mb19hbGxfdHJhbnNhY3Rp
b25zKApAQCAtNjE5MSw2ICs2MTk2LDcgQEAgbG9ja191bmxvY2tfdGFibGVfYXV0b2luYygKIC8q
PT09PT09PT09PT09PT09PT09PT09PSovCiAJdHJ4X3QqCXRyeCkJLyohPCBpbi9vdXQ6IHRyYW5z
YWN0aW9uICovCiB7CisJdXRfYWQoIWxvY2tfbXV0ZXhfb3duKCkpOwogCS8qIFRoaXMgZnVuY3Rp
b24gaXMgaW52b2tlZCBmb3IgYSBydW5uaW5nIHRyYW5zYWN0aW9uIGJ5IHRoZQogCXRocmVhZCB0
aGF0IGlzIHNlcnZpbmcgdGhlIHRyYW5zYWN0aW9uLiBUaGVyZWZvcmUgaXQgaXMgbm90CiAJbmVj
ZXNzYXJ5IHRvIGhvbGQgdHJ4LT5tdXRleCBoZXJlLiAqLwpAQCAtNjMzMCw2ICs2MzM2LDcgQEAg
bG9ja190YWJsZV9sb2Nrc19jaGVjaygKIAogCXV0X2EodGFibGUgIT0gTlVMTCk7CiAJdXRfYWQo
bG9ja19tdXRleF9vd24oKSk7CisJdXRfYWQoIXRyeF9tdXRleF9vd24odHJ4KSk7CiAKIAlyd19s
b2NrX3NfbG9jaygmdHJ4X3N5cy0+bG9jayk7CiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl
L2lubm9iYXNlL3RyeC90cngwdHJ4LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB0
cnguYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyMDA5NTA0OS00eHZqaXZx
Y2xkZ2hpNzdiCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB0cnguYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyMDE0MTUyNC1teW5weGcwdzBjZDlvaWhnCkBAIC04
ODMsNiArODgzLDggQEAgdHJ4X2NsZWFudXBfYXRfZGJfc3RhcnR1cCgKIC8qPT09PT09PT09PT09
PT09PT09PT09PSovCiAJdHJ4X3QqCXRyeCkJLyohPCBpbjogdHJhbnNhY3Rpb24gKi8KIHsKKwl1
dF9hZCh0cngtPmlzX3JlY292ZXJlZCk7CisKIAlpZiAodHJ4LT5pbnNlcnRfdW5kbyAhPSBOVUxM
KSB7CiAKIAkJdHJ4X3VuZG9faW5zZXJ0X2NsZWFudXAodHJ4KTsKCg==

--===============0740517725==
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/mysql2a/5.6-innodb/
# testament_sha1: 0c5033589220fc7ce5e029ff72063ff2738ab4d4
# timestamp: 2011-01-20 16:15:32 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   4xvjivqcldghi77b
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQv+BasAA2fflAAwenP//3MG
BIC////wBAAIAGAGPdXxo9SoS0AGqEV45piYAEwATAACYAAmCSQIaNAKekR6agHlNNDagGgGgaap
ptKMgNBkAAAAAAAM1UyCmmxqgPSBiAGmmgDRoYQ5piYAEwATAACYAAmCSQmgCYTTJkjAqbJ6SbSP
UDCPUBjGIQWJ2hgW9dHkjQPdQoMh75sizK69eSL5TsyQoApQBSErI4ivYY8pLVZEFc3c5/0kAYRI
lBLWJIEwD49W1WaJ6pWEpT0s56JqaZkoERFEYPkEuiaFcqtKCAhfsfDxSk4iINEJYQkfx4eS+meB
sB5COay/krKIKj6uBxGZ4pVWUxj2XmYmXDmzMWz254rjppuBQYD9ZwJxlOYmCvvHswPbfgRaY6SQ
UHqU3IPsAbPqg5gprEVIK7MMxGWfhF2ngXnHLarsAOFpL8g8TSXiuV4HbKp34t8A6x8w3AavZjqJ
DcUDADgTZnUlnnUkiCiYkeGacG0ixUw5R9xGsCMk3qgxFktoi9KtkRucrGdfR1aDAH0j+1XwO3nJ
JcgISOQZ7HJKdn2QzzcY7D7omEXA/hdElqwiLalsyZ80FOjMqO2fn5HTO0cYJkFJtytGqpIszpHI
jqAOEPL7cnFktKnZUEmAjPeY8Oo0Ik8LolhCZGKDHVhZdzDMM3ySU5NrmD2nXa1H5Qhm+q9V4ZuG
kR3ldmZi7cg1HEbjZsUGx19GjzK61nyM4pBUhk0CmV4hrRhOWDXTFWpq0puKzS2dm/LMqyUiAMS2
QPLHj1GZndSkNn41SKDkjEkd7NCTAWNNSC6M6VBOPQMrnG2m/XHaNTBiwYpYskqM0Ea04teiJIgq
KTBnusKYXS2mrjFBJF2TyEJkHd8xWVUJ8CWyKLS8sJVOQIDFM9shizIHmaCqhiLrmeUsOGVpfM0W
grH0ubCitMy6yRc+N5OT6PotEDzGEyZCA9yCEGZO1wJ7aF9mRidPo8TtS0RTPBKejpYNHVK94Rch
qmkCYUszXoPJB6hl7L5Z1WicOGPNPdh0Xj4CtQYmkrqVYgGL5mnbeieVHkppJLIVAEhMXelFHzPW
ImRvGWKC3Pcc0B0/34HM5ny7oD8AdTHtw2xFxQGB3rW9ZUS6D7NzIPvSgHSxevShBlgTl7h8x5EE
jQoIqLjlLV6HNIGCpBUeLqvHVA89EHcnrOKDYgvY8BFEpA94WGmvs9kIcwe6egKpFggHbm3GPUi9
NbMA+/k8tLPSp86MiZGr8jMROltM58e6CU/GarN129BuXAGsp6rkQVQ86sZ6J5ICKIwORjX25dpX
espGclyOJQezHmr1qSWOHWqUWDisuvKfiO6nLtyyZlzrsg2P2ceiApZg/1YuRert26PDi3GcnFED
5Mk+g5KlBvHUcjga7xjQl3IGkDuWh/a812RwY+PkzjoPZLoI/JJ21Qu6q81A4miVVojovdbJS5JS
nWfYuJh35JNLgHiI3oO+BeHNv6uIsZx37Q0FZlNjlxE/hx8FkWLlUusNwmGTCRzQH+bxc9RBNwDP
pUKEEIeULhzTkAwmhFXKG5yq1N68eA89QoHNhvCXe3RTBdvDLMAk3kgOQv6KwZO6b1ExXGTMdAxk
riEYZmSOoiEwx2B07IeSp7kwwntJog+n5ww/QRLiE7KRhMuvIQaCFNtsW/5iPPggOgxIUi9WmPwg
NBa7FNUQV9RDeGU1bauTIbJ4Tb9uUK558RHks5WRQkj4NUX6xwqQT63hCURBWtH0fBojRSEypsHt
g5uqVVz20ZWq4rE5VosgWWNUlwfhtMpDIBy7RYVdz75AUFuZKzOu8a2lwnBBB7jj2JnJvYnnLsqm
yMOVxleseGOW0mpQabYncDiBE2KbUWquWIjWIcc8FWmEmZgqOAhwHNQixLG8RpnwtCf+J5di7kin
ChIBf8C1YA==


--===============0740517725==--