From: marko.makela
Date: October 4 2010 10:38am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3228) Bug#56716
List-Archive: http://lists.mysql.com/commits/119813
X-Bug: 56716
Message-Id: <201010041039.o948bPWj021629@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0546234412=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAxMDAxMTE1MTAwLTk0YjMw
bXB5enJweHBhMXoKCiAzMjI4IE1hcmtvIE3DpGtlbMOkCTIwMTAtMTAtMDQKICAgICAgTWVyZ2Ug
QnVnIzU2NzE2IGZyb20gNS4xCgogICAgYWRkZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiL3IvaW5ub2RiX2J1ZzU2NzE2LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9k
Yi90L2lubm9kYl9idWc1NjcxNi50ZXN0CiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS9yb3cvcm93MHNlbC5jCj09PSBhZGRlZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9k
Yi9yL2lubm9kYl9idWc1NjcxNi5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2Ri
L3IvaW5ub2RiX2J1ZzU2NzE2LnJlc3VsdAkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBi
L215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZzU2NzE2LnJlc3VsdAlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAwNDEwMzgwNS1jMXd1eDBxZnM2ODR4NmM4CkBA
IC0wLDAgKzEsNCBAQAorQ1JFQVRFIFRBQkxFIGJ1ZzU2NzE2IChhIElOVCBQUklNQVJZIEtFWSxi
IElOVCxjIElOVCxJTkRFWChiKSkgRU5HSU5FPUlubm9EQjsKK1NFTEVDVCAqIEZST00gYnVnNTY3
MTYgV0hFUkUgYjw9NDIgT1JERVIgQlkgYiBERVNDIEZPUiBVUERBVEU7CithCWIJYworRFJPUCBU
QUJMRSBidWc1NjcxNjsKCj09PSBhZGRlZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90
L2lubm9kYl9idWc1NjcxNi50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lu
bm9kYl9idWc1NjcxNi50ZXN0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysrIGIvbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNTY3MTYudGVzdAlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDEwMTAwNDEwMzgwNS1jMXd1eDBxZnM2ODR4NmM4CkBAIC0wLDAgKzEs
MTAgQEAKKyMKKyMgQnVnICM1NjcxNiBJbm5vREIgbG9ja3MgYSByZWNvcmQgZ2FwIHdpdGhvdXQg
bG9ja2luZyB0aGUgdGFibGUKKyMKKy0tIHNvdXJjZSBpbmNsdWRlL2hhdmVfaW5ub2RiLmluYwor
CitDUkVBVEUgVEFCTEUgYnVnNTY3MTYgKGEgSU5UIFBSSU1BUlkgS0VZLGIgSU5ULGMgSU5ULElO
REVYKGIpKSBFTkdJTkU9SW5ub0RCOworCitTRUxFQ1QgKiBGUk9NIGJ1ZzU2NzE2IFdIRVJFIGI8
PTQyIE9SREVSIEJZIGIgREVTQyBGT1IgVVBEQVRFOworCitEUk9QIFRBQkxFIGJ1ZzU2NzE2OwoK
PT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYycKLS0tIGEv
c3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5j
b20tMjAxMDEwMDExMTUxMDAtOTRiMzBtcHl6cnB4cGExegorKysgYi9zdG9yYWdlL2lubm9iYXNl
L3Jvdy9yb3cwc2VsLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEwMDQxMDM4
MDUtYzF3dXgwcWZzNjg0eDZjOApAQCAtMzcxMSw2ICszNzExLDQyIEBAIHJlbGVhc2Vfc2VhcmNo
X2xhdGNoX2lmX25lZWRlZDoKIAogCWNsdXN0X2luZGV4ID0gZGljdF90YWJsZV9nZXRfZmlyc3Rf
aW5kZXgoaW5kZXgtPnRhYmxlKTsKIAorCS8qIERvIHNvbWUgc3RhcnQtb2Ytc3RhdGVtZW50IHBy
ZXBhcmF0aW9ucyAqLworCisJaWYgKCFwcmVidWlsdC0+c3FsX3N0YXRfc3RhcnQpIHsKKwkJLyog
Tm8gbmVlZCB0byBzZXQgYW4gaW50ZW50aW9uIGxvY2sgb3IgYXNzaWduIGEgcmVhZCB2aWV3ICov
CisKKwkJaWYgKHRyeC0+cmVhZF92aWV3ID09IE5VTEwKKwkJICAgICYmIHByZWJ1aWx0LT5zZWxl
Y3RfbG9ja190eXBlID09IExPQ0tfTk9ORSkgeworCisJCQlmcHV0cygiSW5ub0RCOiBFcnJvcjog
TXlTUUwgaXMgdHJ5aW5nIHRvIgorCQkJICAgICAgIiBwZXJmb3JtIGEgY29uc2lzdGVudCByZWFk
XG4iCisJCQkgICAgICAiSW5ub0RCOiBidXQgdGhlIHJlYWQgdmlldyBpcyBub3QgYXNzaWduZWQh
XG4iLAorCQkJICAgICAgc3RkZXJyKTsKKwkJCXRyeF9wcmludChzdGRlcnIsIHRyeCwgNjAwKTsK
KwkJCWZwdXRjKCdcbicsIHN0ZGVycik7CisJCQl1dF9lcnJvcjsKKwkJfQorCX0gZWxzZSBpZiAo
cHJlYnVpbHQtPnNlbGVjdF9sb2NrX3R5cGUgPT0gTE9DS19OT05FKSB7CisJCS8qIFRoaXMgaXMg
YSBjb25zaXN0ZW50IHJlYWQgKi8KKwkJLyogQXNzaWduIGEgcmVhZCB2aWV3IGZvciB0aGUgcXVl
cnkgKi8KKworCQl0cnhfYXNzaWduX3JlYWRfdmlldyh0cngpOworCQlwcmVidWlsdC0+c3FsX3N0
YXRfc3RhcnQgPSBGQUxTRTsKKwl9IGVsc2UgeworCQllcnIgPSBsb2NrX3RhYmxlKDAsIGluZGV4
LT50YWJsZSwKKwkJCQkgcHJlYnVpbHQtPnNlbGVjdF9sb2NrX3R5cGUgPT0gTE9DS19TCisJCQkJ
ID8gTE9DS19JUyA6IExPQ0tfSVgsIHRocik7CisKKwkJaWYgKGVyciAhPSBEQl9TVUNDRVNTKSB7
CisKKwkJCWdvdG8gbG9ja193YWl0X29yX2Vycm9yOworCQl9CisJCXByZWJ1aWx0LT5zcWxfc3Rh
dF9zdGFydCA9IEZBTFNFOworCX0KKworCS8qIE9wZW4gb3IgcmVzdG9yZSBpbmRleCBjdXJzb3Ig
cG9zaXRpb24gKi8KKwogCWlmIChVTklWX0xJS0VMWShkaXJlY3Rpb24gIT0gMCkpIHsKIAkJaWJv
b2wJbmVlZF90b19wcm9jZXNzID0gc2VsX3Jlc3RvcmVfcG9zaXRpb25fZm9yX215c3FsKAogCQkJ
JnNhbWVfdXNlcl9yZWMsIEJUUl9TRUFSQ0hfTEVBRiwKQEAgLTM3ODYsNDIgKzM4MjIsNiBAQCBy
ZWxlYXNlX3NlYXJjaF9sYXRjaF9pZl9uZWVkZWQ6CiAJCX0KIAl9CiAKLQlpZiAoIXByZWJ1aWx0
LT5zcWxfc3RhdF9zdGFydCkgewotCQkvKiBObyBuZWVkIHRvIHNldCBhbiBpbnRlbnRpb24gbG9j
ayBvciBhc3NpZ24gYSByZWFkIHZpZXcgKi8KLQotCQlpZiAodHJ4LT5yZWFkX3ZpZXcgPT0gTlVM
TAotCQkgICAgJiYgcHJlYnVpbHQtPnNlbGVjdF9sb2NrX3R5cGUgPT0gTE9DS19OT05FKSB7Ci0K
LQkJCWZwdXRzKCJJbm5vREI6IEVycm9yOiBNeVNRTCBpcyB0cnlpbmcgdG8iCi0JCQkgICAgICAi
IHBlcmZvcm0gYSBjb25zaXN0ZW50IHJlYWRcbiIKLQkJCSAgICAgICJJbm5vREI6IGJ1dCB0aGUg
cmVhZCB2aWV3IGlzIG5vdCBhc3NpZ25lZCFcbiIsCi0JCQkgICAgICBzdGRlcnIpOwotCQkJdHJ4
X3ByaW50KHN0ZGVyciwgdHJ4LCA2MDApOwotCQkJZnB1dGMoJ1xuJywgc3RkZXJyKTsKLQkJCXV0
X2EoMCk7Ci0JCX0KLQl9IGVsc2UgaWYgKHByZWJ1aWx0LT5zZWxlY3RfbG9ja190eXBlID09IExP
Q0tfTk9ORSkgewotCQkvKiBUaGlzIGlzIGEgY29uc2lzdGVudCByZWFkICovCi0JCS8qIEFzc2ln
biBhIHJlYWQgdmlldyBmb3IgdGhlIHF1ZXJ5ICovCi0KLQkJdHJ4X2Fzc2lnbl9yZWFkX3ZpZXco
dHJ4KTsKLQkJcHJlYnVpbHQtPnNxbF9zdGF0X3N0YXJ0ID0gRkFMU0U7Ci0JfSBlbHNlIHsKLQkJ
dWxpbnQJbG9ja19tb2RlOwotCQlpZiAocHJlYnVpbHQtPnNlbGVjdF9sb2NrX3R5cGUgPT0gTE9D
S19TKSB7Ci0JCQlsb2NrX21vZGUgPSBMT0NLX0lTOwotCQl9IGVsc2UgewotCQkJbG9ja19tb2Rl
ID0gTE9DS19JWDsKLQkJfQotCQllcnIgPSBsb2NrX3RhYmxlKDAsIGluZGV4LT50YWJsZSwgbG9j
a19tb2RlLCB0aHIpOwotCi0JCWlmIChlcnIgIT0gREJfU1VDQ0VTUykgewotCi0JCQlnb3RvIGxv
Y2tfd2FpdF9vcl9lcnJvcjsKLQkJfQotCQlwcmVidWlsdC0+c3FsX3N0YXRfc3RhcnQgPSBGQUxT
RTsKLQl9Ci0KIHJlY19sb29wOgogCS8qLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSovCiAJLyogUEhBU0UgNDogTG9vayBmb3IgbWF0
Y2hpbmcgcmVjb3JkcyBpbiBhIGxvb3AgKi8KCg==

--===============0546234412==
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:16 +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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


--===============0546234412==--