From: marko.makela
Date: June 21 2010 9:40am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3515) Bug#54658
List-Archive: http://lists.mysql.com/commits/111663
X-Bug: 54658
Message-Id: <201006210940.o5L9aHui010900@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1456292589=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwNjE4MDg1MTU1LXhubTQ2
OWNiaGVkcWVhOTYKCiAzNTE1IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDYtMjEKICAgICAgQnVnICM1
NDY1ODogSW5ub0RCOiBXYXJuaW5nOiBhbGxvY2F0ZWQgdGFibGVzcGFjZSAlbHUsIG9sZCBtYXhp
bXVtIHdhcyAwCiAgICAgIAogICAgICBkaWN0X2NoZWNrX3RhYmxlc3BhY2VzX2FuZF9zdG9yZV9t
YXhfaWQoKTogSW5pdGlhbGl6ZSBtYXhfc3BhY2VfaWQKICAgICAgYW5kIGZpbF9zeXN0ZW0tPm1h
eF9hc3NpZ25lZF9pZCBmcm9tIERJQ1RfSERSX01BWF9TUEFDRV9JRC4KICAgICAgCiAgICAgIGZp
bF9zcGFjZV9jcmVhdGUoKTogU3VwcHJlc3MgdGhlIHdhcm5pbmcgdW5sZXNzICFyZWN2X3JlY292
ZXJ5X29uCiAgICAgIChkbyBub3QgY29tcGxhaW4gd2hpbGUgYXBwbHlpbmcgdGhlIHJlZG8gbG9n
KS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2RpY3QvZGljdDBs
b2FkLmMKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2ZpbC9maWwwZmlsLmMKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9kaWN0L2RpY3QwbG9hZC5jJwotLS0gYS9z
dG9yYWdlL2lubm9kYl9wbHVnaW4vZGljdC9kaWN0MGxvYWQuYwlyZXZpZDp2YXNpbC5kaW1vdkBv
cmFjbGUuY29tLTIwMTAwNjE4MDg1MTU1LXhubTQ2OWNiaGVkcWVhOTYKKysrIGIvc3RvcmFnZS9p
bm5vZGJfcGx1Z2luL2RpY3QvZGljdDBsb2FkLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMDA2MjEwOTQwMDgtbzlmYTE1M3MzZjA5bWVydwpAQCAtMzE2LDcgKzMxNiw3IEBAIGRp
Y3RfY2hlY2tfdGFibGVzcGFjZXNfYW5kX3N0b3JlX21heF9pZCgKIAlkaWN0X2luZGV4X3QqCXN5
c19pbmRleDsKIAlidHJfcGN1cl90CXBjdXI7CiAJY29uc3QgcmVjX3QqCXJlYzsKLQl1bGludAkJ
bWF4X3NwYWNlX2lkCT0gMDsKKwl1bGludAkJbWF4X3NwYWNlX2lkOwogCW10cl90CQltdHI7CiAK
IAltdXRleF9lbnRlcigmKGRpY3Rfc3lzLT5tdXRleCkpOwpAQCAtMzI3LDYgKzMyNywxMSBAQCBk
aWN0X2NoZWNrX3RhYmxlc3BhY2VzX2FuZF9zdG9yZV9tYXhfaWQoCiAJc3lzX2luZGV4ID0gVVRf
TElTVF9HRVRfRklSU1Qoc3lzX3RhYmxlcy0+aW5kZXhlcyk7CiAJdXRfYSghZGljdF90YWJsZV9p
c19jb21wKHN5c190YWJsZXMpKTsKIAorCW1heF9zcGFjZV9pZCA9IG10cl9yZWFkX3VsaW50KGRp
Y3RfaGRyX2dldCgmbXRyKQorCQkJCSAgICAgICsgRElDVF9IRFJfTUFYX1NQQUNFX0lELAorCQkJ
CSAgICAgIE1MT0dfNEJZVEVTLCAmbXRyKTsKKwlmaWxfc2V0X21heF9zcGFjZV9pZF9pZl9iaWdn
ZXIobWF4X3NwYWNlX2lkKTsKKwogCWJ0cl9wY3VyX29wZW5fYXRfaW5kZXhfc2lkZShUUlVFLCBz
eXNfaW5kZXgsIEJUUl9TRUFSQ0hfTEVBRiwgJnBjdXIsCiAJCQkJICAgIFRSVUUsICZtdHIpOwog
bG9vcDoKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vZmlsL2ZpbDBm
aWwuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2ZpbC9maWwwZmlsLmMJcmV2aWQ6dmFz
aWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMDYxODA4NTE1NS14bm00NjljYmhlZHFlYTk2CisrKyBi
L3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9maWwvZmlsMGZpbC5jCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTAwNjIxMDk0MDA4LW85ZmExNTNzM2YwOW1lcncKQEAgLTExOTcsNyArMTE5
Nyw3IEBAIHRyeV9hZ2FpbjoKIAlzcGFjZS0+dGFibGVzcGFjZV92ZXJzaW9uID0gZmlsX3N5c3Rl
bS0+dGFibGVzcGFjZV92ZXJzaW9uOwogCXNwYWNlLT5tYXJrID0gRkFMU0U7CiAKLQlpZiAoVU5J
Vl9MSUtFTFkocHVycG9zZSA9PSBGSUxfVEFCTEVTUEFDRSkKKwlpZiAoVU5JVl9MSUtFTFkocHVy
cG9zZSA9PSBGSUxfVEFCTEVTUEFDRSAmJiAhcmVjdl9yZWNvdmVyeV9vbikKIAkgICAgJiYgVU5J
Vl9VTkxJS0VMWShpZCA+IGZpbF9zeXN0ZW0tPm1heF9hc3NpZ25lZF9pZCkpIHsKIAkJaWYgKCFm
aWxfc3lzdGVtLT5zcGFjZV9pZF9yZXVzZV93YXJuZWQpIHsKIAkJCWZpbF9zeXN0ZW0tPnNwYWNl
X2lkX3JldXNlX3dhcm5lZCA9IFRSVUU7Cgo=

--===============1456292589==
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.1-innodb/
# testament_sha1: 1f047dcd1d81565c1de47d16738599538fab6be2
# timestamp: 2010-06-21 12:40:25 +0300
# base_revision_id: vasil.dimov@stripped\
#   xnm469cbhedqea96
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdxSctYAAnrflFAwe2///3/v
3+C////wBAAIAFAFRrb2G2Vu11VbMrtzLCSRCamMQMSZpMJ6p6nqHogNDT1Mh6amnqG1NGgJKJoG
k9AEZTKaaDyTagxBoZAAaaaaaNAlNE1T0VPAh6ap6n6oekAZHlAaGQAAA0AcaMmRhGIBhNBgE0Gg
ZMmjJkMIDCSQI01DSHpop5T01NpPRGj1AAGjQeoAA0OIBhQHcyc1uXJgws6irNYgjeb+86zHiyH3
kVtrbvnbSWUfoj0Q2tF59+kWE4Zd3Zz490+cj4y4MzMwYe1GaCxTQ9JOhKdMqJX9w0dn7bdh1E05
qufX+QYqPW4pfywYk2JBx0tBJRUYM3GHC9RpKrF9J7JcU6sDKMfyNztDfuPfodhzst14PHP8Xp+f
XgLJC6RY7BRQFTbrP04Du7VSx7srBJahmTbeszGswM+SpGZM2NMkPwPsIYaAHypC1ihcxrecb9p+
CsVEKAwE3VwUHgZwGohimc3kFeslPUiDFxPbwPQvDVzMvOFoG2k1OhQROeKIv7maEeFjab7M4Wr9
6KnAdtcwptMmMFvymUZVMnjBaGzSYyVyjtKFPG6UCOe7HUPvfPMZNIpwLSxyNHKwYzlEVlQ+h9EC
siysULG/1kszWmzOLtE1kL0sRvGBEAaN7KZCWC29NO68odnLHN8ujgaMTaWo3LeaBQnhL2qXFgWQ
tMAEefiT1e4xyLBhXZJq4c4tE1w6KMsa1OYA8ijhuvLbhWZikn3pHquMLBPDVjnfTI2ELRWj5LJ0
WyinHsbFKVaaCusMBhonHx0khWiLxPTtNm+9WwhUYKpsUJEpwtYnlFeXDxQfI0CoupIFqlMxNOVG
aNRHgApIAa+vbayvinxmEsyM6y2qb2uhpcFVS1jFbFeNRshp8DYcS3dMg0gxrHw1+Mr5LoqjwTIO
HcvwSXWZmYb1dk/Vpet4V3HOfaj8VdDiS4R08ZWMJOjplKdsmFzoj33y9VHwUCcmJG23Tbbhwlmb
hOWjv7z+Fjq2dOvk2OceaFw9mbW0DCfuIvIT6OeQNYibtzvGSDCAxPwCwhWkdPnMB8EFolzKwdLd
N6FFnoSNxmpLcXr0w9EyXNZSO3wahRwF3a5BpcLNlPKM+ReQFA0jm9hjKlRx39xcAwRFuGKuuLaK
EXKZuUUudTCY4uKVLe2wzZ78DqHCV8SjywEUgHDFTO1s4rV/HedSPATCQZh3ARFYz7Mpf0CsL5DI
LYiiX2VqlTPZarkt7BOtURqeAYDLu0DpzJugieazKxmZjakQGQRt3OxNs2N2ETQlo7cTlXlbgy7e
JuC2TY/042gsWJdpMF1M0dGrOBWZOHOqRKVvRNEJVUFsAdw5B+/vDyrsgZRcw41KC2KKY2fzk5uk
cONTGlm1vNTXRYtcpRU1QoMZagoXLMLDEshLUBZRrZJoZ3wKzJ6MQnJhamFGRKGmetFz0zE05zY6
bFxFaI68U4jbdEhMWpH7zIzgpgtAWIsdvMoJkjl1PVBJgqJPLnJi+zq1Jiid3SSyxshOtJ2tIwm8
0ph2OhturR19aiLjhAt1GvO7TRo/JWYQhnJIYXDSA6OI9d6WxOjeWOMomYGXY5OUZIoBVpBsDpu1
gGA9HC46hLaKC3mplF2KoGbAIZMGBEo2SlGOgik1R4KEudoxaXRUJBsZhWw7Ct6VNO+5QlkBTphR
e63c1WWVGcB2Rdau8BEw85eZg7OTY2DEFhvItgZBK2WMUS5047mrQduKXIKb4XWZq0T5JDcRTHVl
STCzLx6k1wo2hI+3k79eT5xVQ+m5WsDdsVicZ0W0SoM22zIl4m0KtFSL8cbAj/iPo/4u5IpwoSG4
pOWs


--===============1456292589==--