From: marko.makela
Date: October 4 2010 10:03am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3620) Bug#56716
List-Archive: http://lists.mysql.com/commits/119803
X-Bug: 56716
Message-Id: <201010041003.o949empm017063@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0699399905=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAxMDA0MDk0OTU4LWppM29l
bGJvdmR3YWZyYTUKCiAzNjIwIE1hcmtvIE3DpGtlbMOkCTIwMTAtMTAtMDQKICAgICAgQnVnIzU2
NzE2IElubm9EQiBsb2NrcyBhIHJlY29yZCBnYXAgd2l0aG91dCBsb2NraW5nIHRoZSB0YWJsZQog
ICAgICAKICAgICAgcm93X3NlYXJjaF9mb3JfbXlzcWwoKTogQWNxdWlyZSBhbiBpbnRlbnRpb24g
bG9jayBvbiB0aGUgdGFibGUKICAgICAgYmVmb3JlIGxvY2tpbmcgdGhlIGZpcnN0IHJlY29yZCBn
YXAuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jJwotLS0gYS9z
dG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwc2VsLmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNv
bS0yMDEwMTAwNDA5NDk1OC1qaTNvZWxib3Zkd2FmcmE1CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uv
cm93L3JvdzBzZWwuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAwNDEwMDMz
Ny10N213YW02Nzl6MWJwdTJpCkBAIC0zNTk5LDYgKzM1OTksNDIgQEAgc2hvcnRjdXRfZmFpbHNf
dG9vX2JpZ19yZWM6CiAKIAljbHVzdF9pbmRleCA9IGRpY3RfdGFibGVfZ2V0X2ZpcnN0X2luZGV4
KGluZGV4LT50YWJsZSk7CiAKKwkvKiBEbyBzb21lIHN0YXJ0LW9mLXN0YXRlbWVudCBwcmVwYXJh
dGlvbnMgKi8KKworCWlmICghcHJlYnVpbHQtPnNxbF9zdGF0X3N0YXJ0KSB7CisJCS8qIE5vIG5l
ZWQgdG8gc2V0IGFuIGludGVudGlvbiBsb2NrIG9yIGFzc2lnbiBhIHJlYWQgdmlldyAqLworCisJ
CWlmICh0cngtPnJlYWRfdmlldyA9PSBOVUxMCisJCSAgICAmJiBwcmVidWlsdC0+c2VsZWN0X2xv
Y2tfdHlwZSA9PSBMT0NLX05PTkUpIHsKKworCQkJZnB1dHMoIklubm9EQjogRXJyb3I6IE15U1FM
IGlzIHRyeWluZyB0byIKKwkJCSAgICAgICIgcGVyZm9ybSBhIGNvbnNpc3RlbnQgcmVhZFxuIgor
CQkJICAgICAgIklubm9EQjogYnV0IHRoZSByZWFkIHZpZXcgaXMgbm90IGFzc2lnbmVkIVxuIiwK
KwkJCSAgICAgIHN0ZGVycik7CisJCQl0cnhfcHJpbnQoc3RkZXJyLCB0cngsIDYwMCk7CisJCQlm
cHV0YygnXG4nLCBzdGRlcnIpOworCQkJdXRfZXJyb3I7CisJCX0KKwl9IGVsc2UgaWYgKHByZWJ1
aWx0LT5zZWxlY3RfbG9ja190eXBlID09IExPQ0tfTk9ORSkgeworCQkvKiBUaGlzIGlzIGEgY29u
c2lzdGVudCByZWFkICovCisJCS8qIEFzc2lnbiBhIHJlYWQgdmlldyBmb3IgdGhlIHF1ZXJ5ICov
CisKKwkJdHJ4X2Fzc2lnbl9yZWFkX3ZpZXcodHJ4KTsKKwkJcHJlYnVpbHQtPnNxbF9zdGF0X3N0
YXJ0ID0gRkFMU0U7CisJfSBlbHNlIHsKKwkJZXJyID0gbG9ja190YWJsZSgwLCBpbmRleC0+dGFi
bGUsCisJCQkJIHByZWJ1aWx0LT5zZWxlY3RfbG9ja190eXBlID09IExPQ0tfUworCQkJCSA/IExP
Q0tfSVMgOiBMT0NLX0lYLCB0aHIpOworCisJCWlmIChlcnIgIT0gREJfU1VDQ0VTUykgeworCisJ
CQlnb3RvIGxvY2tfd2FpdF9vcl9lcnJvcjsKKwkJfQorCQlwcmVidWlsdC0+c3FsX3N0YXRfc3Rh
cnQgPSBGQUxTRTsKKwl9CisKKwkvKiBPcGVuIG9yIHJlc3RvcmUgaW5kZXggY3Vyc29yIHBvc2l0
aW9uICovCisKIAlpZiAoVU5JVl9MSUtFTFkoZGlyZWN0aW9uICE9IDApKSB7CiAJCWlib29sCW5l
ZWRfdG9fcHJvY2VzcyA9IHNlbF9yZXN0b3JlX3Bvc2l0aW9uX2Zvcl9teXNxbCgKIAkJCSZzYW1l
X3VzZXJfcmVjLCBCVFJfU0VBUkNIX0xFQUYsCkBAIC0zNjc0LDQyICszNzEwLDYgQEAgc2hvcnRj
dXRfZmFpbHNfdG9vX2JpZ19yZWM6CiAJCX0KIAl9CiAKLQlpZiAoIXByZWJ1aWx0LT5zcWxfc3Rh
dF9zdGFydCkgewotCQkvKiBObyBuZWVkIHRvIHNldCBhbiBpbnRlbnRpb24gbG9jayBvciBhc3Np
Z24gYSByZWFkIHZpZXcgKi8KLQotCQlpZiAodHJ4LT5yZWFkX3ZpZXcgPT0gTlVMTAotCQkgICAg
JiYgcHJlYnVpbHQtPnNlbGVjdF9sb2NrX3R5cGUgPT0gTE9DS19OT05FKSB7Ci0KLQkJCWZwdXRz
KCJJbm5vREI6IEVycm9yOiBNeVNRTCBpcyB0cnlpbmcgdG8iCi0JCQkgICAgICAiIHBlcmZvcm0g
YSBjb25zaXN0ZW50IHJlYWRcbiIKLQkJCSAgICAgICJJbm5vREI6IGJ1dCB0aGUgcmVhZCB2aWV3
IGlzIG5vdCBhc3NpZ25lZCFcbiIsCi0JCQkgICAgICBzdGRlcnIpOwotCQkJdHJ4X3ByaW50KHN0
ZGVyciwgdHJ4LCA2MDApOwotCQkJZnB1dGMoJ1xuJywgc3RkZXJyKTsKLQkJCXV0X2EoMCk7Ci0J
CX0KLQl9IGVsc2UgaWYgKHByZWJ1aWx0LT5zZWxlY3RfbG9ja190eXBlID09IExPQ0tfTk9ORSkg
ewotCQkvKiBUaGlzIGlzIGEgY29uc2lzdGVudCByZWFkICovCi0JCS8qIEFzc2lnbiBhIHJlYWQg
dmlldyBmb3IgdGhlIHF1ZXJ5ICovCi0KLQkJdHJ4X2Fzc2lnbl9yZWFkX3ZpZXcodHJ4KTsKLQkJ
cHJlYnVpbHQtPnNxbF9zdGF0X3N0YXJ0ID0gRkFMU0U7Ci0JfSBlbHNlIHsKLQkJdWxpbnQJbG9j
a19tb2RlOwotCQlpZiAocHJlYnVpbHQtPnNlbGVjdF9sb2NrX3R5cGUgPT0gTE9DS19TKSB7Ci0J
CQlsb2NrX21vZGUgPSBMT0NLX0lTOwotCQl9IGVsc2UgewotCQkJbG9ja19tb2RlID0gTE9DS19J
WDsKLQkJfQotCQllcnIgPSBsb2NrX3RhYmxlKDAsIGluZGV4LT50YWJsZSwgbG9ja19tb2RlLCB0
aHIpOwotCi0JCWlmIChlcnIgIT0gREJfU1VDQ0VTUykgewotCi0JCQlnb3RvIGxvY2tfd2FpdF9v
cl9lcnJvcjsKLQkJfQotCQlwcmVidWlsdC0+c3FsX3N0YXRfc3RhcnQgPSBGQUxTRTsKLQl9Ci0K
IHJlY19sb29wOgogCS8qLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLSovCiAJLyogUEhBU0UgNDogTG9vayBmb3IgbWF0Y2hpbmcgcmVj
b3JkcyBpbiBhIGxvb3AgKi8KCg==

--===============0699399905==
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: 68b096e04cdf3d0ae1cc00e088f511f9ae63ad68
# timestamp: 2010-10-04 13:03:49 +0300
# base_revision_id: vasil.dimov@stripped\
#   ji3oelbovdwafra5
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWevR7EcAAj5flFAwe/f///8v
rkS////6BAAIAFAFeLRmBb1Trpl3Gt2rhJQQmCjNDRoymSeTJpqGaJpoYEDQPTUNAyQIyZMhGJNJ
6ZJoMgekABoAADQEiQUymyaqf6p5oqfpTwBR5Q8p5R6j1B+qbTSAyDNQHDTTBDIaaZGTCAaaAMJo
0yYAEDQSUI1G1NNI2UA0D1DQAMhkMhoANNAQTBimkNMGmhjGhttDaBruwsHxTGderzUz/KQzhgiT
mOhJnJ0Vf7bvWc/J48py8US3l0NFRzxlKb2Atge3yLGeXu8/6/jh1ehtqWo/uefHrpMnOOOUDsGX
zjKMKuejl17GNaV87nJmRsCwbaRss87I/E/ughLe2zgDETgkJVcyxdfVPzbWPkK72hN+b4JgFKUj
XCAbNAsfaCFskNxzZ3LdqJGGl/snks0HNhzafdFiQ6SJyoqUZVVHat3t7deesEjbbu80SXcRws2I
jRLZBD1fi1rWtcYiFRb4mbVS71XVH5P1c0wuiZtSluiGrTa4kvWjnRoqjhjoekybG1O6cpJKjymQ
I+oQ8dbqKCFC3JpSfN4Zs1lQhpqw2WSXOry2cDf4xy2oIETaDvy+X4jslpIlgXYKL4Xvxgh3nnGy
V1ocdOR0K5HW5CP9B0asb9z3o8SBCdGyI1sAyEVIbKURgGrlToIXeaXdINqwcpnBEjeDNggzhiaj
pMCHwPUWXC9FEhBPhQ6tpxLxbM1irWEOAWgzqde6/Qh4QJ7PXN5ridNJjJY0MtW1GOi2j1cwLpzN
CLBYLygKpKUdeCwyMKG0I2wOuQGSy7MKHZBbotiY5BgujkuqASSVBgbLWuCPLlnGwplxGIrxMsLx
fZblwRZdeoduEat91yukUhPNSGWBmseZTVwZztG9Zvd7D2gzFViLfI10AcGfLjAfeXmrEmeI88ZL
jBgxqn2MnpjRdUhjOkg+JWEfY2giRiySxo+CZpMSDSJE42d+1sB0XIIYIosWTu8ka+7izdzKszAa
nsgf4Q9kCOdYAmGWUPDZLnIdBMm0wS4jrrhdU9zBAQ4DmnVEQN5UutosEt8h+ZfmmYjdKlaDYo8z
HjwZJNZSsNCnOofZsuBiXSLXaFb7YkMLk0YSLpWMd2bljv1wdI1gBQIiSKTFBzoVNrCwopdxKhYa
BpQZLYajLkOY9I+lRGfhLqkkyqHGQqhui64aZWDnoXZfWeslfwZNEtrDqcZ84a8EsMKkgKqksbpJ
6sifTjsj09Q6Xrbd0M/lnIlWoVwjsFlTSkYVpoZa3wxnx+UK1kHHRMSxsByIiRZIXhbgzrTUXivP
mIzdpqK2X46HE1JkTYlTAPRDuiBX1TmBmRZ+1bE2i4oaLHSZC7t4FKnbiJjBNYoTkcQagwuoAgoo
eWM2jdq01wMgEjKvlQUAcODvK3JzW1jWFMFElunqB5eAZ51rgTAmCZoPTBGogYPENHKtmVrKlTAj
HihbdXtiICZSl4GIZpWqifUq0zmykKkzrFhSl5UkWP/U8WqY1zC2znSYTqvwUt8K1W8psY0Npri5
uTc/zckrVtEPLsWHAkcbuWDDtcjMTo9ElrjwEaAzDkjuhO/Tr+TgT5lclvk9GGxrE4414PlnbZqa
aztbTLvivGAIKaCehiaXWXU5FpMStqQfCy1Hff6BSKoiNHVBnVaVAsDbOd6/RG5CRHcwzrEoOllA
a1NtR0sTjNfSZXOqFQUUtI6oWmwCQtbI74aeKRpZ50DVvNSGf5XtmLgKuRUIBlMbzhEUyFEaBWUn
xq7xKLAx03ILWq1gtNdhe0bzro0UDaw1rg8hgDjexOMKlBxhM7AY57/VuBVdx3RKY4VY3Eg0prqx
WnFj2gUTYYqXSLdWuCbGmm6+LalF2iwYS1skRQj/GGb/i7kinChIdej2I4A=


--===============0699399905==--