From: marko.makela
Date: October 4 2010 10:08am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3619 to 3621) Bug#56716
List-Archive: http://lists.mysql.com/commits/119807
X-Bug: 56716
Message-Id: <201010041008.o949lMFs002684@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1800767186=="

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

IDM2MjEgTWFya28gTcOka2Vsw6QJMjAxMC0xMC0wNAogICAgICBCdWcjNTY3MTYgSW5ub0RCIGxv
Y2tzIGEgcmVjb3JkIGdhcCB3aXRob3V0IGxvY2tpbmcgdGhlIHRhYmxlCiAgICAgIAogICAgICBy
b3dfc2VhcmNoX2Zvcl9teXNxbCgpOiBBY3F1aXJlIGFuIGludGVudGlvbiBsb2NrIG9uIHRoZSB0
YWJsZQogICAgICBiZWZvcmUgbG9ja2luZyB0aGUgZmlyc3QgcmVjb3JkIGdhcC4KCiAgICBhZGRl
ZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiX2J1ZzU2NzE2
LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVn
NTY3MTYudGVzdAogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFu
Z2VMb2cKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwc2VsLmMKIDM2MjAgTWFy
a28gTcOka2Vsw6QJMjAxMC0xMC0wNAogICAgICBCdWcjNTY3MTYgSW5ub0RCIGxvY2tzIGEgcmVj
b3JkIGdhcCB3aXRob3V0IGxvY2tpbmcgdGhlIHRhYmxlCiAgICAgIAogICAgICByb3dfc2VhcmNo
X2Zvcl9teXNxbCgpOiBBY3F1aXJlIGFuIGludGVudGlvbiBsb2NrIG9uIHRoZSB0YWJsZQogICAg
ICBiZWZvcmUgbG9ja2luZyB0aGUgZmlyc3QgcmVjb3JkIGdhcC4KCiAgICBhZGRlZDoKICAgICAg
bXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVnNTY3MTYucmVzdWx0CiAgICAgIG15
c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzU2NzE2LnRlc3QKICAgIG1vZGlmaWVk
OgogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwc2VsLmMKIDM2MTkgVmFzaWwgRGltb3YJ
MjAxMC0xMC0wNCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3FsLTUuMS1idWd0ZWFtIC0+IG15c3Fs
LTUuMS1pbm5vZGIKCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9yL3BzXzJteWlzYW0u
cmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9wc18zaW5ub2RiLnJlc3VsdAogICAgICBteXNxbC10
ZXN0L3IvcHNfNGhlYXAucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9wc181bWVyZ2UucmVzdWx0
CiAgICAgIHNxbC9pdGVtX2Z1bmMuY2MKPT09IGFkZGVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUv
aW5ub2RiL3IvaW5ub2RiX2J1ZzU2NzE2LnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGIvci9pbm5vZGJfYnVnNTY3MTYucmVzdWx0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAK
KysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVnNTY3MTYucmVzdWx0CXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDA0MTAwNjQxLTQwZHJhNm8wOGExYmZp
czcKQEAgLTAsMCArMSw0IEBACitDUkVBVEUgVEFCTEUgYnVnNTY3MTYgKGEgSU5UIFBSSU1BUlkg
S0VZLGIgSU5ULGMgSU5ULElOREVYKGIpKSBFTkdJTkU9SW5ub0RCOworU0VMRUNUICogRlJPTSBi
dWc1NjcxNiBXSEVSRSBiPD00MiBPUkRFUiBCWSBiIERFU0MgRk9SIFVQREFURTsKK2EJYgljCitE
Uk9QIFRBQkxFIGJ1ZzU2NzE2OwoKPT09IGFkZGVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiL3QvaW5ub2RiX2J1ZzU2NzE2LnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2Ri
L3QvaW5ub2RiX2J1ZzU2NzE2LnRlc3QJMTk3MC0wMS0wMSAwMDowMDowMCArMDAwMAorKysgYi9t
eXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc1NjcxNi50ZXN0CXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDA0MTAwNjQxLTQwZHJhNm8wOGExYmZpczcKQEAgLTAs
MCArMSwxMCBAQAorIworIyBCdWcgIzU2NzE2IElubm9EQiBsb2NrcyBhIHJlY29yZCBnYXAgd2l0
aG91dCBsb2NraW5nIHRoZSB0YWJsZQorIworLS0gc291cmNlIGluY2x1ZGUvaGF2ZV9pbm5vZGIu
aW5jCisKK0NSRUFURSBUQUJMRSBidWc1NjcxNiAoYSBJTlQgUFJJTUFSWSBLRVksYiBJTlQsYyBJ
TlQsSU5ERVgoYikpIEVOR0lORT1Jbm5vREI7CisKK1NFTEVDVCAqIEZST00gYnVnNTY3MTYgV0hF
UkUgYjw9NDIgT1JERVIgQlkgYiBERVNDIEZPUiBVUERBVEU7CisKK0RST1AgVEFCTEUgYnVnNTY3
MTY7Cgo9PT0gYWRkZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5u
b2RiX2J1ZzU2NzE2LnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2lu
L3IvaW5ub2RiX2J1ZzU2NzE2LnJlc3VsdAkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBi
L215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi9yL2lubm9kYl9idWc1NjcxNi5yZXN1bHQJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEwMDQxMDA2NDEtNDBkcmE2bzA4YTFi
ZmlzNwpAQCAtMCwwICsxLDQgQEAKK0NSRUFURSBUQUJMRSBidWc1NjcxNiAoYSBJTlQgUFJJTUFS
WSBLRVksYiBJTlQsYyBJTlQsSU5ERVgoYikpIEVOR0lORT1Jbm5vREI7CitTRUxFQ1QgKiBGUk9N
IGJ1ZzU2NzE2IFdIRVJFIGI8PTQyIE9SREVSIEJZIGIgREVTQyBGT1IgVVBEQVRFOworYQliCWMK
K0RST1AgVEFCTEUgYnVnNTY3MTY7Cgo9PT0gYWRkZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzU2NzE2LnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3Vp
dGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYl9idWc1NjcxNi50ZXN0CTE5NzAtMDEtMDEgMDA6MDA6
MDAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1
ZzU2NzE2LnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEwMDQxMDA2NDEt
NDBkcmE2bzA4YTFiZmlzNwpAQCAtMCwwICsxLDEwIEBACisjCisjIEJ1ZyAjNTY3MTYgSW5ub0RC
IGxvY2tzIGEgcmVjb3JkIGdhcCB3aXRob3V0IGxvY2tpbmcgdGhlIHRhYmxlCisjCistLSBzb3Vy
Y2UgaW5jbHVkZS9oYXZlX2lubm9kYl9wbHVnaW4uaW5jCisKK0NSRUFURSBUQUJMRSBidWc1Njcx
NiAoYSBJTlQgUFJJTUFSWSBLRVksYiBJTlQsYyBJTlQsSU5ERVgoYikpIEVOR0lORT1Jbm5vREI7
CisKK1NFTEVDVCAqIEZST00gYnVnNTY3MTYgV0hFUkUgYjw9NDIgT1JERVIgQlkgYiBERVNDIEZP
UiBVUERBVEU7CisKK0RST1AgVEFCTEUgYnVnNTY3MTY7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9y
b3cwc2VsLmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMTAwNDA5NDk1OC1qaTNv
ZWxib3Zkd2FmcmE1CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAwNDEwMDY0MS00MGRyYTZvMDhhMWJmaXM3CkBA
IC0zNTk5LDYgKzM1OTksNDIgQEAgc2hvcnRjdXRfZmFpbHNfdG9vX2JpZ19yZWM6CiAKIAljbHVz
dF9pbmRleCA9IGRpY3RfdGFibGVfZ2V0X2ZpcnN0X2luZGV4KGluZGV4LT50YWJsZSk7CiAKKwkv
KiBEbyBzb21lIHN0YXJ0LW9mLXN0YXRlbWVudCBwcmVwYXJhdGlvbnMgKi8KKworCWlmICghcHJl
YnVpbHQtPnNxbF9zdGF0X3N0YXJ0KSB7CisJCS8qIE5vIG5lZWQgdG8gc2V0IGFuIGludGVudGlv
biBsb2NrIG9yIGFzc2lnbiBhIHJlYWQgdmlldyAqLworCisJCWlmICh0cngtPnJlYWRfdmlldyA9
PSBOVUxMCisJCSAgICAmJiBwcmVidWlsdC0+c2VsZWN0X2xvY2tfdHlwZSA9PSBMT0NLX05PTkUp
IHsKKworCQkJZnB1dHMoIklubm9EQjogRXJyb3I6IE15U1FMIGlzIHRyeWluZyB0byIKKwkJCSAg
ICAgICIgcGVyZm9ybSBhIGNvbnNpc3RlbnQgcmVhZFxuIgorCQkJICAgICAgIklubm9EQjogYnV0
IHRoZSByZWFkIHZpZXcgaXMgbm90IGFzc2lnbmVkIVxuIiwKKwkJCSAgICAgIHN0ZGVycik7CisJ
CQl0cnhfcHJpbnQoc3RkZXJyLCB0cngsIDYwMCk7CisJCQlmcHV0YygnXG4nLCBzdGRlcnIpOwor
CQkJdXRfZXJyb3I7CisJCX0KKwl9IGVsc2UgaWYgKHByZWJ1aWx0LT5zZWxlY3RfbG9ja190eXBl
ID09IExPQ0tfTk9ORSkgeworCQkvKiBUaGlzIGlzIGEgY29uc2lzdGVudCByZWFkICovCisJCS8q
IEFzc2lnbiBhIHJlYWQgdmlldyBmb3IgdGhlIHF1ZXJ5ICovCisKKwkJdHJ4X2Fzc2lnbl9yZWFk
X3ZpZXcodHJ4KTsKKwkJcHJlYnVpbHQtPnNxbF9zdGF0X3N0YXJ0ID0gRkFMU0U7CisJfSBlbHNl
IHsKKwkJZXJyID0gbG9ja190YWJsZSgwLCBpbmRleC0+dGFibGUsCisJCQkJIHByZWJ1aWx0LT5z
ZWxlY3RfbG9ja190eXBlID09IExPQ0tfUworCQkJCSA/IExPQ0tfSVMgOiBMT0NLX0lYLCB0aHIp
OworCisJCWlmIChlcnIgIT0gREJfU1VDQ0VTUykgeworCisJCQlnb3RvIGxvY2tfd2FpdF9vcl9l
cnJvcjsKKwkJfQorCQlwcmVidWlsdC0+c3FsX3N0YXRfc3RhcnQgPSBGQUxTRTsKKwl9CisKKwkv
KiBPcGVuIG9yIHJlc3RvcmUgaW5kZXggY3Vyc29yIHBvc2l0aW9uICovCisKIAlpZiAoVU5JVl9M
SUtFTFkoZGlyZWN0aW9uICE9IDApKSB7CiAJCWlib29sCW5lZWRfdG9fcHJvY2VzcyA9IHNlbF9y
ZXN0b3JlX3Bvc2l0aW9uX2Zvcl9teXNxbCgKIAkJCSZzYW1lX3VzZXJfcmVjLCBCVFJfU0VBUkNI
X0xFQUYsCkBAIC0zNjc0LDQyICszNzEwLDYgQEAgc2hvcnRjdXRfZmFpbHNfdG9vX2JpZ19yZWM6
CiAJCX0KIAl9CiAKLQlpZiAoIXByZWJ1aWx0LT5zcWxfc3RhdF9zdGFydCkgewotCQkvKiBObyBu
ZWVkIHRvIHNldCBhbiBpbnRlbnRpb24gbG9jayBvciBhc3NpZ24gYSByZWFkIHZpZXcgKi8KLQot
CQlpZiAodHJ4LT5yZWFkX3ZpZXcgPT0gTlVMTAotCQkgICAgJiYgcHJlYnVpbHQtPnNlbGVjdF9s
b2NrX3R5cGUgPT0gTE9DS19OT05FKSB7Ci0KLQkJCWZwdXRzKCJJbm5vREI6IEVycm9yOiBNeVNR
TCBpcyB0cnlpbmcgdG8iCi0JCQkgICAgICAiIHBlcmZvcm0gYSBjb25zaXN0ZW50IHJlYWRcbiIK
LQkJCSAgICAgICJJbm5vREI6IGJ1dCB0aGUgcmVhZCB2aWV3IGlzIG5vdCBhc3NpZ25lZCFcbiIs
Ci0JCQkgICAgICBzdGRlcnIpOwotCQkJdHJ4X3ByaW50KHN0ZGVyciwgdHJ4LCA2MDApOwotCQkJ
ZnB1dGMoJ1xuJywgc3RkZXJyKTsKLQkJCXV0X2EoMCk7Ci0JCX0KLQl9IGVsc2UgaWYgKHByZWJ1
aWx0LT5zZWxlY3RfbG9ja190eXBlID09IExPQ0tfTk9ORSkgewotCQkvKiBUaGlzIGlzIGEgY29u
c2lzdGVudCByZWFkICovCi0JCS8qIEFzc2lnbiBhIHJlYWQgdmlldyBmb3IgdGhlIHF1ZXJ5ICov
Ci0KLQkJdHJ4X2Fzc2lnbl9yZWFkX3ZpZXcodHJ4KTsKLQkJcHJlYnVpbHQtPnNxbF9zdGF0X3N0
YXJ0ID0gRkFMU0U7Ci0JfSBlbHNlIHsKLQkJdWxpbnQJbG9ja19tb2RlOwotCQlpZiAocHJlYnVp
bHQtPnNlbGVjdF9sb2NrX3R5cGUgPT0gTE9DS19TKSB7Ci0JCQlsb2NrX21vZGUgPSBMT0NLX0lT
OwotCQl9IGVsc2UgewotCQkJbG9ja19tb2RlID0gTE9DS19JWDsKLQkJfQotCQllcnIgPSBsb2Nr
X3RhYmxlKDAsIGluZGV4LT50YWJsZSwgbG9ja19tb2RlLCB0aHIpOwotCi0JCWlmIChlcnIgIT0g
REJfU1VDQ0VTUykgewotCi0JCQlnb3RvIGxvY2tfd2FpdF9vcl9lcnJvcjsKLQkJfQotCQlwcmVi
dWlsdC0+c3FsX3N0YXRfc3RhcnQgPSBGQUxTRTsKLQl9Ci0KIHJlY19sb29wOgogCS8qLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSov
CiAJLyogUEhBU0UgNDogTG9vayBmb3IgbWF0Y2hpbmcgcmVjb3JkcyBpbiBhIGxvb3AgKi8KCj09
PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nJwotLS0gYS9z
dG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5j
b20tMjAxMDEwMDQwOTQ5NTgtamkzb2VsYm92ZHdhZnJhNQorKysgYi9zdG9yYWdlL2lubm9kYl9w
bHVnaW4vQ2hhbmdlTG9nCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDA0MTAw
NjQxLTQwZHJhNm8wOGExYmZpczcKQEAgLTEsMyArMSw4IEBACisyMDEwLTA5LTI3CVRoZSBJbm5v
REIgVGVhbQorCisJKiByb3cvcm93MHNlbC5jLCBpbm5vZGJfYnVnNTY3MTYucmVzdWx0LCBpbm5v
ZGJfYnVnNTY3MTYudGVzdDoKKwlGaXggQnVnICM1NjcxNiBJbm5vREIgbG9ja3MgYSByZWNvcmQg
Z2FwIHdpdGhvdXQgbG9ja2luZyB0aGUgdGFibGUKKwogMjAxMC0wOS0wNglUaGUgSW5ub0RCIFRl
YW0KIAkqIGRpY3QvZGljdDBsb2FkLmMsIGlubm9kYl9idWc1Mzc1Ni50ZXN0IGlubm9kYl9idWc1
Mzc1Ni5yZXN1bHQKIAlGaXggQnVnICM1Mzc1NiAJQUxURVIgVEFCTEUgQUREIFBSSU1BUlkgS0VZ
IGFmZmVjdHMgY3Jhc2ggcmVjb3ZlcnkKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9k
Yl9wbHVnaW4vcm93L3JvdzBzZWwuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9y
b3cwc2VsLmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMTAwNDA5NDk1OC1qaTNv
ZWxib3Zkd2FmcmE1CisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHNlbC5jCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDA0MTAwNjQxLTQwZHJhNm8wOGExYmZp
czcKQEAgLTM3MTksNiArMzcxOSw0MiBAQCByZWxlYXNlX3NlYXJjaF9sYXRjaF9pZl9uZWVkZWQ6
CiAKIAljbHVzdF9pbmRleCA9IGRpY3RfdGFibGVfZ2V0X2ZpcnN0X2luZGV4KGluZGV4LT50YWJs
ZSk7CiAKKwkvKiBEbyBzb21lIHN0YXJ0LW9mLXN0YXRlbWVudCBwcmVwYXJhdGlvbnMgKi8KKwor
CWlmICghcHJlYnVpbHQtPnNxbF9zdGF0X3N0YXJ0KSB7CisJCS8qIE5vIG5lZWQgdG8gc2V0IGFu
IGludGVudGlvbiBsb2NrIG9yIGFzc2lnbiBhIHJlYWQgdmlldyAqLworCisJCWlmICh0cngtPnJl
YWRfdmlldyA9PSBOVUxMCisJCSAgICAmJiBwcmVidWlsdC0+c2VsZWN0X2xvY2tfdHlwZSA9PSBM
T0NLX05PTkUpIHsKKworCQkJZnB1dHMoIklubm9EQjogRXJyb3I6IE15U1FMIGlzIHRyeWluZyB0
byIKKwkJCSAgICAgICIgcGVyZm9ybSBhIGNvbnNpc3RlbnQgcmVhZFxuIgorCQkJICAgICAgIklu
bm9EQjogYnV0IHRoZSByZWFkIHZpZXcgaXMgbm90IGFzc2lnbmVkIVxuIiwKKwkJCSAgICAgIHN0
ZGVycik7CisJCQl0cnhfcHJpbnQoc3RkZXJyLCB0cngsIDYwMCk7CisJCQlmcHV0YygnXG4nLCBz
dGRlcnIpOworCQkJdXRfZXJyb3I7CisJCX0KKwl9IGVsc2UgaWYgKHByZWJ1aWx0LT5zZWxlY3Rf
bG9ja190eXBlID09IExPQ0tfTk9ORSkgeworCQkvKiBUaGlzIGlzIGEgY29uc2lzdGVudCByZWFk
ICovCisJCS8qIEFzc2lnbiBhIHJlYWQgdmlldyBmb3IgdGhlIHF1ZXJ5ICovCisKKwkJdHJ4X2Fz
c2lnbl9yZWFkX3ZpZXcodHJ4KTsKKwkJcHJlYnVpbHQtPnNxbF9zdGF0X3N0YXJ0ID0gRkFMU0U7
CisJfSBlbHNlIHsKKwkJZXJyID0gbG9ja190YWJsZSgwLCBpbmRleC0+dGFibGUsCisJCQkJIHBy
ZWJ1aWx0LT5zZWxlY3RfbG9ja190eXBlID09IExPQ0tfUworCQkJCSA/IExPQ0tfSVMgOiBMT0NL
X0lYLCB0aHIpOworCisJCWlmIChlcnIgIT0gREJfU1VDQ0VTUykgeworCisJCQlnb3RvIGxvY2tf
d2FpdF9vcl9lcnJvcjsKKwkJfQorCQlwcmVidWlsdC0+c3FsX3N0YXRfc3RhcnQgPSBGQUxTRTsK
Kwl9CisKKwkvKiBPcGVuIG9yIHJlc3RvcmUgaW5kZXggY3Vyc29yIHBvc2l0aW9uICovCisKIAlp
ZiAoVU5JVl9MSUtFTFkoZGlyZWN0aW9uICE9IDApKSB7CiAJCWlib29sCW5lZWRfdG9fcHJvY2Vz
cyA9IHNlbF9yZXN0b3JlX3Bvc2l0aW9uX2Zvcl9teXNxbCgKIAkJCSZzYW1lX3VzZXJfcmVjLCBC
VFJfU0VBUkNIX0xFQUYsCkBAIC0zNzk0LDQyICszODMwLDYgQEAgcmVsZWFzZV9zZWFyY2hfbGF0
Y2hfaWZfbmVlZGVkOgogCQl9CiAJfQogCi0JaWYgKCFwcmVidWlsdC0+c3FsX3N0YXRfc3RhcnQp
IHsKLQkJLyogTm8gbmVlZCB0byBzZXQgYW4gaW50ZW50aW9uIGxvY2sgb3IgYXNzaWduIGEgcmVh
ZCB2aWV3ICovCi0KLQkJaWYgKHRyeC0+cmVhZF92aWV3ID09IE5VTEwKLQkJICAgICYmIHByZWJ1
aWx0LT5zZWxlY3RfbG9ja190eXBlID09IExPQ0tfTk9ORSkgewotCi0JCQlmcHV0cygiSW5ub0RC
OiBFcnJvcjogTXlTUUwgaXMgdHJ5aW5nIHRvIgotCQkJICAgICAgIiBwZXJmb3JtIGEgY29uc2lz
dGVudCByZWFkXG4iCi0JCQkgICAgICAiSW5ub0RCOiBidXQgdGhlIHJlYWQgdmlldyBpcyBub3Qg
YXNzaWduZWQhXG4iLAotCQkJICAgICAgc3RkZXJyKTsKLQkJCXRyeF9wcmludChzdGRlcnIsIHRy
eCwgNjAwKTsKLQkJCWZwdXRjKCdcbicsIHN0ZGVycik7Ci0JCQl1dF9hKDApOwotCQl9Ci0JfSBl
bHNlIGlmIChwcmVidWlsdC0+c2VsZWN0X2xvY2tfdHlwZSA9PSBMT0NLX05PTkUpIHsKLQkJLyog
VGhpcyBpcyBhIGNvbnNpc3RlbnQgcmVhZCAqLwotCQkvKiBBc3NpZ24gYSByZWFkIHZpZXcgZm9y
IHRoZSBxdWVyeSAqLwotCi0JCXRyeF9hc3NpZ25fcmVhZF92aWV3KHRyeCk7Ci0JCXByZWJ1aWx0
LT5zcWxfc3RhdF9zdGFydCA9IEZBTFNFOwotCX0gZWxzZSB7Ci0JCXVsaW50CWxvY2tfbW9kZTsK
LQkJaWYgKHByZWJ1aWx0LT5zZWxlY3RfbG9ja190eXBlID09IExPQ0tfUykgewotCQkJbG9ja19t
b2RlID0gTE9DS19JUzsKLQkJfSBlbHNlIHsKLQkJCWxvY2tfbW9kZSA9IExPQ0tfSVg7Ci0JCX0K
LQkJZXJyID0gbG9ja190YWJsZSgwLCBpbmRleC0+dGFibGUsIGxvY2tfbW9kZSwgdGhyKTsKLQot
CQlpZiAoZXJyICE9IERCX1NVQ0NFU1MpIHsKLQotCQkJZ290byBsb2NrX3dhaXRfb3JfZXJyb3I7
Ci0JCX0KLQkJcHJlYnVpbHQtPnNxbF9zdGF0X3N0YXJ0ID0gRkFMU0U7Ci0JfQotCiByZWNfbG9v
cDoKIAkvKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0qLwogCS8qIFBIQVNFIDQ6IExvb2sgZm9yIG1hdGNoaW5nIHJlY29yZHMgaW4g
YSBsb29wICovCgo=

--===============1800767186==
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: 56389451e93b671d73159a6661b8527796313399
# timestamp: 2010-10-04 13:08:26 +0300
# base_revision_id: vasil.dimov@stripped\
#   ji3oelbovdwafra5
# 
# Begin bundle
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
uSKcKEhER36pAA==


--===============1800767186==--