From: marko.makela
Date: August 18 2010 11:40am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3166) Bug#55626
List-Archive: http://lists.mysql.com/commits/116089
X-Bug: 55626
Message-Id: <201008181140.o7IBLC8K022052@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0600176779=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwODE4MDcxNDA2LXR2eDVw
OTZ0czM5MTlvNHYKCiAzMTY2IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDgtMTgKICAgICAgTWVyZ2Ug
QnVnIzU1NjI2IGZpeCBmcm9tIG15c3FsLTUuMS1pbm5vZGI6CiAgICAgIAogICAgICByZXZubzog
MzU0NQogICAgICByZXZpc2lvbi1pZDogbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA4MTgx
MTAxMTAtemZzMGkxdmZyY2NmYjR5dwogICAgICBwYXJlbnQ6IHZhc2lsLmRpbW92QG9yYWNsZS5j
b20tMjAxMDA4MTcxOTM5MzQtMXlsN3p6Mm9kaWt4YXVmOAogICAgICBjb21taXR0ZXI6IE1hcmtv
IE3DpGtlbMOkIDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgYnJhbmNoIG5pY2s6IDUu
MS1pbm5vZGIKICAgICAgdGltZXN0YW1wOiBXZWQgMjAxMC0wOC0xOCAxNDowMToxMCArMDMwMAog
ICAgICBtZXNzYWdlOgogICAgICAgIEJ1ZyM1NTYyNjogTUlOIGFuZCBNQVggcmVhZGluZyBhIGRl
bGV0ZS1tYXJrZWQgcmVjb3JkIGZyb20gc2Vjb25kYXJ5IGluZGV4CiAgICAgIAogICAgICAgIFJl
bW92ZSBhIGJvZ3VzIGRlYnVnIGFzc2VydGlvbiB0aGF0IHRyaWdnZXJlZCB0aGUgYnVnLgogICAg
ICAgIEFkZCBhc3NlcnRpb25zIHByZWNpc2VseSB3aGVyZSByZWNvcmRzIG11c3Qgbm90IGJlIGRl
bGV0ZS1tYXJrZWQuCiAgICAgICAgQW5kIGEgY29tbWVudCB0byBjbGFyaWZ5IHdoZW4gdGhlIHJl
Y29yZCBpcyBhbGxvd2VkIHRvIGJlIGRlbGV0ZS1tYXJrZWQuCgogICAgbW9kaWZpZWQ6CiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFn
ZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cw
c2VsLmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMDgxODA3MTQwNi10dng1cDk2
dHMzOTE5bzR2CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDgxODExNDAwMi02aWZ0ZnFyNG41aDEzeGI2CkBAIC0y
NjgyLDcgKzI2ODIsNiBAQCByb3dfc2VsX3N0b3JlX215c3FsX3JlYygKIAl1dF9hZChwcmVidWls
dC0+bXlzcWxfdGVtcGxhdGUpOwogCXV0X2FkKHByZWJ1aWx0LT5kZWZhdWx0X3JlYyk7CiAJdXRf
YWQocmVjX29mZnNfdmFsaWRhdGUocmVjLCBOVUxMLCBvZmZzZXRzKSk7Ci0JdXRfYWQoIXJlY19n
ZXRfZGVsZXRlZF9mbGFnKHJlYywgcmVjX29mZnNfY29tcChvZmZzZXRzKSkpOwogCiAJaWYgKFVO
SVZfTElLRUxZX05VTEwocHJlYnVpbHQtPmJsb2JfaGVhcCkpIHsKIAkJbWVtX2hlYXBfZnJlZShw
cmVidWlsdC0+YmxvYl9oZWFwKTsKQEAgLTM2MDMsNiArMzYwMiw3IEBAIHJvd19zZWFyY2hfZm9y
X215c3FsKAogCQkJCXJvd19zZWxfdHJ5X3NlYXJjaF9zaG9ydGN1dF9mb3JfbXlzcWwoKS4KIAkJ
CQlUaGUgbGF0Y2ggd2lsbCBub3QgYmUgcmVsZWFzZWQgdW50aWwKIAkJCQltdHJfY29tbWl0KCZt
dHIpLiAqLworCQkJCXV0X2FkKCFyZWNfZ2V0X2RlbGV0ZWRfZmxhZyhyZWMsIGNvbXApKTsKIAog
CQkJCWlmICghcm93X3NlbF9zdG9yZV9teXNxbF9yZWMoYnVmLCBwcmVidWlsdCwKIAkJCQkJCQkg
ICAgIHJlYywgb2Zmc2V0cykpIHsKQEAgLTQyMzAsNyArNDIzMCw3IEBAIG5vX2dhcF9sb2NrOgog
CiAJCQkJcmVjID0gb2xkX3ZlcnM7CiAJCQl9Ci0JCX0gZWxzZSBpZiAoIWxvY2tfc2VjX3JlY19j
b25zX3JlYWRfc2VlcyhyZWMsIHRyeC0+cmVhZF92aWV3KSkgeworCQl9IGVsc2UgewogCQkJLyog
V2UgYXJlIGxvb2tpbmcgaW50byBhIG5vbi1jbHVzdGVyZWQgaW5kZXgsCiAJCQlhbmQgdG8gZ2V0
IHRoZSByaWdodCB2ZXJzaW9uIG9mIHRoZSByZWNvcmQgd2UKIAkJCWhhdmUgdG8gbG9vayBhbHNv
IGludG8gdGhlIGNsdXN0ZXJlZCBpbmRleDogdGhpcwpAQCAtNDIzOCw4ICs0MjM4LDEyIEBAIG5v
X2dhcF9sb2NrOgogCQkJaW5mb3JtYXRpb24gdmlhIHRoZSBjbHVzdGVyZWQgaW5kZXggcmVjb3Jk
LiAqLwogCiAJCQl1dF9hZChpbmRleCAhPSBjbHVzdF9pbmRleCk7CisJCQl1dF9hZCghZGljdF9p
bmRleF9pc19jbHVzdChpbmRleCkpOwogCi0JCQlnb3RvIHJlcXVpcmVzX2NsdXN0X3JlYzsKKwkJ
CWlmICghbG9ja19zZWNfcmVjX2NvbnNfcmVhZF9zZWVzKAorCQkJCSAgICByZWMsIHRyeC0+cmVh
ZF92aWV3KSkgeworCQkJCWdvdG8gcmVxdWlyZXNfY2x1c3RfcmVjOworCQkJfQogCQl9CiAJfQog
CkBAIC00MzYyLDggKzQzNjYsMTMgQEAgcmVxdWlyZXNfY2x1c3RfcmVjOgogCQkJCQkJICBVTElO
VF9VTkRFRklORUQsICZoZWFwKTsKIAkJCXJlc3VsdF9yZWMgPSByZWM7CiAJCX0KKworCQkvKiBy
ZXN1bHRfcmVjIGNhbiBsZWdpdGltYXRlbHkgYmUgZGVsZXRlLW1hcmtlZAorCQlub3cgdGhhdCBp
dCBoYXMgYmVlbiBlc3RhYmxpc2hlZCB0aGF0IGl0IHBvaW50cyB0byBhCisJCWNsdXN0ZXJlZCBp
bmRleCByZWNvcmQgdGhhdCBleGlzdHMgaW4gdGhlIHJlYWQgdmlldy4gKi8KIAl9IGVsc2Ugewog
CQlyZXN1bHRfcmVjID0gcmVjOworCQl1dF9hZCghcmVjX2dldF9kZWxldGVkX2ZsYWcocmVjLCBj
b21wKSk7CiAJfQogCiAJLyogV2UgZm91bmQgYSBxdWFsaWZ5aW5nIHJlY29yZCAncmVzdWx0X3Jl
YycuIEF0IHRoaXMgcG9pbnQsCgo=

--===============0600176779==
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.5-innodb/
# testament_sha1: 0255fda24afa32e650ec3f608c824168845977d4
# timestamp: 2010-08-18 14:40:09 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   tvx5p96ts3919o4v
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb/X6iAAAlxflEAwen///3Mj
EMC/7//6BAAIAFAFfXOzlnWm15g1i3sx7BJIUyYAmKYNEwTCaNKNNkQaG1G1AyRTyaZNpSfojRJt
NT0QbQAEGjARoEoIECMqfplDTSHqNPU9JphAaaAaD1AkUIympoaDQaNBtTQABoBoAASiqfoFPajU
8KeakzCQ2oxGhoANAaAyLERAbbbYFPvRvvZr5eiRV84cVLj/NeEvPr3Ddu26xrHrRtlgWMlWwbds
zm3wlhQz4v84D/0wWp4estsmy9yqoH17xJeEWvxbDyRwXkVqhuNUkpxVymsqiUuBqO9bajYOzQh8
/13M/9xnLdTOD9ZGLqejjo+X3s33SWuDDlL3ee95P9msdPyiy5K9cBJA/6IqIIskMKNyjjnzgbdA
u38dPshzLSaFEWU6mMjojwrj99DPXpGVqvopOHDAF5L36CzKrGtZbKdMA8NeCszZ8+MhU6tUTITg
j3oN/ynz46ZJrt6sDVYQT44iiCwX5oUYp20Fd7paUSissUFN984EUi5sV1NNMlvRg5rFrK8FjGyj
g3XzmZw2SYJnz9uOBhXDuknSxRPVG2aMhVLmhV++wVgvko1CfnTmO8104sBHPK3A3ooUaEYXiuNy
IscmZ6SJk6wA2cQUSEAdQ1QO6wa3mYFWAadqfkjLgnvTcF+MTmNYKKm8LUWzakgxDny03CVlJLC6
IJqvtg0GoBzKW7MI3l1gtTWHnSN0zB+p1QnuZc6YrHZPAWpead4xeMwz0Cm7K0ULFLFmF1V5Je07
yJNmsJy+0cPhW7vRCaVF1qraVE84MzcsaGGAc1DQJEtgoVTCglwOtwmJWFKFpoZzcMhKEiSuiBr0
PbLLasQ+zGypdcWq6uSLyuVzGKThLLIvLCUUg2vnx2WXdPFnZg7g7LhVesNV7k2TRtiMYR42tUFf
5r1MpTdWUanP0cOxqsXwG9Bo+9JLpUUX8ONRCLptFPBT84pvM2MRhq9TbnCTkW6r4nxYwcWLAGQy
sTNYXoGlua9BJvtFBpCTD4XIGLVO7AVQj1sgjYwyCoDqrgiHmAqY9EGBM91emEXIjhpU6e2fI7fm
g/ygIe4ZY6V+NhWpjYo0S1qCzu+JcDVjscecr0LafPIJQuucSRMEns4mK63jMzKcGJN1T5MaxJrn
hAjIVrsdV0rRWRxhzXvxJbwiyUwu4cNK4uI8vIICUXNvyk71ubi/x6YYiZ00QUKlqNjgKmZg6/G5
743erzTQbtF3c2Uo5G+3vgoXztd93FSC8W6yqBwllrzTFFCvlrJLr7LfMpZVttNKj0MhGEiXBKxR
wgtxIeZ178Fu3kWveTH48azmY9rzraLB5hKLE0VioFpqYJiwkM+3Q44xFrCWdElZnKQI3zHKUFfO
TIsDjU+cokRlZIFiRAwJi8FPbDM/Ij1V1MEeBBbGtdvUIa3yu0obDE5FLFqC1A2kgMRCSDXYm4Cg
0JnfZgVBPEyExXAVHBr2u/OaJ7pE8M4B6IMAs7j5C7OYzMF0644RTGBcjhoYmTLSMYRd2MF3/ASB
Oa7aBJg2aFVFFYMKljyUM1KY01exloNBkUull55dfo41pBMJuznPP4QpweFCjepauWCHyCpeq+yd
fq1ucnkr587sU3hULLqZcRNKgMpicD5OXzc3SdrHQXxCZaI3Kt+IwsSkuRURLkbQQr4IdFEnMFop
a2UOvNp2sk3g+Y+vRevalPFM3MRhoBUGrS7qtJGlGRaBR9rxwWKlrXu7DUSg+3CXYKkQZSegZKh9
4LCXXbJroRoeXWgKWo4sa3pL2GAzHCW/+AmyqYlTcN2RdNrWhktTvJWrx1xZ0aW0LXIDxgxDs7GT
qnc/oJwZMR3OcU3WeOmc1S9qjKf8FB7H/i7kinChIX+v1EA=


--===============0600176779==--