From: marko.makela
Date: October 4 2010 10:38am
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3227 to 3228) Bug#56716
List-Archive: http://lists.mysql.com/commits/119810
X-Bug: 56716
Message-Id: <201010041038.o949emr2017063@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0558686176=="

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

IDMyMjggTWFya28gTcOka2Vsw6QJMjAxMC0xMC0wNAogICAgICBNZXJnZSBCdWcjNTY3MTYgZnJv
bSA1LjEKCiAgICBhZGRlZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJf
YnVnNTY3MTYucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1
ZzU2NzE2LnRlc3QKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cw
c2VsLmMKIDMyMjcgVmFzaWwgRGltb3YJMjAxMC0xMC0wMQogICAgICBGaXggYSBwb3RlbnRpYWwg
YnVnIHdoZW4gdXNpbmcgX19zeW5jX2xvY2tfdGVzdF9hbmRfc2V0KCkKICAgICAgCiAgICAgIFRo
aXMgaXMgYSBtYW51YWwgbWVyZ2UgZnJvbSBteXNxbC01LjEtaW5ub2RiIG9mOgogICAgICAKICAg
ICAgICByZXZpc2lvbi1pZDogdmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMDkzMDEwMjYxOC1z
OWY5eXRieXRyM2VxdzloCiAgICAgICAgY29tbWl0dGVyOiBWYXNpbCBEaW1vdiA8dmFzaWwuZGlt
b3ZAb3JhY2xlLmNvbT4KICAgICAgICB0aW1lc3RhbXA6IFRodSAyMDEwLTA5LTMwIDEzOjI2OjE4
ICswMzAwCiAgICAgICAgbWVzc2FnZToKICAgICAgICAgIEZpeCBhIHBvdGVudGlhbCBidWcgd2hl
biB1c2luZyBfX3N5bmNfbG9ja190ZXN0X2FuZF9zZXQoKQogICAgICAKICAgICAgICAgIFRZUEUg
X19zeW5jX2xvY2tfdGVzdF9hbmRfc2V0IChUWVBFICpwdHIsIFRZUEUgdmFsdWUsIC4uLikKICAg
ICAgCiAgICAgICAgICBpdCBpcyBub3QgZG9jdW1lbnRlZCB3aGF0IGhhcHBlbnMgaWYgdGhlIHR3
byBhcmd1bWVudHMgYXJlIG9mIGRpZmZlcmVudAogICAgICAgICAgdHlwZSBsaWtlIGl0IHdhcyBi
ZWZvcmU6IHRoZSBmaXJzdCBvbmUgd2FzIGxvY2tfd29yZF90IChieXRlKSBhbmQgdGhlCiAgICAg
ICAgICBzZWNvbmQgb25lIHdhcyAxIG9yIDAgKGludCkuCiAgICAgIAogICAgICAgICAgQXBwcm92
ZWQgYnk6CU1hcmtvICh2aWEgSVJDKQoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvb3Mwc3luYy5oCj09PSBhZGRlZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lu
bm9kYi9yL2lubm9kYl9idWc1NjcxNi5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiL3IvaW5ub2RiX2J1ZzU2NzE2LnJlc3VsdAkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisr
KyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZzU2NzE2LnJlc3VsdAlyZXZp
ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAwNDEwMzgwNS1jMXd1eDBxZnM2ODR4NmM4
CkBAIC0wLDAgKzEsNCBAQAorQ1JFQVRFIFRBQkxFIGJ1ZzU2NzE2IChhIElOVCBQUklNQVJZIEtF
WSxiIElOVCxjIElOVCxJTkRFWChiKSkgRU5HSU5FPUlubm9EQjsKK1NFTEVDVCAqIEZST00gYnVn
NTY3MTYgV0hFUkUgYjw9NDIgT1JERVIgQlkgYiBERVNDIEZPUiBVUERBVEU7CithCWIJYworRFJP
UCBUQUJMRSBidWc1NjcxNjsKCj09PSBhZGRlZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9k
Yi90L2lubm9kYl9idWc1NjcxNi50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90
L2lubm9kYl9idWc1NjcxNi50ZXN0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysrIGIvbXlz
cWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNTY3MTYudGVzdAlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAwNDEwMzgwNS1jMXd1eDBxZnM2ODR4NmM4CkBAIC0wLDAg
KzEsMTAgQEAKKyMKKyMgQnVnICM1NjcxNiBJbm5vREIgbG9ja3MgYSByZWNvcmQgZ2FwIHdpdGhv
dXQgbG9ja2luZyB0aGUgdGFibGUKKyMKKy0tIHNvdXJjZSBpbmNsdWRlL2hhdmVfaW5ub2RiLmlu
YworCitDUkVBVEUgVEFCTEUgYnVnNTY3MTYgKGEgSU5UIFBSSU1BUlkgS0VZLGIgSU5ULGMgSU5U
LElOREVYKGIpKSBFTkdJTkU9SW5ub0RCOworCitTRUxFQ1QgKiBGUk9NIGJ1ZzU2NzE2IFdIRVJF
IGI8PTQyIE9SREVSIEJZIGIgREVTQyBGT1IgVVBEQVRFOworCitEUk9QIFRBQkxFIGJ1ZzU2NzE2
OwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYycKLS0t
IGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jCXJldmlkOnZhc2lsLmRpbW92QG9yYWNs
ZS5jb20tMjAxMDEwMDExMTUxMDAtOTRiMzBtcHl6cnB4cGExegorKysgYi9zdG9yYWdlL2lubm9i
YXNlL3Jvdy9yb3cwc2VsLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEwMDQx
MDM4MDUtYzF3dXgwcWZzNjg0eDZjOApAQCAtMzcxMSw2ICszNzExLDQyIEBAIHJlbGVhc2Vfc2Vh
cmNoX2xhdGNoX2lmX25lZWRlZDoKIAogCWNsdXN0X2luZGV4ID0gZGljdF90YWJsZV9nZXRfZmly
c3RfaW5kZXgoaW5kZXgtPnRhYmxlKTsKIAorCS8qIERvIHNvbWUgc3RhcnQtb2Ytc3RhdGVtZW50
IHByZXBhcmF0aW9ucyAqLworCisJaWYgKCFwcmVidWlsdC0+c3FsX3N0YXRfc3RhcnQpIHsKKwkJ
LyogTm8gbmVlZCB0byBzZXQgYW4gaW50ZW50aW9uIGxvY2sgb3IgYXNzaWduIGEgcmVhZCB2aWV3
ICovCisKKwkJaWYgKHRyeC0+cmVhZF92aWV3ID09IE5VTEwKKwkJICAgICYmIHByZWJ1aWx0LT5z
ZWxlY3RfbG9ja190eXBlID09IExPQ0tfTk9ORSkgeworCisJCQlmcHV0cygiSW5ub0RCOiBFcnJv
cjogTXlTUUwgaXMgdHJ5aW5nIHRvIgorCQkJICAgICAgIiBwZXJmb3JtIGEgY29uc2lzdGVudCBy
ZWFkXG4iCisJCQkgICAgICAiSW5ub0RCOiBidXQgdGhlIHJlYWQgdmlldyBpcyBub3QgYXNzaWdu
ZWQhXG4iLAorCQkJICAgICAgc3RkZXJyKTsKKwkJCXRyeF9wcmludChzdGRlcnIsIHRyeCwgNjAw
KTsKKwkJCWZwdXRjKCdcbicsIHN0ZGVycik7CisJCQl1dF9lcnJvcjsKKwkJfQorCX0gZWxzZSBp
ZiAocHJlYnVpbHQtPnNlbGVjdF9sb2NrX3R5cGUgPT0gTE9DS19OT05FKSB7CisJCS8qIFRoaXMg
aXMgYSBjb25zaXN0ZW50IHJlYWQgKi8KKwkJLyogQXNzaWduIGEgcmVhZCB2aWV3IGZvciB0aGUg
cXVlcnkgKi8KKworCQl0cnhfYXNzaWduX3JlYWRfdmlldyh0cngpOworCQlwcmVidWlsdC0+c3Fs
X3N0YXRfc3RhcnQgPSBGQUxTRTsKKwl9IGVsc2UgeworCQllcnIgPSBsb2NrX3RhYmxlKDAsIGlu
ZGV4LT50YWJsZSwKKwkJCQkgcHJlYnVpbHQtPnNlbGVjdF9sb2NrX3R5cGUgPT0gTE9DS19TCisJ
CQkJID8gTE9DS19JUyA6IExPQ0tfSVgsIHRocik7CisKKwkJaWYgKGVyciAhPSBEQl9TVUNDRVNT
KSB7CisKKwkJCWdvdG8gbG9ja193YWl0X29yX2Vycm9yOworCQl9CisJCXByZWJ1aWx0LT5zcWxf
c3RhdF9zdGFydCA9IEZBTFNFOworCX0KKworCS8qIE9wZW4gb3IgcmVzdG9yZSBpbmRleCBjdXJz
b3IgcG9zaXRpb24gKi8KKwogCWlmIChVTklWX0xJS0VMWShkaXJlY3Rpb24gIT0gMCkpIHsKIAkJ
aWJvb2wJbmVlZF90b19wcm9jZXNzID0gc2VsX3Jlc3RvcmVfcG9zaXRpb25fZm9yX215c3FsKAog
CQkJJnNhbWVfdXNlcl9yZWMsIEJUUl9TRUFSQ0hfTEVBRiwKQEAgLTM3ODYsNDIgKzM4MjIsNiBA
QCByZWxlYXNlX3NlYXJjaF9sYXRjaF9pZl9uZWVkZWQ6CiAJCX0KIAl9CiAKLQlpZiAoIXByZWJ1
aWx0LT5zcWxfc3RhdF9zdGFydCkgewotCQkvKiBObyBuZWVkIHRvIHNldCBhbiBpbnRlbnRpb24g
bG9jayBvciBhc3NpZ24gYSByZWFkIHZpZXcgKi8KLQotCQlpZiAodHJ4LT5yZWFkX3ZpZXcgPT0g
TlVMTAotCQkgICAgJiYgcHJlYnVpbHQtPnNlbGVjdF9sb2NrX3R5cGUgPT0gTE9DS19OT05FKSB7
Ci0KLQkJCWZwdXRzKCJJbm5vREI6IEVycm9yOiBNeVNRTCBpcyB0cnlpbmcgdG8iCi0JCQkgICAg
ICAiIHBlcmZvcm0gYSBjb25zaXN0ZW50IHJlYWRcbiIKLQkJCSAgICAgICJJbm5vREI6IGJ1dCB0
aGUgcmVhZCB2aWV3IGlzIG5vdCBhc3NpZ25lZCFcbiIsCi0JCQkgICAgICBzdGRlcnIpOwotCQkJ
dHJ4X3ByaW50KHN0ZGVyciwgdHJ4LCA2MDApOwotCQkJZnB1dGMoJ1xuJywgc3RkZXJyKTsKLQkJ
CXV0X2EoMCk7Ci0JCX0KLQl9IGVsc2UgaWYgKHByZWJ1aWx0LT5zZWxlY3RfbG9ja190eXBlID09
IExPQ0tfTk9ORSkgewotCQkvKiBUaGlzIGlzIGEgY29uc2lzdGVudCByZWFkICovCi0JCS8qIEFz
c2lnbiBhIHJlYWQgdmlldyBmb3IgdGhlIHF1ZXJ5ICovCi0KLQkJdHJ4X2Fzc2lnbl9yZWFkX3Zp
ZXcodHJ4KTsKLQkJcHJlYnVpbHQtPnNxbF9zdGF0X3N0YXJ0ID0gRkFMU0U7Ci0JfSBlbHNlIHsK
LQkJdWxpbnQJbG9ja19tb2RlOwotCQlpZiAocHJlYnVpbHQtPnNlbGVjdF9sb2NrX3R5cGUgPT0g
TE9DS19TKSB7Ci0JCQlsb2NrX21vZGUgPSBMT0NLX0lTOwotCQl9IGVsc2UgewotCQkJbG9ja19t
b2RlID0gTE9DS19JWDsKLQkJfQotCQllcnIgPSBsb2NrX3RhYmxlKDAsIGluZGV4LT50YWJsZSwg
bG9ja19tb2RlLCB0aHIpOwotCi0JCWlmIChlcnIgIT0gREJfU1VDQ0VTUykgewotCi0JCQlnb3Rv
IGxvY2tfd2FpdF9vcl9lcnJvcjsKLQkJfQotCQlwcmVidWlsdC0+c3FsX3N0YXRfc3RhcnQgPSBG
QUxTRTsKLQl9Ci0KIHJlY19sb29wOgogCS8qLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSovCiAJLyogUEhBU0UgNDogTG9vayBmb3Ig
bWF0Y2hpbmcgcmVjb3JkcyBpbiBhIGxvb3AgKi8KCg==

--===============0558686176==
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: eb094516fecf75fb1d2d253f426695dec9ea13b6
# timestamp: 2010-10-04 13:38:38 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   94b30mpyzrpxpa1z
# 
# Begin bundle
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


--===============0558686176==--