From: marko.makela
Date: April 26 2011 11:14am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3606) WL#5526
List-Archive: http://lists.mysql.com/commits/136093
Message-Id: <201104261114.p3QBEaJZ021481@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1687443840=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDppbmFhbS5yYW5hQG9yYWNsZS5jb20tMjAxMTA0MjIyMDMxNTAtcHhkZjUz
OXpxaGhmbWt0NgoKIDM2MDYgTWFya28gTcOka2Vsw6QJMjAxMS0wNC0yNgogICAgICBOb24tZnVu
Y3Rpb25hbCBjaGFuZ2VzIGluIHByZXBhcmF0aW9uIG9mIFdMIzU1MjYuCiAgICAgIAogICAgICBy
b3dfcHVyZ2VfcmVjb3JkX2Z1bmMoKTogUmVwbGFjZSBpZiB3aXRoIHN3aXRjaC4KICAgICAgCiAg
ICAgIHJvd191bmRvX2luc19yZW1vdmVfc2VjX3JlYygpOiBOZXcgZnVuY3Rpb24sIHJlZmFjdG9y
ZWQgZnJvbSByb3dfdW5kb19pbnMoKS4KICAgICAgUmVtb3ZlIHRoZSBzZWNvbmRhcnkgaW5kZXgg
cmVjb3Jkcy4KICAgICAgCiAgICAgIHJvd191bmRvX21vZF91cGRfZGVsX3NlYygpLCByb3dfdW5k
b19tb2RfZGVsX21hcmtfc2VjKCksCiAgICAgIHJvd191bmRvX21vZF91cGRfZXhpc3Rfc2VjKCk6
IFVzZSBmb3IgaW5zdGVhZCBvZiB3aGlsZS4KICAgICAgSW52b2tlIG1lbV9oZWFwX2VtcHR5KCkg
b24gZXZlcnkgbG9vcCBpdGVyYXRpb24uCiAgICAgIAogICAgICByb3dfdW5kb19tb2QoKTogUmVw
bGFjZSBpZiB3aXRoIHN3aXRjaC4KICAgICAgCiAgICAgIHJvd191cGQoKTogUmVwbGFjZSBpZiB3
aXRoIHN3aXRjaC4gRWxpbWluYXRlIGEgZ290byBsYWJlbC4KCiAgICBtb2RpZmllZDoKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHB1cmdlLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9y
b3cvcm93MHVpbnMuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdW1vZC5jCiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1cGQuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFn
ZS9pbm5vYmFzZS9yb3cvcm93MHB1cmdlLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3Jv
dzBwdXJnZS5jCXJldmlkOmluYWFtLnJhbmFAb3JhY2xlLmNvbS0yMDExMDQyMjIwMzE1MC1weGRm
NTM5enFoaGZta3Q2CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBwdXJnZS5jCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDI2MTExNDIyLTFzcjdzbTR6aGtvazlkMTkK
QEAgLTczNSwxNCArNzM1LDIwIEBAIHJvd19wdXJnZV9yZWNvcmRfZnVuYygKIAogCW5vZGUtPmlu
ZGV4ID0gZGljdF90YWJsZV9nZXRfbmV4dF9pbmRleChjbHVzdF9pbmRleCk7CiAKLQlpZiAobm9k
ZS0+cmVjX3R5cGUgPT0gVFJYX1VORE9fREVMX01BUktfUkVDKSB7CisJc3dpdGNoIChub2RlLT5y
ZWNfdHlwZSkgeworCWNhc2UgVFJYX1VORE9fREVMX01BUktfUkVDOgogCQlyb3dfcHVyZ2VfZGVs
X21hcmsobm9kZSk7CiAJCU1PTklUT1JfSU5DKE1PTklUT1JfTl9ERUxfUk9XX1BVUkdFKTsKLQl9
IGVsc2UgaWYgKHVwZGF0ZWRfZXh0ZXJuCi0JCSAgIHx8IG5vZGUtPnJlY190eXBlID09IFRSWF9V
TkRPX1VQRF9FWElTVF9SRUMpIHsKLQorCQlicmVhazsKKwlkZWZhdWx0OgorCQlpZiAoIXVwZGF0
ZWRfZXh0ZXJuKSB7CisJCQlicmVhazsKKwkJfQorCQkvKiBmYWxsIHRocm91Z2ggKi8KKwljYXNl
IFRSWF9VTkRPX1VQRF9FWElTVF9SRUM6CiAJCXJvd19wdXJnZV91cGRfZXhpc3Rfb3JfZXh0ZXJu
KHRociwgbm9kZSwgdW5kb19yZWMpOwogCQlNT05JVE9SX0lOQyhNT05JVE9SX05fVVBEX0VYSVNU
X0VYVEVSTik7CisJCWJyZWFrOwogCX0KIAogCWlmIChub2RlLT5mb3VuZF9jbHVzdCkgewoKPT09
IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1aW5zLmMnCi0tLSBhL3N0
b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1aW5zLmMJcmV2aWQ6aW5hYW0ucmFuYUBvcmFjbGUuY29t
LTIwMTEwNDIyMjAzMTUwLXB4ZGY1Mzl6cWhoZm1rdDYKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9y
b3cvcm93MHVpbnMuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQyNjExMTQy
Mi0xc3I3c200emhrb2s5ZDE5CkBAIC0zMDcsNiArMzA3LDUzIEBAIHJvd191bmRvX2luc19wYXJz
ZV91bmRvX3JlYygKIAl9CiB9CiAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCitSZW1vdmVzIHNlY29uZGFyeSBpbmRl
eCByZWNvcmRzLgorQHJldHVybglEQl9TVUNDRVNTIG9yIERCX09VVF9PRl9GSUxFX1NQQUNFICov
CitzdGF0aWMKK3VsaW50Cityb3dfdW5kb19pbnNfcmVtb3ZlX3NlY19yZWMoCisvKj09PT09PT09
PT09PT09PT09PT09PT09PSovCisJdW5kb19ub2RlX3QqCW5vZGUpCS8qITwgaW4vb3V0OiByb3cg
dW5kbyBub2RlICovCit7CisJdWxpbnQJCWVycgk9IERCX1NVQ0NFU1M7CisJbWVtX2hlYXBfdCoJ
aGVhcDsKKworCWZvciAoaGVhcCA9IG1lbV9oZWFwX2NyZWF0ZSgxMDI0KTsKKwkgICAgIG5vZGUt
PmluZGV4ICE9IE5VTEw7CisJICAgICBtZW1faGVhcF9lbXB0eShoZWFwKSwKKwkJICAgICBub2Rl
LT5pbmRleCA9IGRpY3RfdGFibGVfZ2V0X25leHRfaW5kZXgobm9kZS0+aW5kZXgpKSB7CisJCWR0
dXBsZV90KgllbnRyeTsKKworCQllbnRyeSA9IHJvd19idWlsZF9pbmRleF9lbnRyeShub2RlLT5y
b3csIG5vZGUtPmV4dCwKKwkJCQkJICAgICAgbm9kZS0+aW5kZXgsIGhlYXApOworCQlpZiAoVU5J
Vl9VTkxJS0VMWSghZW50cnkpKSB7CisJCQkvKiBUaGUgZGF0YWJhc2UgbXVzdCBoYXZlIGNyYXNo
ZWQgYWZ0ZXIKKwkJCWluc2VydGluZyBhIGNsdXN0ZXJlZCBpbmRleCByZWNvcmQgYnV0IGJlZm9y
ZQorCQkJd3JpdGluZyBhbGwgdGhlIGV4dGVybmFsbHkgc3RvcmVkIGNvbHVtbnMgb2YKKwkJCXRo
YXQgcmVjb3JkLiAgQmVjYXVzZSBzZWNvbmRhcnkgaW5kZXggZW50cmllcworCQkJYXJlIGluc2Vy
dGVkIGFmdGVyIHRoZSBjbHVzdGVyZWQgaW5kZXggcmVjb3JkLAorCQkJd2UgbWF5IGFzc3VtZSB0
aGF0IHRoZSBzZWNvbmRhcnkgaW5kZXggcmVjb3JkCisJCQlkb2VzIG5vdCBleGlzdC4gIEhvd2V2
ZXIsIHRoaXMgc2l0dWF0aW9uIG1heQorCQkJb25seSBvY2N1ciBkdXJpbmcgdGhlIHJvbGxiYWNr
IG9mIGluY29tcGxldGUKKwkJCXRyYW5zYWN0aW9ucy4gKi8KKwkJCXV0X2EodHJ4X2lzX3JlY3Yo
bm9kZS0+dHJ4KSk7CisJCX0gZWxzZSB7CisJCQlsb2dfZnJlZV9jaGVjaygpOworCisJCQllcnIg
PSByb3dfdW5kb19pbnNfcmVtb3ZlX3NlYyhub2RlLT5pbmRleCwgZW50cnkpOworCisJCQlpZiAo
VU5JVl9VTkxJS0VMWShlcnIgIT0gREJfU1VDQ0VTUykpIHsKKwkJCQlnb3RvIGZ1bmNfZXhpdDsK
KwkJCX0KKwkJfQorCX0KKworZnVuY19leGl0OgorCW1lbV9oZWFwX2ZyZWUoaGVhcCk7CisJcmV0
dXJuKGVycik7Cit9CisKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKi8vKioKIFVuZG9lcyBhIGZyZXNoIGluc2VydCBvZiBhIHJvdyB0
byBhIHRhYmxlLiBBIGZyZXNoIGluc2VydCBtZWFucyB0aGF0CiB0aGUgc2FtZSBjbHVzdGVyZWQg
aW5kZXggdW5pcXVlIGtleSBkaWQgbm90IGhhdmUgYW55IHJlY29yZCwgZXZlbiBkZWxldGUKQEAg
LTM0Miw0NCArMzg5LDE3IEBAIHJvd191bmRvX2lucygKIAlub2RlLT5pbmRleCA9IGRpY3RfdGFi
bGVfZ2V0X25leHRfaW5kZXgoCiAJCWRpY3RfdGFibGVfZ2V0X2ZpcnN0X2luZGV4KG5vZGUtPnRh
YmxlKSk7CiAKLQl3aGlsZSAobm9kZS0+aW5kZXggIT0gTlVMTCkgewotCQlkdHVwbGVfdCoJZW50
cnk7Ci0KLQkJZW50cnkgPSByb3dfYnVpbGRfaW5kZXhfZW50cnkobm9kZS0+cm93LCBub2RlLT5l
eHQsCi0JCQkJCSAgICAgIG5vZGUtPmluZGV4LCBub2RlLT5oZWFwKTsKLQkJaWYgKFVOSVZfVU5M
SUtFTFkoIWVudHJ5KSkgewotCQkJLyogVGhlIGRhdGFiYXNlIG11c3QgaGF2ZSBjcmFzaGVkIGFm
dGVyCi0JCQlpbnNlcnRpbmcgYSBjbHVzdGVyZWQgaW5kZXggcmVjb3JkIGJ1dCBiZWZvcmUKLQkJ
CXdyaXRpbmcgYWxsIHRoZSBleHRlcm5hbGx5IHN0b3JlZCBjb2x1bW5zIG9mCi0JCQl0aGF0IHJl
Y29yZC4gIEJlY2F1c2Ugc2Vjb25kYXJ5IGluZGV4IGVudHJpZXMKLQkJCWFyZSBpbnNlcnRlZCBh
ZnRlciB0aGUgY2x1c3RlcmVkIGluZGV4IHJlY29yZCwKLQkJCXdlIG1heSBhc3N1bWUgdGhhdCB0
aGUgc2Vjb25kYXJ5IGluZGV4IHJlY29yZAotCQkJZG9lcyBub3QgZXhpc3QuICBIb3dldmVyLCB0
aGlzIHNpdHVhdGlvbiBtYXkKLQkJCW9ubHkgb2NjdXIgZHVyaW5nIHRoZSByb2xsYmFjayBvZiBp
bmNvbXBsZXRlCi0JCQl0cmFuc2FjdGlvbnMuICovCi0JCQl1dF9hKHRyeF9pc19yZWN2KG5vZGUt
PnRyeCkpOwotCQl9IGVsc2UgewotCQkJbG9nX2ZyZWVfY2hlY2soKTsKLQotCQkJZXJyID0gcm93
X3VuZG9faW5zX3JlbW92ZV9zZWMobm9kZS0+aW5kZXgsIGVudHJ5KTsKLQotCQkJaWYgKGVyciAh
PSBEQl9TVUNDRVNTKSB7Ci0KLQkJCQlkaWN0X3RhYmxlX2Nsb3NlKG5vZGUtPnRhYmxlLCBkaWN0
X2xvY2tlZCk7Ci0KLQkJCQlub2RlLT50YWJsZSA9IE5VTEw7Ci0KLQkJCQlyZXR1cm4oZXJyKTsK
LQkJCX0KLQkJfQorCWVyciA9IHJvd191bmRvX2luc19yZW1vdmVfc2VjX3JlYyhub2RlKTsKIAot
CQlub2RlLT5pbmRleCA9IGRpY3RfdGFibGVfZ2V0X25leHRfaW5kZXgobm9kZS0+aW5kZXgpOwor
CWlmIChVTklWX1VOTElLRUxZKGVyciAhPSBEQl9TVUNDRVNTKSkgeworCQlnb3RvIGZ1bmNfZXhp
dDsKIAl9CiAKIAlsb2dfZnJlZV9jaGVjaygpOwogCiAJZXJyID0gcm93X3VuZG9faW5zX3JlbW92
ZV9jbHVzdF9yZWMobm9kZSk7CiAKK2Z1bmNfZXhpdDoKIAlkaWN0X3RhYmxlX2Nsb3NlKG5vZGUt
PnRhYmxlLCBkaWN0X2xvY2tlZCk7CiAKIAlub2RlLT50YWJsZSA9IE5VTEw7Cgo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVtb2QuYycKLS0tIGEvc3RvcmFnZS9p
bm5vYmFzZS9yb3cvcm93MHVtb2QuYwlyZXZpZDppbmFhbS5yYW5hQG9yYWNsZS5jb20tMjAxMTA0
MjIyMDMxNTAtcHhkZjUzOXpxaGhmbWt0NgorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cw
dW1vZC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDI2MTExNDIyLTFzcjdz
bTR6aGtvazlkMTkKQEAgLTU2NSwxOCArNTY1LDE3IEBAIHJvd191bmRvX21vZF91cGRfZGVsX3Nl
YygKIAlxdWVfdGhyX3QqCXRocikJLyohPCBpbjogcXVlcnkgdGhyZWFkICovCiB7CiAJbWVtX2hl
YXBfdCoJaGVhcDsKLQlkdHVwbGVfdCoJZW50cnk7Ci0JZGljdF9pbmRleF90KglpbmRleDsKIAl1
bGludAkJZXJyCT0gREJfU1VDQ0VTUzsKIAogCXV0X2FkKG5vZGUtPnJlY190eXBlID09IFRSWF9V
TkRPX1VQRF9ERUxfUkVDKTsKLQloZWFwID0gbWVtX2hlYXBfY3JlYXRlKDEwMjQpOwogCi0Jd2hp
bGUgKG5vZGUtPmluZGV4ICE9IE5VTEwpIHsKLQkJaW5kZXggPSBub2RlLT5pbmRleDsKLQotCQll
bnRyeSA9IHJvd19idWlsZF9pbmRleF9lbnRyeShub2RlLT5yb3csIG5vZGUtPmV4dCwKLQkJCQkJ
ICAgICAgaW5kZXgsIGhlYXApOworCWZvciAoaGVhcCA9IG1lbV9oZWFwX2NyZWF0ZSgxMDI0KTsK
KwkgICAgIG5vZGUtPmluZGV4ICE9IE5VTEw7CisJICAgICBtZW1faGVhcF9lbXB0eShoZWFwKSwK
KwkJICAgICBub2RlLT5pbmRleCA9IGRpY3RfdGFibGVfZ2V0X25leHRfaW5kZXgobm9kZS0+aW5k
ZXgpKSB7CisJCWRpY3RfaW5kZXhfdCoJaW5kZXgJPSBub2RlLT5pbmRleDsKKwkJZHR1cGxlX3Qq
CWVudHJ5CT0gcm93X2J1aWxkX2luZGV4X2VudHJ5KAorCQkJbm9kZS0+cm93LCBub2RlLT5leHQs
IGluZGV4LCBoZWFwKTsKIAkJaWYgKFVOSVZfVU5MSUtFTFkoIWVudHJ5KSkgewogCQkJLyogVGhl
IGRhdGFiYXNlIG11c3QgaGF2ZSBjcmFzaGVkIGFmdGVyCiAJCQlpbnNlcnRpbmcgYSBjbHVzdGVy
ZWQgaW5kZXggcmVjb3JkIGJ1dCBiZWZvcmUKQEAgLTU5MiwxNSArNTkxLDExIEBAIHJvd191bmRv
X21vZF91cGRfZGVsX3NlYygKIAkJCWVyciA9IHJvd191bmRvX21vZF9kZWxfbWFya19vcl9yZW1v
dmVfc2VjKAogCQkJCW5vZGUsIHRociwgaW5kZXgsIGVudHJ5KTsKIAotCQkJaWYgKGVyciAhPSBE
Ql9TVUNDRVNTKSB7CisJCQlpZiAoVU5JVl9VTkxJS0VMWShlcnIgIT0gREJfU1VDQ0VTUykpIHsK
IAogCQkJCWJyZWFrOwogCQkJfQogCQl9Ci0KLQkJbWVtX2hlYXBfZW1wdHkoaGVhcCk7Ci0KLQkJ
bm9kZS0+aW5kZXggPSBkaWN0X3RhYmxlX2dldF9uZXh0X2luZGV4KG5vZGUtPmluZGV4KTsKIAl9
CiAKIAltZW1faGVhcF9mcmVlKGhlYXApOwpAQCAtNjE5LDE4ICs2MTQsMTcgQEAgcm93X3VuZG9f
bW9kX2RlbF9tYXJrX3NlYygKIAlxdWVfdGhyX3QqCXRocikJLyohPCBpbjogcXVlcnkgdGhyZWFk
ICovCiB7CiAJbWVtX2hlYXBfdCoJaGVhcDsKLQlkdHVwbGVfdCoJZW50cnk7Ci0JZGljdF9pbmRl
eF90KglpbmRleDsKLQl1bGludAkJZXJyOwotCi0JaGVhcCA9IG1lbV9oZWFwX2NyZWF0ZSgxMDI0
KTsKLQotCXdoaWxlIChub2RlLT5pbmRleCAhPSBOVUxMKSB7Ci0JCWluZGV4ID0gbm9kZS0+aW5k
ZXg7CisJdWxpbnQJCWVycgk9IERCX1NVQ0NFU1M7CiAKLQkJZW50cnkgPSByb3dfYnVpbGRfaW5k
ZXhfZW50cnkobm9kZS0+cm93LCBub2RlLT5leHQsCi0JCQkJCSAgICAgIGluZGV4LCBoZWFwKTsK
Kwlmb3IgKGhlYXAgPSBtZW1faGVhcF9jcmVhdGUoMTAyNCk7CisJICAgICBub2RlLT5pbmRleCAh
PSBOVUxMOworCSAgICAgbWVtX2hlYXBfZW1wdHkoaGVhcCksCisJCSAgICAgbm9kZS0+aW5kZXgg
PSBkaWN0X3RhYmxlX2dldF9uZXh0X2luZGV4KG5vZGUtPmluZGV4KSkgeworCQlkaWN0X2luZGV4
X3QqCWluZGV4CT0gbm9kZS0+aW5kZXg7CisJCWR0dXBsZV90KgllbnRyeQk9IHJvd19idWlsZF9p
bmRleF9lbnRyeSgKKwkJCW5vZGUtPnJvdywgbm9kZS0+ZXh0LCBpbmRleCwgaGVhcCk7CiAJCXV0
X2EoZW50cnkpOworCiAJCWVyciA9IHJvd191bmRvX21vZF9kZWxfdW5tYXJrX3NlY19hbmRfdW5k
b191cGRhdGUoCiAJCQlCVFJfTU9ESUZZX0xFQUYsIHRociwgaW5kZXgsIGVudHJ5KTsKIAkJaWYg
KGVyciA9PSBEQl9GQUlMKSB7CkBAIC02MzgsMTkgKzYzMiwxNSBAQCByb3dfdW5kb19tb2RfZGVs
X21hcmtfc2VjKAogCQkJCUJUUl9NT0RJRllfVFJFRSwgdGhyLCBpbmRleCwgZW50cnkpOwogCQl9
CiAKLQkJaWYgKGVyciAhPSBEQl9TVUNDRVNTKSB7Ci0KLQkJCW1lbV9oZWFwX2ZyZWUoaGVhcCk7
CisJCWlmIChVTklWX1VOTElLRUxZKGVyciAhPSBEQl9TVUNDRVNTKSkgewogCi0JCQlyZXR1cm4o
ZXJyKTsKKwkJCWJyZWFrOwogCQl9Ci0KLQkJbm9kZS0+aW5kZXggPSBkaWN0X3RhYmxlX2dldF9u
ZXh0X2luZGV4KG5vZGUtPmluZGV4KTsKIAl9CiAKIAltZW1faGVhcF9mcmVlKGhlYXApOwogCi0J
cmV0dXJuKERCX1NVQ0NFU1MpOworCXJldHVybihlcnIpOwogfQogCiAvKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCkBAIC02NjQs
MTA5ICs2NTQsMTAxIEBAIHJvd191bmRvX21vZF91cGRfZXhpc3Rfc2VjKAogCXF1ZV90aHJfdCoJ
dGhyKQkvKiE8IGluOiBxdWVyeSB0aHJlYWQgKi8KIHsKIAltZW1faGVhcF90KgloZWFwOwotCWR0
dXBsZV90KgllbnRyeTsKLQlkaWN0X2luZGV4X3QqCWluZGV4OwotCXVsaW50CQllcnI7CisJdWxp
bnQJCWVycgk9IERCX1NVQ0NFU1M7CiAKLQlpZiAobm9kZS0+Y21wbF9pbmZvICYgVVBEX05PREVf
Tk9fT1JEX0NIQU5HRSkgeworCWlmIChub2RlLT5pbmRleCA9PSBOVUxMCisJICAgIHx8IChub2Rl
LT5jbXBsX2luZm8gJiBVUERfTk9ERV9OT19PUkRfQ0hBTkdFKSkgewogCQkvKiBObyBjaGFuZ2Ug
aW4gc2Vjb25kYXJ5IGluZGV4ZXMgKi8KIAotCQlyZXR1cm4oREJfU1VDQ0VTUyk7CisJCXJldHVy
bihlcnIpOwogCX0KIAotCWhlYXAgPSBtZW1faGVhcF9jcmVhdGUoMTAyNCk7Ci0KLQl3aGlsZSAo
bm9kZS0+aW5kZXggIT0gTlVMTCkgewotCQlpbmRleCA9IG5vZGUtPmluZGV4OwotCi0JCWlmIChy
b3dfdXBkX2NoYW5nZXNfb3JkX2ZpZWxkX2JpbmFyeShub2RlLT5pbmRleCwgbm9kZS0+dXBkYXRl
LAotCQkJCQkJICAgICB0aHIsCi0JCQkJCQkgICAgIG5vZGUtPnJvdywgbm9kZS0+ZXh0KSkgewot
Ci0JCQkvKiBCdWlsZCB0aGUgbmV3ZXN0IHZlcnNpb24gb2YgdGhlIGluZGV4IGVudHJ5ICovCi0J
CQllbnRyeSA9IHJvd19idWlsZF9pbmRleF9lbnRyeShub2RlLT5yb3csIG5vZGUtPmV4dCwKLQkJ
CQkJCSAgICAgIGluZGV4LCBoZWFwKTsKLQkJCWlmIChVTklWX1VOTElLRUxZKCFlbnRyeSkpIHsK
LQkJCQkvKiBUaGUgc2VydmVyIG11c3QgaGF2ZSBjcmFzaGVkIGluCi0JCQkJcm93X3VwZF9jbHVz
dF9yZWNfYnlfaW5zZXJ0KCkgYmVmb3JlCi0JCQkJdGhlIHVwZGF0ZWQgZXh0ZXJuYWxseSBzdG9y
ZWQgY29sdW1ucyAoQkxPQnMpCi0JCQkJb2YgdGhlIG5ldyBjbHVzdGVyZWQgaW5kZXggZW50cnkg
d2VyZQotCQkJCXdyaXR0ZW4uICovCi0KLQkJCQkvKiBUaGUgdGFibGUgbXVzdCBiZSBpbiBEWU5B
TUlDIG9yIENPTVBSRVNTRUQKLQkJCQlmb3JtYXQuICBSRURVTkRBTlQgYW5kIENPTVBBQ1QgZm9y
bWF0cwotCQkJCXN0b3JlIGEgbG9jYWwgNzY4LWJ5dGUgcHJlZml4IG9mIGVhY2gKLQkJCQlleHRl
cm5hbGx5IHN0b3JlZCBjb2x1bW4uICovCi0JCQkJdXRfYShkaWN0X3RhYmxlX2dldF9mb3JtYXQo
aW5kZXgtPnRhYmxlKQotCQkJCSAgICAgPj0gVU5JVl9GT1JNQVRfQik7Ci0KLQkJCQkvKiBUaGlz
IGlzIG9ubHkgbGVnaXRpbWF0ZSB3aGVuCi0JCQkJcm9sbGluZyBiYWNrIGFuIGluY29tcGxldGUg
dHJhbnNhY3Rpb24KLQkJCQlhZnRlciBjcmFzaCByZWNvdmVyeS4gKi8KLQkJCQl1dF9hKHRocl9n
ZXRfdHJ4KHRociktPmlzX3JlY292ZXJlZCk7Ci0KLQkJCQkvKiBUaGUgc2VydmVyIG11c3QgaGF2
ZSBjcmFzaGVkIGJlZm9yZQotCQkJCWNvbXBsZXRpbmcgdGhlIGluc2VydCBvZiB0aGUgbmV3Ci0J
CQkJY2x1c3RlcmVkIGluZGV4IGVudHJ5IGFuZCBiZWZvcmUKLQkJCQlpbnNlcnRpbmcgdG8gdGhl
IHNlY29uZGFyeSBpbmRleGVzLgotCQkJCUJlY2F1c2Ugbm9kZS0+cm93IHdhcyBub3QgeWV0IHdy
aXR0ZW4KLQkJCQl0byB0aGlzIGluZGV4LCB3ZSBjYW4gaWdub3JlIGl0LiAgQnV0Ci0JCQkJd2Ug
bXVzdCByZXN0b3JlIG5vZGUtPnVuZG9fcm93LiAqLwotCQkJfSBlbHNlIHsKLQkJCQkvKiBOT1RF
IHRoYXQgaWYgd2UgdXBkYXRlZCB0aGUgZmllbGRzIG9mIGEKLQkJCQlkZWxldGUtbWFya2VkIHNl
Y29uZGFyeSBpbmRleCByZWNvcmQgc28gdGhhdAotCQkJCWFscGhhYmV0aWNhbGx5IHRoZXkgc3Rh
eWVkIHRoZSBzYW1lLCBlLmcuLAotCQkJCSdhYmMnIC0+ICdhQmMnLCB3ZSBjYW5ub3QgcmV0dXJu
IHRvIHRoZQotCQkJCW9yaWdpbmFsIHZhbHVlcyBiZWNhdXNlIHdlIGRvIG5vdCBrbm93IHRoZW0u
Ci0JCQkJQnV0IHRoaXMgc2hvdWxkIG5vdCBjYXVzZSBwcm9ibGVtcyBiZWNhdXNlCi0JCQkJaW4g
cm93MHNlbC5jLCBpbiBxdWVyaWVzIHdlIGFsd2F5cyByZXRyaWV2ZQotCQkJCXRoZSBjbHVzdGVy
ZWQgaW5kZXggcmVjb3JkIG9yIGFuIGVhcmxpZXIKLQkJCQl2ZXJzaW9uIG9mIGl0LCBpZiB0aGUg
c2Vjb25kYXJ5IGluZGV4IHJlY29yZAotCQkJCXRocm91Z2ggd2hpY2ggd2UgZG8gdGhlIHNlYXJj
aCBpcwotCQkJCWRlbGV0ZS1tYXJrZWQuICovCi0KLQkJCQllcnIgPSByb3dfdW5kb19tb2RfZGVs
X21hcmtfb3JfcmVtb3ZlX3NlYygKLQkJCQkJbm9kZSwgdGhyLCBpbmRleCwgZW50cnkpOwotCQkJ
CWlmIChlcnIgIT0gREJfU1VDQ0VTUykgewotCQkJCQltZW1faGVhcF9mcmVlKGhlYXApOworCWZv
ciAoaGVhcCA9IG1lbV9oZWFwX2NyZWF0ZSgxMDI0KTsgbm9kZS0+aW5kZXggIT0gTlVMTDsKKwkg
ICAgIG1lbV9oZWFwX2VtcHR5KGhlYXApLAorCQkgICAgIG5vZGUtPmluZGV4ID0gZGljdF90YWJs
ZV9nZXRfbmV4dF9pbmRleChub2RlLT5pbmRleCkpIHsKKwkJZGljdF9pbmRleF90KglpbmRleAk9
IG5vZGUtPmluZGV4OworCQlkdHVwbGVfdCoJZW50cnk7CisKKwkJaWYgKCFyb3dfdXBkX2NoYW5n
ZXNfb3JkX2ZpZWxkX2JpbmFyeShpbmRleCwgbm9kZS0+dXBkYXRlLCB0aHIsCisJCQkJCQkgICAg
ICBub2RlLT5yb3csIG5vZGUtPmV4dCkpIHsKKwkJCWNvbnRpbnVlOworCQl9CiAKLQkJCQkJcmV0
dXJuKGVycik7Ci0JCQkJfQorCQkvKiBCdWlsZCB0aGUgbmV3ZXN0IHZlcnNpb24gb2YgdGhlIGlu
ZGV4IGVudHJ5ICovCisJCWVudHJ5ID0gcm93X2J1aWxkX2luZGV4X2VudHJ5KG5vZGUtPnJvdywg
bm9kZS0+ZXh0LAorCQkJCQkgICAgICBpbmRleCwgaGVhcCk7CisJCWlmIChVTklWX1VOTElLRUxZ
KCFlbnRyeSkpIHsKKwkJCS8qIFRoZSBzZXJ2ZXIgbXVzdCBoYXZlIGNyYXNoZWQgaW4KKwkJCXJv
d191cGRfY2x1c3RfcmVjX2J5X2luc2VydCgpIGJlZm9yZQorCQkJdGhlIHVwZGF0ZWQgZXh0ZXJu
YWxseSBzdG9yZWQgY29sdW1ucyAoQkxPQnMpCisJCQlvZiB0aGUgbmV3IGNsdXN0ZXJlZCBpbmRl
eCBlbnRyeSB3ZXJlIHdyaXR0ZW4uICovCisKKwkJCS8qIFRoZSB0YWJsZSBtdXN0IGJlIGluIERZ
TkFNSUMgb3IgQ09NUFJFU1NFRAorCQkJZm9ybWF0LiAgUkVEVU5EQU5UIGFuZCBDT01QQUNUIGZv
cm1hdHMKKwkJCXN0b3JlIGEgbG9jYWwgNzY4LWJ5dGUgcHJlZml4IG9mIGVhY2gKKwkJCWV4dGVy
bmFsbHkgc3RvcmVkIGNvbHVtbi4gKi8KKwkJCXV0X2EoZGljdF90YWJsZV9nZXRfZm9ybWF0KGlu
ZGV4LT50YWJsZSkKKwkJCSAgICAgPj0gVU5JVl9GT1JNQVRfQik7CisKKwkJCS8qIFRoaXMgaXMg
b25seSBsZWdpdGltYXRlIHdoZW4KKwkJCXJvbGxpbmcgYmFjayBhbiBpbmNvbXBsZXRlIHRyYW5z
YWN0aW9uCisJCQlhZnRlciBjcmFzaCByZWNvdmVyeS4gKi8KKwkJCXV0X2EodGhyX2dldF90cngo
dGhyKS0+aXNfcmVjb3ZlcmVkKTsKKworCQkJLyogVGhlIHNlcnZlciBtdXN0IGhhdmUgY3Jhc2hl
ZCBiZWZvcmUKKwkJCWNvbXBsZXRpbmcgdGhlIGluc2VydCBvZiB0aGUgbmV3CisJCQljbHVzdGVy
ZWQgaW5kZXggZW50cnkgYW5kIGJlZm9yZQorCQkJaW5zZXJ0aW5nIHRvIHRoZSBzZWNvbmRhcnkg
aW5kZXhlcy4KKwkJCUJlY2F1c2Ugbm9kZS0+cm93IHdhcyBub3QgeWV0IHdyaXR0ZW4KKwkJCXRv
IHRoaXMgaW5kZXgsIHdlIGNhbiBpZ25vcmUgaXQuICBCdXQKKwkJCXdlIG11c3QgcmVzdG9yZSBu
b2RlLT51bmRvX3Jvdy4gKi8KKwkJfSBlbHNlIHsKKwkJCS8qIE5PVEUgdGhhdCBpZiB3ZSB1cGRh
dGVkIHRoZSBmaWVsZHMgb2YgYQorCQkJZGVsZXRlLW1hcmtlZCBzZWNvbmRhcnkgaW5kZXggcmVj
b3JkIHNvIHRoYXQKKwkJCWFscGhhYmV0aWNhbGx5IHRoZXkgc3RheWVkIHRoZSBzYW1lLCBlLmcu
LAorCQkJJ2FiYycgLT4gJ2FCYycsIHdlIGNhbm5vdCByZXR1cm4gdG8gdGhlCisJCQlvcmlnaW5h
bCB2YWx1ZXMgYmVjYXVzZSB3ZSBkbyBub3Qga25vdyB0aGVtLgorCQkJQnV0IHRoaXMgc2hvdWxk
IG5vdCBjYXVzZSBwcm9ibGVtcyBiZWNhdXNlCisJCQlpbiByb3cwc2VsLmMsIGluIHF1ZXJpZXMg
d2UgYWx3YXlzIHJldHJpZXZlCisJCQl0aGUgY2x1c3RlcmVkIGluZGV4IHJlY29yZCBvciBhbiBl
YXJsaWVyCisJCQl2ZXJzaW9uIG9mIGl0LCBpZiB0aGUgc2Vjb25kYXJ5IGluZGV4IHJlY29yZAor
CQkJdGhyb3VnaCB3aGljaCB3ZSBkbyB0aGUgc2VhcmNoIGlzCisJCQlkZWxldGUtbWFya2VkLiAq
LwogCi0JCQkJbWVtX2hlYXBfZW1wdHkoaGVhcCk7CisJCQllcnIgPSByb3dfdW5kb19tb2RfZGVs
X21hcmtfb3JfcmVtb3ZlX3NlYygKKwkJCQlub2RlLCB0aHIsIGluZGV4LCBlbnRyeSk7CisJCQlp
ZiAoZXJyICE9IERCX1NVQ0NFU1MpIHsKKwkJCQlicmVhazsKIAkJCX0KKwkJfQogCi0JCQkvKiBX
ZSBtYXkgaGF2ZSB0byB1cGRhdGUgdGhlIGRlbGV0ZSBtYXJrIGluIHRoZQotCQkJc2Vjb25kYXJ5
IGluZGV4IHJlY29yZCBvZiB0aGUgcHJldmlvdXMgdmVyc2lvbiBvZgotCQkJdGhlIHJvdy4gV2Ug
YWxzbyBuZWVkIHRvIHVwZGF0ZSB0aGUgZmllbGRzIG9mCi0JCQl0aGUgc2Vjb25kYXJ5IGluZGV4
IHJlY29yZCBpZiB3ZSB1cGRhdGVkIGl0cyBmaWVsZHMKLQkJCWJ1dCBhbHBoYWJldGljYWxseSB0
aGV5IHN0YXllZCB0aGUgc2FtZSwgZS5nLiwKLQkJCSdhYmMnIC0+ICdhQmMnLiAqLwotCQkJZW50
cnkgPSByb3dfYnVpbGRfaW5kZXhfZW50cnkobm9kZS0+dW5kb19yb3csCi0JCQkJCQkgICAgICBu
b2RlLT51bmRvX2V4dCwKLQkJCQkJCSAgICAgIGluZGV4LCBoZWFwKTsKLQkJCXV0X2EoZW50cnkp
OworCQltZW1faGVhcF9lbXB0eShoZWFwKTsKKwkJLyogV2UgbWF5IGhhdmUgdG8gdXBkYXRlIHRo
ZSBkZWxldGUgbWFyayBpbiB0aGUKKwkJc2Vjb25kYXJ5IGluZGV4IHJlY29yZCBvZiB0aGUgcHJl
dmlvdXMgdmVyc2lvbiBvZgorCQl0aGUgcm93LiBXZSBhbHNvIG5lZWQgdG8gdXBkYXRlIHRoZSBm
aWVsZHMgb2YKKwkJdGhlIHNlY29uZGFyeSBpbmRleCByZWNvcmQgaWYgd2UgdXBkYXRlZCBpdHMg
ZmllbGRzCisJCWJ1dCBhbHBoYWJldGljYWxseSB0aGV5IHN0YXllZCB0aGUgc2FtZSwgZS5nLiwK
KwkJJ2FiYycgLT4gJ2FCYycuICovCisJCWVudHJ5ID0gcm93X2J1aWxkX2luZGV4X2VudHJ5KG5v
ZGUtPnVuZG9fcm93LAorCQkJCQkgICAgICBub2RlLT51bmRvX2V4dCwKKwkJCQkJICAgICAgaW5k
ZXgsIGhlYXApOworCQl1dF9hKGVudHJ5KTsKIAorCQllcnIgPSByb3dfdW5kb19tb2RfZGVsX3Vu
bWFya19zZWNfYW5kX3VuZG9fdXBkYXRlKAorCQkJQlRSX01PRElGWV9MRUFGLCB0aHIsIGluZGV4
LCBlbnRyeSk7CisJCWlmIChlcnIgPT0gREJfRkFJTCkgewogCQkJZXJyID0gcm93X3VuZG9fbW9k
X2RlbF91bm1hcmtfc2VjX2FuZF91bmRvX3VwZGF0ZSgKLQkJCQlCVFJfTU9ESUZZX0xFQUYsIHRo
ciwgaW5kZXgsIGVudHJ5KTsKLQkJCWlmIChlcnIgPT0gREJfRkFJTCkgewotCQkJCWVyciA9IHJv
d191bmRvX21vZF9kZWxfdW5tYXJrX3NlY19hbmRfdW5kb191cGRhdGUoCi0JCQkJCUJUUl9NT0RJ
RllfVFJFRSwgdGhyLCBpbmRleCwgZW50cnkpOwotCQkJfQotCi0JCQlpZiAoZXJyICE9IERCX1NV
Q0NFU1MpIHsKLQkJCQltZW1faGVhcF9mcmVlKGhlYXApOwotCi0JCQkJcmV0dXJuKGVycik7Ci0J
CQl9CisJCQkJQlRSX01PRElGWV9UUkVFLCB0aHIsIGluZGV4LCBlbnRyeSk7CiAJCX0KIAotCQlu
b2RlLT5pbmRleCA9IGRpY3RfdGFibGVfZ2V0X25leHRfaW5kZXgobm9kZS0+aW5kZXgpOworCQlp
ZiAoVU5JVl9VTkxJS0VMWShlcnIgIT0gREJfU1VDQ0VTUykpIHsKKwkJCWJyZWFrOworCQl9CiAJ
fQogCiAJbWVtX2hlYXBfZnJlZShoZWFwKTsKIAotCXJldHVybihEQl9TVUNDRVNTKTsKKwlyZXR1
cm4oZXJyKTsKIH0KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqLy8qKgpAQCAtODcyLDE2ICs4NTQsMTkgQEAgcm93X3VuZG9fbW9k
KAogCW5vZGUtPmluZGV4ID0gZGljdF90YWJsZV9nZXRfbmV4dF9pbmRleCgKIAkJZGljdF90YWJs
ZV9nZXRfZmlyc3RfaW5kZXgobm9kZS0+dGFibGUpKTsKIAotCWlmIChub2RlLT5yZWNfdHlwZSA9
PSBUUlhfVU5ET19VUERfRVhJU1RfUkVDKSB7Ci0KKwlzd2l0Y2ggKG5vZGUtPnJlY190eXBlKSB7
CisJY2FzZSBUUlhfVU5ET19VUERfRVhJU1RfUkVDOgogCQllcnIgPSByb3dfdW5kb19tb2RfdXBk
X2V4aXN0X3NlYyhub2RlLCB0aHIpOwotCi0JfSBlbHNlIGlmIChub2RlLT5yZWNfdHlwZSA9PSBU
UlhfVU5ET19ERUxfTUFSS19SRUMpIHsKLQorCQlicmVhazsKKwljYXNlIFRSWF9VTkRPX0RFTF9N
QVJLX1JFQzoKIAkJZXJyID0gcm93X3VuZG9fbW9kX2RlbF9tYXJrX3NlYyhub2RlLCB0aHIpOwot
CX0gZWxzZSB7Ci0JCXV0X2FkKG5vZGUtPnJlY190eXBlID09IFRSWF9VTkRPX1VQRF9ERUxfUkVD
KTsKKwkJYnJlYWs7CisJY2FzZSBUUlhfVU5ET19VUERfREVMX1JFQzoKIAkJZXJyID0gcm93X3Vu
ZG9fbW9kX3VwZF9kZWxfc2VjKG5vZGUsIHRocik7CisJCWJyZWFrOworCWRlZmF1bHQ6CisJCXV0
X2Vycm9yOworCQllcnIgPSBEQl9FUlJPUjsKIAl9CiAKIAlpZiAoZXJyID09IERCX1NVQ0NFU1Mp
IHsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdXBkLmMnCi0t
LSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1cGQuYwlyZXZpZDppbmFhbS5yYW5hQG9yYWNs
ZS5jb20tMjAxMTA0MjIyMDMxNTAtcHhkZjUzOXpxaGhmbWt0NgorKysgYi9zdG9yYWdlL2lubm9i
YXNlL3Jvdy9yb3cwdXBkLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MjYx
MTE0MjItMXNyN3NtNHpoa29rOWQxOQpAQCAtMjI4MCw1MiArMjI4MCw1MiBAQCByb3dfdXBkKAog
CQl9CiAJfQogCi0JaWYgKG5vZGUtPnN0YXRlID09IFVQRF9OT0RFX1VQREFURV9DTFVTVEVSRUQK
LQkgICAgfHwgbm9kZS0+c3RhdGUgPT0gVVBEX05PREVfSU5TRVJUX0NMVVNURVJFRAotCSAgICB8
fCBub2RlLT5zdGF0ZSA9PSBVUERfTk9ERV9JTlNFUlRfQkxPQikgewotCisJc3dpdGNoIChub2Rl
LT5zdGF0ZSkgeworCWNhc2UgVVBEX05PREVfVVBEQVRFX0NMVVNURVJFRDoKKwljYXNlIFVQRF9O
T0RFX0lOU0VSVF9DTFVTVEVSRUQ6CisJY2FzZSBVUERfTk9ERV9JTlNFUlRfQkxPQjoKIAkJbG9n
X2ZyZWVfY2hlY2soKTsKIAkJZXJyID0gcm93X3VwZF9jbHVzdF9zdGVwKG5vZGUsIHRocik7CiAK
IAkJaWYgKGVyciAhPSBEQl9TVUNDRVNTKSB7CiAKLQkJCWdvdG8gZnVuY3Rpb25fZXhpdDsKKwkJ
CXJldHVybihlcnIpOwogCQl9CiAJfQogCi0JaWYgKCFub2RlLT5pc19kZWxldGUgJiYgKG5vZGUt
PmNtcGxfaW5mbyAmIFVQRF9OT0RFX05PX09SRF9DSEFOR0UpKSB7CisJaWYgKG5vZGUtPmluZGV4
ID09IE5VTEwKKwkgICAgfHwgKCFub2RlLT5pc19kZWxldGUKKwkJJiYgKG5vZGUtPmNtcGxfaW5m
byAmIFVQRF9OT0RFX05PX09SRF9DSEFOR0UpKSkgewogCi0JCWdvdG8gZnVuY3Rpb25fZXhpdDsK
KwkJcmV0dXJuKERCX1NVQ0NFU1MpOwogCX0KIAotCXdoaWxlIChub2RlLT5pbmRleCAhPSBOVUxM
KSB7Ci0KKwlkbyB7CiAJCWxvZ19mcmVlX2NoZWNrKCk7CiAJCWVyciA9IHJvd191cGRfc2VjX3N0
ZXAobm9kZSwgdGhyKTsKIAogCQlpZiAoZXJyICE9IERCX1NVQ0NFU1MpIHsKIAotCQkJZ290byBm
dW5jdGlvbl9leGl0OworCQkJcmV0dXJuKGVycik7CiAJCX0KIAogCQlub2RlLT5pbmRleCA9IGRp
Y3RfdGFibGVfZ2V0X25leHRfaW5kZXgobm9kZS0+aW5kZXgpOwotCX0KKwl9IHdoaWxlIChub2Rl
LT5pbmRleCAhPSBOVUxMKTsKIAotZnVuY3Rpb25fZXhpdDoKLQlpZiAoZXJyID09IERCX1NVQ0NF
U1MpIHsKLQkJLyogRG8gc29tZSBjbGVhbnVwICovCi0KLQkJaWYgKG5vZGUtPnJvdyAhPSBOVUxM
KSB7Ci0JCQlub2RlLT5yb3cgPSBOVUxMOwotCQkJbm9kZS0+ZXh0ID0gTlVMTDsKLQkJCW5vZGUt
PnVwZF9yb3cgPSBOVUxMOwotCQkJbm9kZS0+dXBkX2V4dCA9IE5VTEw7Ci0JCQltZW1faGVhcF9l
bXB0eShub2RlLT5oZWFwKTsKLQkJfQorCXV0X2FkKGVyciA9PSBEQl9TVUNDRVNTKTsKKworCS8q
IERvIHNvbWUgY2xlYW51cCAqLwogCi0JCW5vZGUtPnN0YXRlID0gVVBEX05PREVfVVBEQVRFX0NM
VVNURVJFRDsKKwlpZiAobm9kZS0+cm93ICE9IE5VTEwpIHsKKwkJbm9kZS0+cm93ID0gTlVMTDsK
KwkJbm9kZS0+ZXh0ID0gTlVMTDsKKwkJbm9kZS0+dXBkX3JvdyA9IE5VTEw7CisJCW5vZGUtPnVw
ZF9leHQgPSBOVUxMOworCQltZW1faGVhcF9lbXB0eShub2RlLT5oZWFwKTsKIAl9CiAKKwlub2Rl
LT5zdGF0ZSA9IFVQRF9OT0RFX1VQREFURV9DTFVTVEVSRUQ7CisKIAlyZXR1cm4oZXJyKTsKIH0K
IAoK

--===============1687443840==
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.6-innodb/
# testament_sha1: c1ec1b6c00bc8b1d16e00fdd0dd7731dbd0278fc
# timestamp: 2011-04-26 14:14:30 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: inaam.rana@stripped\
#   pxdf539zqhhfmkt6
# 
# Begin bundle
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
6lzyiDAwu02nAlEyP8WfZ/xdyRThQkEiEPTM


--===============1687443840==--