From: marko.makela
Date: May 24 2011 11:11am
Subject: bzr commit into mysql-5.5 branch (marko.makela:3397) Bug#12584374
List-Archive: http://lists.mysql.com/commits/137971
X-Bug: 12584374
Message-Id: <201105241111.p4OBBcYS022736@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0835840222=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC01LjUvIGJh
c2VkIG9uIHJldmlkOmhvcnN0Lmh1bmdlckBzdW4uY29tLTIwMTEwNTI0MDkxNjM0LWM1dmdzd2xy
ZHlnaTcyMjQKCiAzMzk3IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDUtMjQKICAgICAgQnVnIzEyNTg0
Mzc0IExPQ0tfVkFMSURBVEUgVFJJUFMgQVNTRVJUSU9OICFCTE9DSy0+UEFHRS5GSUxFX1BBR0Vf
V0FTX0ZSRUVECiAgICAgIAogICAgICBsb2NrX2NsdXN0X3JlY19zb21lX2hhc19pbXBsKCksIHJv
d19nZXRfcmVjX3RyeF9pZCgpLAogICAgICBsb2NrX3JlY19xdWV1ZV92YWxpZGF0ZSgpLCBsb2Nr
X3RhYmxlX290aGVyX2hhc19pbmNvbXBhdGlibGUoKSwKICAgICAgbG9ja190YWJsZV9oYXNfdG9f
d2FpdF9pbl9xdWV1ZSgpLCBsb2NrX3RhYmxlX3F1ZXVlX3ZhbGlkYXRlKCk6CiAgICAgIEFkZCBj
b25zdCBxdWFsaWZpZXJzLgogICAgICAKICAgICAgcm93X2dldF90cnhfaWRfb2Zmc2V0KCk6IEFk
ZCBjb25zdCBxdWFsaWZpZXJzLiBLZWVwIHRoZSBwYXJhbWV0ZXIgcmVjCiAgICAgIG9ubHkgaW4g
VU5JVl9ERUJVRyBidWlsZHMuIElubGluZSB0aGUgZnVuY3Rpb24uCiAgICAgIAogICAgICBsb2Nr
X3JlY192YWxpZGF0ZV9wYWdlKCk6IFRha2UgdGhlIGJ1ZmZlciBibG9jayBhcyBhIHBhcmFtZXRl
ciwgdG8KICAgICAgYXZvaWQgYSBidWZfcGFnZV9nZXRfZ2VuKCkgY2FsbCBpbiBtb3N0IGNhc2Vz
LgogICAgICAKICAgICAgbG9ja19yZWNfdmFsaWRhdGVfcGFnZV9sb3coKTogQSB2ZXJzaW9uIG9m
IGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2UoKQogICAgICB0aGF0IGFzc3VtZXMgdGhhdCB0aGUgbG9j
ayBzeXN0ZW0gbXV0ZXhlcyBhcmUgYWxyZWFkeSBiZWluZyBoZWxkLgogICAgICAKICAgICAgbG9j
a19yZWNfZ2V0X25leHRfb25fcGFnZV9jb25zdCgpOiBBIGNvbnN0IHZhcmlhbnQgb2YKICAgICAg
bG9ja19yZWNfZ2V0X25leHRfb25fcGFnZSgpLgogICAgICAKICAgICAgbG9ja192YWxpZGF0ZSgp
OiBEbyBub3QgcmVsZWFzZSB0aGUgbG9jayBzeXN0ZW0gbXV0ZXggd2hpbGUKICAgICAgYnVmZmVy
LWZpeGluZyB0aGUgYmxvY2sgZm9yIHRoZSBsb2NrX3JlY192YWxpZGF0ZV9wYWdlKCkgY2FsbC4K
ICAgICAgUmVsZWFzaW5nIHRoZSBtdXRleCBhcHBhcmVudGx5IGNhdXNlZCB0aGUgYXNzZXJ0aW9u
IGZhaWx1cmUuCiAgICAgIAogICAgICByYjo2NjUgYXBwcm92ZWQgYnkgU3VubnkgQmFpbnMKCiAg
ICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2xvY2swbG9jay5oCiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9sb2NrMGxvY2suaWMKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS9pbmNsdWRlL3JvdzByb3cuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv
cm93MHJvdy5pYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvbG9jazBsb2NrLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5j
bHVkZS9sb2NrMGxvY2suaAlyZXZpZDpob3JzdC5odW5nZXJAc3VuLmNvbS0yMDExMDUyNDA5MTYz
NC1jNXZnc3dscmR5Z2k3MjI0CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9sb2NrMGxv
Y2suaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUyNDExMTEyMS1iazR0cDBh
M3owdzQ3ZXZ2CkBAIC03Miw5ICs3MiwxMCBAQCBVTklWX0lOTElORQogdHJ4X3QqCiBsb2NrX2Ns
dXN0X3JlY19zb21lX2hhc19pbXBsKAogLyo9PT09PT09PT09PT09PT09PT09PT09PT09Ki8KLQlj
b25zdCByZWNfdCoJcmVjLAkvKiE8IGluOiB1c2VyIHJlY29yZCAqLwotCWRpY3RfaW5kZXhfdCoJ
aW5kZXgsCS8qITwgaW46IGNsdXN0ZXJlZCBpbmRleCAqLwotCWNvbnN0IHVsaW50KglvZmZzZXRz
KTsvKiE8IGluOiByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRleCkgKi8KKwljb25zdCByZWNfdCoJ
CXJlYywJLyohPCBpbjogdXNlciByZWNvcmQgKi8KKwljb25zdCBkaWN0X2luZGV4X3QqCWluZGV4
LAkvKiE8IGluOiBjbHVzdGVyZWQgaW5kZXggKi8KKwljb25zdCB1bGludCoJCW9mZnNldHMpLyoh
PCBpbjogcmVjX2dldF9vZmZzZXRzKHJlYywgaW5kZXgpICovCisJX19hdHRyaWJ1dGVfXygobm9u
bnVsbCwgd2Fybl91bnVzZWRfcmVzdWx0KSk7CiAvKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogR2V0cyB0aGUg
aGVhcF9ubyBvZiB0aGUgc21hbGxlc3QgdXNlciByZWNvcmQgb24gYSBwYWdlLgogQHJldHVybglo
ZWFwX25vIG9mIHNtYWxsZXN0IHVzZXIgcmVjb3JkLCBvciBQQUdFX0hFQVBfTk9fU1VQUkVNVU0g
Ki8KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvbG9jazBsb2Nr
LmljJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvbG9jazBsb2NrLmljCXJldmlkOmhv
cnN0Lmh1bmdlckBzdW4uY29tLTIwMTEwNTI0MDkxNjM0LWM1dmdzd2xyZHlnaTcyMjQKKysrIGIv
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2xvY2swbG9jay5pYwlyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDExMDUyNDExMTEyMS1iazR0cDBhM3owdzQ3ZXZ2CkBAIC03NSw5ICs3NSw5
IEBAIFVOSVZfSU5MSU5FCiB0cnhfdCoKIGxvY2tfY2x1c3RfcmVjX3NvbWVfaGFzX2ltcGwoCiAv
Kj09PT09PT09PT09PT09PT09PT09PT09PT0qLwotCWNvbnN0IHJlY190KglyZWMsCS8qITwgaW46
IHVzZXIgcmVjb3JkICovCi0JZGljdF9pbmRleF90KglpbmRleCwJLyohPCBpbjogY2x1c3RlcmVk
IGluZGV4ICovCi0JY29uc3QgdWxpbnQqCW9mZnNldHMpLyohPCBpbjogcmVjX2dldF9vZmZzZXRz
KHJlYywgaW5kZXgpICovCisJY29uc3QgcmVjX3QqCQlyZWMsCS8qITwgaW46IHVzZXIgcmVjb3Jk
ICovCisJY29uc3QgZGljdF9pbmRleF90KglpbmRleCwJLyohPCBpbjogY2x1c3RlcmVkIGluZGV4
ICovCisJY29uc3QgdWxpbnQqCQlvZmZzZXRzKS8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMs
IGluZGV4KSAqLwogewogCXRyeF9pZF90CXRyeF9pZDsKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cwcm93LmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9yb3cwcm93LmgJcmV2aWQ6aG9yc3QuaHVuZ2VyQHN1bi5jb20tMjAxMTA1MjQwOTE2
MzQtYzV2Z3N3bHJkeWdpNzIyNAorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MHJv
dy5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTI0MTExMTIxLWJrNHRwMGEz
ejB3NDdldnYKQEAgLTQxLDEzICs0MSwyNCBAQCBDcmVhdGVkIDQvMjAvMTk5NiBIZWlra2kgVHV1
cmkKIEdldHMgdGhlIG9mZnNldCBvZiB0aGUgdHJ4IGlkIGZpZWxkLCBpbiBieXRlcyByZWxhdGl2
ZSB0byB0aGUgb3JpZ2luIG9mCiBhIGNsdXN0ZXJlZCBpbmRleCByZWNvcmQuCiBAcmV0dXJuCW9m
ZnNldCBvZiBEQVRBX1RSWF9JRCAqLwotVU5JVl9JTlRFUk4KK1VOSVZfSU5MSU5FCiB1bGludAot
cm93X2dldF90cnhfaWRfb2Zmc2V0KAotLyo9PT09PT09PT09PT09PT09PT0qLwotCWNvbnN0IHJl
Y190KglyZWMsCS8qITwgaW46IHJlY29yZCAqLwotCWRpY3RfaW5kZXhfdCoJaW5kZXgsCS8qITwg
aW46IGNsdXN0ZXJlZCBpbmRleCAqLwotCWNvbnN0IHVsaW50KglvZmZzZXRzKTsvKiE8IGluOiBy
ZWNfZ2V0X29mZnNldHMocmVjLCBpbmRleCkgKi8KK3Jvd19nZXRfdHJ4X2lkX29mZnNldF9mdW5j
KAorLyo9PT09PT09PT09PT09PT09PT09PT09PSovCisjaWZkZWYgVU5JVl9ERUJVRworCWNvbnN0
IHJlY190KgkJcmVjLAkvKiE8IGluOiByZWNvcmQgKi8KKyNlbmRpZiAvKiBVTklWX0RFQlVHICov
CisJY29uc3QgZGljdF9pbmRleF90KglpbmRleCwJLyohPCBpbjogY2x1c3RlcmVkIGluZGV4ICov
CisJY29uc3QgdWxpbnQqCQlvZmZzZXRzKS8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGlu
ZGV4KSAqLworCV9fYXR0cmlidXRlX18oKG5vbm51bGwsIHdhcm5fdW51c2VkX3Jlc3VsdCkpOwor
I2lmZGVmIFVOSVZfREVCVUcKKyMgZGVmaW5lIHJvd19nZXRfdHJ4X2lkX29mZnNldChyZWMsIGlu
ZGV4LCBvZmZzZXRzKQlcCisJcm93X2dldF90cnhfaWRfb2Zmc2V0X2Z1bmMocmVjLCBpbmRleCwg
b2Zmc2V0cykKKyNlbHNlIC8qIFVOSVZfREVCVUcgKi8KKyMgZGVmaW5lIHJvd19nZXRfdHJ4X2lk
X29mZnNldChyZWMsIGluZGV4LCBvZmZzZXRzKQlcCisJcm93X2dldF90cnhfaWRfb2Zmc2V0X2Z1
bmMoaW5kZXgsIG9mZnNldHMpCisjZW5kaWYgLyogVU5JVl9ERUJVRyAqLworCiAvKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqLy8qKgogUmVhZHMgdGhlIHRyeCBpZCBmaWVsZCBmcm9tIGEgY2x1c3RlcmVkIGluZGV4IHJl
Y29yZC4KIEByZXR1cm4JdmFsdWUgb2YgdGhlIGZpZWxkICovCkBAIC01NSw5ICs2NiwxMCBAQCBV
TklWX0lOTElORQogdHJ4X2lkX3QKIHJvd19nZXRfcmVjX3RyeF9pZCgKIC8qPT09PT09PT09PT09
PT09Ki8KLQljb25zdCByZWNfdCoJcmVjLAkvKiE8IGluOiByZWNvcmQgKi8KLQlkaWN0X2luZGV4
X3QqCWluZGV4LAkvKiE8IGluOiBjbHVzdGVyZWQgaW5kZXggKi8KLQljb25zdCB1bGludCoJb2Zm
c2V0cyk7LyohPCBpbjogcmVjX2dldF9vZmZzZXRzKHJlYywgaW5kZXgpICovCisJY29uc3QgcmVj
X3QqCQlyZWMsCS8qITwgaW46IHJlY29yZCAqLworCWNvbnN0IGRpY3RfaW5kZXhfdCoJaW5kZXgs
CS8qITwgaW46IGNsdXN0ZXJlZCBpbmRleCAqLworCWNvbnN0IHVsaW50KgkJb2Zmc2V0cykvKiE8
IGluOiByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRleCkgKi8KKwlfX2F0dHJpYnV0ZV9fKChub25u
dWxsLCB3YXJuX3VudXNlZF9yZXN1bHQpKTsKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBSZWFkcyB0aGUg
cm9sbCBwb2ludGVyIGZpZWxkIGZyb20gYSBjbHVzdGVyZWQgaW5kZXggcmVjb3JkLgogQHJldHVy
bgl2YWx1ZSBvZiB0aGUgZmllbGQgKi8KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvcm93MHJvdy5pYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3Jv
dzByb3cuaWMJcmV2aWQ6aG9yc3QuaHVuZ2VyQHN1bi5jb20tMjAxMTA1MjQwOTE2MzQtYzV2Z3N3
bHJkeWdpNzIyNAorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MHJvdy5pYwlyZXZp
ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUyNDExMTEyMS1iazR0cDBhM3owdzQ3ZXZ2
CkBAIC0yOCwxNSArMjgsNDUgQEAgQ3JlYXRlZCA0LzIwLzE5OTYgSGVpa2tpIFR1dXJpCiAjaW5j
bHVkZSAidHJ4MHVuZG8uaCIKIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKK0dldHMgdGhlIG9mZnNldCBv
ZiB0cnggaWQgZmllbGQsIGluIGJ5dGVzIHJlbGF0aXZlIHRvIHRoZSBvcmlnaW4gb2YKK2EgY2x1
c3RlcmVkIGluZGV4IHJlY29yZC4KK0ByZXR1cm4Jb2Zmc2V0IG9mIERBVEFfVFJYX0lEICovCitV
TklWX0lOTElORQordWxpbnQKK3Jvd19nZXRfdHJ4X2lkX29mZnNldF9mdW5jKAorLyo9PT09PT09
PT09PT09PT09PT09PT09PSovCisjaWZkZWYgVU5JVl9ERUJVRworCWNvbnN0IHJlY190KgkJcmVj
LAkvKiE8IGluOiByZWNvcmQgKi8KKyNlbmRpZiAvKiBVTklWX0RFQlVHICovCisJY29uc3QgZGlj
dF9pbmRleF90KglpbmRleCwJLyohPCBpbjogY2x1c3RlcmVkIGluZGV4ICovCisJY29uc3QgdWxp
bnQqCQlvZmZzZXRzKS8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4KSAqLworewor
CXVsaW50CXBvczsKKwl1bGludAlvZmZzZXQ7CisJdWxpbnQJbGVuOworCisJdXRfYWQoZGljdF9p
bmRleF9pc19jbHVzdChpbmRleCkpOworCXV0X2FkKHJlY19vZmZzX3ZhbGlkYXRlKHJlYywgaW5k
ZXgsIG9mZnNldHMpKTsKKworCXBvcyA9IGRpY3RfaW5kZXhfZ2V0X3N5c19jb2xfcG9zKGluZGV4
LCBEQVRBX1RSWF9JRCk7CisKKwlvZmZzZXQgPSByZWNfZ2V0X250aF9maWVsZF9vZmZzKG9mZnNl
dHMsIHBvcywgJmxlbik7CisKKwl1dF9hZChsZW4gPT0gREFUQV9UUlhfSURfTEVOKTsKKworCXJl
dHVybihvZmZzZXQpOworfQorCisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogUmVhZHMgdGhlIHRyeCBpZCBm
aWVsZCBmcm9tIGEgY2x1c3RlcmVkIGluZGV4IHJlY29yZC4KIEByZXR1cm4JdmFsdWUgb2YgdGhl
IGZpZWxkICovCiBVTklWX0lOTElORQogdHJ4X2lkX3QKIHJvd19nZXRfcmVjX3RyeF9pZCgKIC8q
PT09PT09PT09PT09PT09Ki8KLQljb25zdCByZWNfdCoJcmVjLAkvKiE8IGluOiByZWNvcmQgKi8K
LQlkaWN0X2luZGV4X3QqCWluZGV4LAkvKiE8IGluOiBjbHVzdGVyZWQgaW5kZXggKi8KLQljb25z
dCB1bGludCoJb2Zmc2V0cykvKiE8IGluOiByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRleCkgKi8K
Kwljb25zdCByZWNfdCoJCXJlYywJLyohPCBpbjogcmVjb3JkICovCisJY29uc3QgZGljdF9pbmRl
eF90KglpbmRleCwJLyohPCBpbjogY2x1c3RlcmVkIGluZGV4ICovCisJY29uc3QgdWxpbnQqCQlv
ZmZzZXRzKS8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4KSAqLwogewogCXVsaW50
CW9mZnNldDsKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvbG9jay9sb2Nr
MGxvY2suYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5jCXJldmlkOmhv
cnN0Lmh1bmdlckBzdW4uY29tLTIwMTEwNTI0MDkxNjM0LWM1dmdzd2xyZHlnaTcyMjQKKysrIGIv
c3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTEwNTI0MTExMTIxLWJrNHRwMGEzejB3NDdldnYKQEAgLTM1Miw2ICszNTIsNyBA
QCBpYm9vbAogbG9ja192YWxpZGF0ZSh2b2lkKTsKIC8qPT09PT09PT09PT09PT09Ki8KIAorIyBp
ZmRlZiBVTklWX0RFQlVHX0xPQ0tfVkFMSURBVEUKIC8qKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBWYWxpZGF0
ZXMgdGhlIHJlY29yZCBsb2NrIHF1ZXVlcyBvbiBhIHBhZ2UuCiBAcmV0dXJuCVRSVUUgaWYgb2sg
Ki8KQEAgLTM1OSwxMCArMzYwLDkgQEAgc3RhdGljCiBpYm9vbAogbG9ja19yZWNfdmFsaWRhdGVf
cGFnZSgKIC8qPT09PT09PT09PT09PT09PT09PSovCi0JdWxpbnQJc3BhY2UsCS8qITwgaW46IHNw
YWNlIGlkICovCi0JdWxpbnQJemlwX3NpemUsLyohPCBpbjogY29tcHJlc3NlZCBwYWdlIHNpemUg
aW4gYnl0ZXMKLQkJCW9yIDAgZm9yIHVuY29tcHJlc3NlZCBwYWdlcyAqLwotCXVsaW50CXBhZ2Vf
bm8pOy8qITwgaW46IHBhZ2UgbnVtYmVyICovCisJY29uc3QgYnVmX2Jsb2NrX3QqCWJsb2NrKQkv
KiE8IGluOiBidWZmZXIgYmxvY2sgKi8KKwlfX2F0dHJpYnV0ZV9fKChub25udWxsLCB3YXJuX3Vu
dXNlZF9yZXN1bHQpKTsKKyMgZW5kaWYgLyogVU5JVl9ERUJVR19MT0NLX1ZBTElEQVRFICovCiAj
ZW5kaWYgLyogVU5JVl9ERUJVRyAqLwogCiAvKiBUaGUgbG9jayBzeXN0ZW0gKi8KQEAgLTExMDAs
MTAgKzExMDAsMTAgQEAgbG9ja19yZWNfcmVzZXRfbnRoX2JpdCgKIEdldHMgdGhlIGZpcnN0IG9y
IG5leHQgcmVjb3JkIGxvY2sgb24gYSBwYWdlLgogQHJldHVybgluZXh0IGxvY2ssIE5VTEwgaWYg
bm9uZSBleGlzdHMgKi8KIFVOSVZfSU5MSU5FCi1sb2NrX3QqCi1sb2NrX3JlY19nZXRfbmV4dF9v
bl9wYWdlKAotLyo9PT09PT09PT09PT09PT09PT09PT09Ki8KLQlsb2NrX3QqCWxvY2spCS8qITwg
aW46IGEgcmVjb3JkIGxvY2sgKi8KK2NvbnN0IGxvY2tfdCoKK2xvY2tfcmVjX2dldF9uZXh0X29u
X3BhZ2VfY29uc3QoCisvKj09PT09PT09PT09PT09PT09PT09PT09PT09PT0qLworCWNvbnN0IGxv
Y2tfdCoJbG9jaykJLyohPCBpbjogYSByZWNvcmQgbG9jayAqLwogewogCXVsaW50CXNwYWNlOwog
CXVsaW50CXBhZ2Vfbm87CkBAIC0xMTMzLDYgKzExMzMsMTggQEAgbG9ja19yZWNfZ2V0X25leHRf
b25fcGFnZSgKIH0KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKK0dldHMgdGhlIGZpcnN0IG9yIG5leHQg
cmVjb3JkIGxvY2sgb24gYSBwYWdlLgorQHJldHVybgluZXh0IGxvY2ssIE5VTEwgaWYgbm9uZSBl
eGlzdHMgKi8KK1VOSVZfSU5MSU5FCitsb2NrX3QqCitsb2NrX3JlY19nZXRfbmV4dF9vbl9wYWdl
KAorLyo9PT09PT09PT09PT09PT09PT09PT09Ki8KKwlsb2NrX3QqCWxvY2spCS8qITwgaW46IGEg
cmVjb3JkIGxvY2sgKi8KK3sKKwlyZXR1cm4oKGxvY2tfdCopIGxvY2tfcmVjX2dldF9uZXh0X29u
X3BhZ2VfY29uc3QobG9jaykpOworfQorCisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogR2V0cyB0aGUgZmly
c3QgcmVjb3JkIGxvY2sgb24gYSBwYWdlLCB3aGVyZSB0aGUgcGFnZSBpcyBpZGVudGlmaWVkIGJ5
IGl0cwogZmlsZSBhZGRyZXNzLgogQHJldHVybglmaXJzdCBsb2NrLCBOVUxMIGlmIG5vbmUgZXhp
c3RzICovCkBAIC0yNjQ1LDkgKzI2NTcsNyBAQCBsb2NrX21vdmVfcmVvcmdhbml6ZV9wYWdlKAog
CW1lbV9oZWFwX2ZyZWUoaGVhcCk7CiAKICNpZmRlZiBVTklWX0RFQlVHX0xPQ0tfVkFMSURBVEUK
LQl1dF9hZChsb2NrX3JlY192YWxpZGF0ZV9wYWdlKGJ1Zl9ibG9ja19nZXRfc3BhY2UoYmxvY2sp
LAotCQkJCSAgICAgYnVmX2Jsb2NrX2dldF96aXBfc2l6ZShibG9jayksCi0JCQkJICAgICBidWZf
YmxvY2tfZ2V0X3BhZ2Vfbm8oYmxvY2spKSk7CisJdXRfYWQobG9ja19yZWNfdmFsaWRhdGVfcGFn
ZShibG9jaykpOwogI2VuZGlmCiB9CiAKQEAgLTI3MzUsMTIgKzI3NDUsOCBAQCBsb2NrX21vdmVf
cmVjX2xpc3RfZW5kKAogCWxvY2tfbXV0ZXhfZXhpdF9rZXJuZWwoKTsKIAogI2lmZGVmIFVOSVZf
REVCVUdfTE9DS19WQUxJREFURQotCXV0X2FkKGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2UoYnVmX2Js
b2NrX2dldF9zcGFjZShibG9jayksCi0JCQkJICAgICBidWZfYmxvY2tfZ2V0X3ppcF9zaXplKGJs
b2NrKSwKLQkJCQkgICAgIGJ1Zl9ibG9ja19nZXRfcGFnZV9ubyhibG9jaykpKTsKLQl1dF9hZChs
b2NrX3JlY192YWxpZGF0ZV9wYWdlKGJ1Zl9ibG9ja19nZXRfc3BhY2UobmV3X2Jsb2NrKSwKLQkJ
CQkgICAgIGJ1Zl9ibG9ja19nZXRfemlwX3NpemUoYmxvY2spLAotCQkJCSAgICAgYnVmX2Jsb2Nr
X2dldF9wYWdlX25vKG5ld19ibG9jaykpKTsKKwl1dF9hZChsb2NrX3JlY192YWxpZGF0ZV9wYWdl
KGJsb2NrKSk7CisJdXRfYWQobG9ja19yZWNfdmFsaWRhdGVfcGFnZShuZXdfYmxvY2spKTsKICNl
bmRpZgogfQogCkBAIC0yODQ4LDkgKzI4NTQsNyBAQCBsb2NrX21vdmVfcmVjX2xpc3Rfc3RhcnQo
CiAJbG9ja19tdXRleF9leGl0X2tlcm5lbCgpOwogCiAjaWZkZWYgVU5JVl9ERUJVR19MT0NLX1ZB
TElEQVRFCi0JdXRfYWQobG9ja19yZWNfdmFsaWRhdGVfcGFnZShidWZfYmxvY2tfZ2V0X3NwYWNl
KGJsb2NrKSwKLQkJCQkgICAgIGJ1Zl9ibG9ja19nZXRfemlwX3NpemUoYmxvY2spLAotCQkJCSAg
ICAgYnVmX2Jsb2NrX2dldF9wYWdlX25vKGJsb2NrKSkpOworCXV0X2FkKGxvY2tfcmVjX3ZhbGlk
YXRlX3BhZ2UoYmxvY2spKTsKICNlbmRpZgogfQogCkBAIC0zODMzLDE3ICszODM3LDE4IEBAIENo
ZWNrcyBpZiBvdGhlciB0cmFuc2FjdGlvbnMgaGF2ZSBhbiBpbmMKIHRoZSBsb2NrIHF1ZXVlLgog
QHJldHVybglsb2NrIG9yIE5VTEwgKi8KIFVOSVZfSU5MSU5FCi1sb2NrX3QqCitjb25zdCBsb2Nr
X3QqCiBsb2NrX3RhYmxlX290aGVyX2hhc19pbmNvbXBhdGlibGUoCiAvKj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PSovCi0JdHJ4X3QqCQl0cngsCS8qITwgaW46IHRyYW5zYWN0aW9uLCBv
ciBOVUxMIGlmIGFsbAotCQkJCXRyYW5zYWN0aW9ucyBzaG91bGQgYmUgaW5jbHVkZWQgKi8KLQl1
bGludAkJd2FpdCwJLyohPCBpbjogTE9DS19XQUlUIGlmIGFsc28gd2FpdGluZyBsb2NrcyBhcmUK
LQkJCQl0YWtlbiBpbnRvIGFjY291bnQsIG9yIDAgaWYgbm90ICovCi0JZGljdF90YWJsZV90Kgl0
YWJsZSwJLyohPCBpbjogdGFibGUgKi8KLQllbnVtIGxvY2tfbW9kZQltb2RlKQkvKiE8IGluOiBs
b2NrIG1vZGUgKi8KKwljb25zdCB0cnhfdCoJCXRyeCwJLyohPCBpbjogdHJhbnNhY3Rpb24sIG9y
IE5VTEwgaWYgYWxsCisJCQkJCXRyYW5zYWN0aW9ucyBzaG91bGQgYmUgaW5jbHVkZWQgKi8KKwl1
bGludAkJCXdhaXQsCS8qITwgaW46IExPQ0tfV0FJVCBpZiBhbHNvCisJCQkJCXdhaXRpbmcgbG9j
a3MgYXJlIHRha2VuIGludG8KKwkJCQkJYWNjb3VudCwgb3IgMCBpZiBub3QgKi8KKwljb25zdCBk
aWN0X3RhYmxlX3QqCXRhYmxlLAkvKiE8IGluOiB0YWJsZSAqLworCWVudW0gbG9ja19tb2RlCQlt
b2RlKQkvKiE8IGluOiBsb2NrIG1vZGUgKi8KIHsKLQlsb2NrX3QqCWxvY2s7CisJY29uc3QgbG9j
a190Kglsb2NrOwogCiAJdXRfYWQobXV0ZXhfb3duKCZrZXJuZWxfbXV0ZXgpKTsKIApAQCAtMzkz
NCwxMCArMzkzOSwxMCBAQCBzdGF0aWMKIGlib29sCiBsb2NrX3RhYmxlX2hhc190b193YWl0X2lu
X3F1ZXVlKAogLyo9PT09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KLQlsb2NrX3QqCXdhaXRf
bG9jaykJLyohPCBpbjogd2FpdGluZyB0YWJsZSBsb2NrICovCisJY29uc3QgbG9ja190Kgl3YWl0
X2xvY2spCS8qITwgaW46IHdhaXRpbmcgdGFibGUgbG9jayAqLwogewotCWRpY3RfdGFibGVfdCoJ
dGFibGU7Ci0JbG9ja190KgkJbG9jazsKKwljb25zdCBkaWN0X3RhYmxlX3QqCXRhYmxlOworCWNv
bnN0IGxvY2tfdCoJCWxvY2s7CiAKIAl1dF9hZChtdXRleF9vd24oJmtlcm5lbF9tdXRleCkpOwog
CXV0X2FkKGxvY2tfZ2V0X3dhaXQod2FpdF9sb2NrKSk7CkBAIC00Njc3LDkgKzQ2ODIsOSBAQCBz
dGF0aWMKIGlib29sCiBsb2NrX3RhYmxlX3F1ZXVlX3ZhbGlkYXRlKAogLyo9PT09PT09PT09PT09
PT09PT09PT09Ki8KLQlkaWN0X3RhYmxlX3QqCXRhYmxlKQkvKiE8IGluOiB0YWJsZSAqLworCWNv
bnN0IGRpY3RfdGFibGVfdCoJdGFibGUpCS8qITwgaW46IHRhYmxlICovCiB7Ci0JbG9ja190Kgls
b2NrOworCWNvbnN0IGxvY2tfdCoJbG9jazsKIAogCXV0X2FkKG11dGV4X293bigma2VybmVsX211
dGV4KSk7CiAKQEAgLTQ3MTUsNyArNDcyMCw3IEBAIGxvY2tfcmVjX3F1ZXVlX3ZhbGlkYXRlKAog
Lyo9PT09PT09PT09PT09PT09PT09PSovCiAJY29uc3QgYnVmX2Jsb2NrX3QqCWJsb2NrLAkvKiE8
IGluOiBidWZmZXIgYmxvY2sgY29udGFpbmluZyByZWMgKi8KIAljb25zdCByZWNfdCoJCXJlYywJ
LyohPCBpbjogcmVjb3JkIHRvIGxvb2sgYXQgKi8KLQlkaWN0X2luZGV4X3QqCQlpbmRleCwJLyoh
PCBpbjogaW5kZXgsIG9yIE5VTEwgaWYgbm90IGtub3duICovCisJY29uc3QgZGljdF9pbmRleF90
KglpbmRleCwJLyohPCBpbjogaW5kZXgsIG9yIE5VTEwgaWYgbm90IGtub3duICovCiAJY29uc3Qg
dWxpbnQqCQlvZmZzZXRzKS8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4KSAqLwog
ewogCXRyeF90KglpbXBsX3RyeDsKQEAgLTQ4NjAsNDIgKzQ4NjUsMjggQEAgbG9ja19yZWNfcXVl
dWVfdmFsaWRhdGUoCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogVmFsaWRhdGVzIHRoZSByZWNvcmQgbG9j
ayBxdWV1ZXMgb24gYSBwYWdlLgogQHJldHVybglUUlVFIGlmIG9rICovCi1zdGF0aWMKK3N0YXRp
YyBfX2F0dHJpYnV0ZV9fKChub25udWxsLCB3YXJuX3VudXNlZF9yZXN1bHQpKQogaWJvb2wKLWxv
Y2tfcmVjX3ZhbGlkYXRlX3BhZ2UoCi0vKj09PT09PT09PT09PT09PT09PT0qLwotCXVsaW50CXNw
YWNlLAkvKiE8IGluOiBzcGFjZSBpZCAqLwotCXVsaW50CXppcF9zaXplLC8qITwgaW46IGNvbXBy
ZXNzZWQgcGFnZSBzaXplIGluIGJ5dGVzCi0JCQlvciAwIGZvciB1bmNvbXByZXNzZWQgcGFnZXMg
Ki8KLQl1bGludAlwYWdlX25vKS8qITwgaW46IHBhZ2UgbnVtYmVyICovCitsb2NrX3JlY192YWxp
ZGF0ZV9wYWdlX2xvdygKKy8qPT09PT09PT09PT09PT09PT09PT09PT0qLworCWNvbnN0IGJ1Zl9i
bG9ja190KglibG9jaykJLyohPCBpbjogYnVmZmVyIGJsb2NrICovCiB7Ci0JZGljdF9pbmRleF90
KglpbmRleDsKLQlidWZfYmxvY2tfdCoJYmxvY2s7Ci0JY29uc3QgcGFnZV90KglwYWdlOwotCWxv
Y2tfdCoJCWxvY2s7CisJY29uc3QgbG9ja190Kglsb2NrOwogCWNvbnN0IHJlY190KglyZWM7CiAJ
dWxpbnQJCW50aF9sb2NrCT0gMDsKIAl1bGludAkJbnRoX2JpdAkJPSAwOwogCXVsaW50CQlpOwot
CW10cl90CQltdHI7CiAJbWVtX2hlYXBfdCoJaGVhcAkJPSBOVUxMOwogCXVsaW50CQlvZmZzZXRz
X1tSRUNfT0ZGU19OT1JNQUxfU0laRV07CiAJdWxpbnQqCQlvZmZzZXRzCQk9IG9mZnNldHNfOwog
CXJlY19vZmZzX2luaXQob2Zmc2V0c18pOwogCi0JdXRfYWQoIW11dGV4X293bigma2VybmVsX211
dGV4KSk7Ci0KLQltdHJfc3RhcnQoJm10cik7Ci0KLQl1dF9hZCh6aXBfc2l6ZSAhPSBVTElOVF9V
TkRFRklORUQpOwotCWJsb2NrID0gYnVmX3BhZ2VfZ2V0KHNwYWNlLCB6aXBfc2l6ZSwgcGFnZV9u
bywgUldfWF9MQVRDSCwgJm10cik7Ci0JYnVmX2Jsb2NrX2RiZ19hZGRfbGV2ZWwoYmxvY2ssIFNZ
TkNfTk9fT1JERVJfQ0hFQ0spOwotCi0JcGFnZSA9IGJsb2NrLT5mcmFtZTsKKwl1dF9hZChtdXRl
eF9vd24oJmtlcm5lbF9tdXRleCkpOworCXV0X2FkKGJ1Zl9ibG9ja19nZXRfc3RhdGUoYmxvY2sp
ID09IEJVRl9CTE9DS19GSUxFX1BBR0UpOwogCi0JbG9ja19tdXRleF9lbnRlcl9rZXJuZWwoKTsK
IGxvb3A6Ci0JbG9jayA9IGxvY2tfcmVjX2dldF9maXJzdF9vbl9wYWdlX2FkZHIoc3BhY2UsIHBh
Z2Vfbm8pOworCWxvY2sgPSBsb2NrX3JlY19nZXRfZmlyc3Rfb25fcGFnZV9hZGRyKGJ1Zl9ibG9j
a19nZXRfc3BhY2UoYmxvY2spLAorCQkJCQkgICAgICAgYnVmX2Jsb2NrX2dldF9wYWdlX25vKGJs
b2NrKSk7CiAKIAlpZiAoIWxvY2spIHsKIAkJZ290byBmdW5jdGlvbl9leGl0OwpAQCAtNDkwMyw3
ICs0ODk0LDcgQEAgbG9vcDoKIAogCWZvciAoaSA9IDA7IGkgPCBudGhfbG9jazsgaSsrKSB7CiAK
LQkJbG9jayA9IGxvY2tfcmVjX2dldF9uZXh0X29uX3BhZ2UobG9jayk7CisJCWxvY2sgPSBsb2Nr
X3JlY19nZXRfbmV4dF9vbl9wYWdlX2NvbnN0KGxvY2spOwogCiAJCWlmICghbG9jaykgewogCQkJ
Z290byBmdW5jdGlvbl9leGl0OwpAQCAtNDkyNiwxNSArNDkxNywxNCBAQCBsb29wOgogCiAJCWlm
IChpID09IDEgfHwgbG9ja19yZWNfZ2V0X250aF9iaXQobG9jaywgaSkpIHsKIAotCQkJaW5kZXgg
PSBsb2NrLT5pbmRleDsKLQkJCXJlYyA9IHBhZ2VfZmluZF9yZWNfd2l0aF9oZWFwX25vKHBhZ2Us
IGkpOworCQkJcmVjID0gcGFnZV9maW5kX3JlY193aXRoX2hlYXBfbm8oYmxvY2stPmZyYW1lLCBp
KTsKIAkJCXV0X2EocmVjKTsKLQkJCW9mZnNldHMgPSByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRl
eCwgb2Zmc2V0cywKKwkJCW9mZnNldHMgPSByZWNfZ2V0X29mZnNldHMocmVjLCBsb2NrLT5pbmRl
eCwgb2Zmc2V0cywKIAkJCQkJCSAgVUxJTlRfVU5ERUZJTkVELCAmaGVhcCk7CiAjaWYgMAogCQkJ
ZnByaW50ZihzdGRlcnIsCi0JCQkJIlZhbGlkYXRpbmcgJWx1ICVsdVxuIiwKLQkJCQkodWxvbmcp
IHNwYWNlLCAodWxvbmcpIHBhZ2Vfbm8pOworCQkJCSJWYWxpZGF0aW5nICV1ICV1XG4iLAorCQkJ
CWJsb2NrLT5wYWdlLnNwYWNlLCBibG9jay0+cGFnZS5vZmZzZXQpOwogI2VuZGlmCiAJCQlsb2Nr
X211dGV4X2V4aXRfa2VybmVsKCk7CiAKQEAgLTQ5NDMsNyArNDkzMyw4IEBAIGxvb3A6CiAJCQlj
aGVjayBXSUxMIGJyZWFrIHRoZSBsYXRjaGluZyBvcmRlciBhbmQgbWF5CiAJCQljYXVzZSBhIGRl
YWRsb2NrIG9mIHRocmVhZHMuICovCiAKLQkJCWxvY2tfcmVjX3F1ZXVlX3ZhbGlkYXRlKGJsb2Nr
LCByZWMsIGluZGV4LCBvZmZzZXRzKTsKKwkJCWxvY2tfcmVjX3F1ZXVlX3ZhbGlkYXRlKGJsb2Nr
LCByZWMsIGxvY2stPmluZGV4LAorCQkJCQkJb2Zmc2V0cyk7CiAKIAkJCWxvY2tfbXV0ZXhfZW50
ZXJfa2VybmVsKCk7CiAKQEAgLTQ5NTksMTYgKzQ5NTAsMzIgQEAgbG9vcDoKIAlnb3RvIGxvb3A7
CiAKIGZ1bmN0aW9uX2V4aXQ6Ci0JbG9ja19tdXRleF9leGl0X2tlcm5lbCgpOwotCi0JbXRyX2Nv
bW1pdCgmbXRyKTsKLQogCWlmIChVTklWX0xJS0VMWV9OVUxMKGhlYXApKSB7CiAJCW1lbV9oZWFw
X2ZyZWUoaGVhcCk7CiAJfQogCXJldHVybihUUlVFKTsKIH0KIAorI2lmZGVmIFVOSVZfREVCVUdf
TE9DS19WQUxJREFURQorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKK1ZhbGlkYXRlcyB0aGUgcmVjb3JkIGxv
Y2sgcXVldWVzIG9uIGEgcGFnZS4KK0ByZXR1cm4JVFJVRSBpZiBvayAqLworc3RhdGljCitpYm9v
bAorbG9ja19yZWNfdmFsaWRhdGVfcGFnZSgKKy8qPT09PT09PT09PT09PT09PT09PSovCisJY29u
c3QgYnVmX2Jsb2NrX3QqCWJsb2NrKQkvKiE8IGluOiBidWZmZXIgYmxvY2sgKi8KK3sKKwlpYm9v
bAl2YWxpZDsKKworCWxvY2tfbXV0ZXhfZW50ZXJfa2VybmVsKCk7CisJdmFsaWQgPSBsb2NrX3Jl
Y192YWxpZGF0ZV9wYWdlX2xvdyhibG9jayk7CisJbG9ja19tdXRleF9leGl0X2tlcm5lbCgpOwor
CisJcmV0dXJuKHZhbGlkKTsKK30KKyNlbmRpZiAvKiBVTklWX0RFQlVHX0xPQ0tfVkFMSURBVEUg
Ki8KKwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKi8vKioKIFZhbGlkYXRlcyB0aGUgbG9jayBzeXN0ZW0uCiBAcmV0
dXJuCVRSVUUgaWYgb2sgKi8KQEAgLTQ5NzcsMTEgKzQ5ODQsOCBAQCBpYm9vbAogbG9ja192YWxp
ZGF0ZSh2b2lkKQogLyo9PT09PT09PT09PT09PT0qLwogewotCWxvY2tfdCoJCWxvY2s7Ci0JdHJ4
X3QqCQl0cng7Ci0JaWJfdWludDY0X3QJbGltaXQ7Ci0JdWxpbnQJCXNwYWNlOwotCXVsaW50CQlw
YWdlX25vOworCWNvbnN0IGxvY2tfdCoJbG9jazsKKwljb25zdCB0cnhfdCoJdHJ4OwogCXVsaW50
CQlpOwogCiAJbG9ja19tdXRleF9lbnRlcl9rZXJuZWwoKTsKQEAgLTUwMDYsOSArNTAxMCwxNCBA
QCBsb2NrX3ZhbGlkYXRlKHZvaWQpCiAKIAlmb3IgKGkgPSAwOyBpIDwgaGFzaF9nZXRfbl9jZWxs
cyhsb2NrX3N5cy0+cmVjX2hhc2gpOyBpKyspIHsKIAotCQlsaW1pdCA9IDA7CisJCXVsaW50CQlz
cGFjZTsKKwkJdWxpbnQJCXBhZ2Vfbm87CisJCWliX3VpbnQ2NF90CWxpbWl0CT0gMDsKIAogCQlm
b3IgKDs7KSB7CisJCQltdHJfdAkJbXRyOworCQkJYnVmX2Jsb2NrX3QqCWJsb2NrOworCiAJCQls
b2NrID0gSEFTSF9HRVRfRklSU1QobG9ja19zeXMtPnJlY19oYXNoLCBpKTsKIAogCQkJd2hpbGUg
KGxvY2spIHsKQEAgLTUwMzIsMTUgKzUwNDEsMTYgQEAgbG9ja192YWxpZGF0ZSh2b2lkKQogCQkJ
CWJyZWFrOwogCQkJfQogCi0JCQlsb2NrX211dGV4X2V4aXRfa2VybmVsKCk7Ci0KLQkJCWxvY2tf
cmVjX3ZhbGlkYXRlX3BhZ2Uoc3BhY2UsCi0JCQkJCSAgICAgICBmaWxfc3BhY2VfZ2V0X3ppcF9z
aXplKHNwYWNlKSwKLQkJCQkJICAgICAgIHBhZ2Vfbm8pOworCQkJbXRyX3N0YXJ0KCZtdHIpOwor
CQkJYmxvY2sgPSBidWZfcGFnZV9nZXQoCisJCQkJc3BhY2UsIGZpbF9zcGFjZV9nZXRfemlwX3Np
emUoc3BhY2UpLAorCQkJCXBhZ2Vfbm8sIFJXX1hfTEFUQ0gsICZtdHIpOworCQkJYnVmX2Jsb2Nr
X2RiZ19hZGRfbGV2ZWwoYmxvY2ssIFNZTkNfTk9fT1JERVJfQ0hFQ0spOwogCi0JCQlsb2NrX211
dGV4X2VudGVyX2tlcm5lbCgpOworCQkJdXRfYWQobG9ja19yZWNfdmFsaWRhdGVfcGFnZV9sb3co
YmxvY2spKTsKKwkJCW10cl9jb21taXQoJm10cik7CiAKLQkJCWxpbWl0ID0gdXRfdWxsX2NyZWF0
ZShzcGFjZSwgcGFnZV9ubyArIDEpOworCQkJbGltaXQrKzsKIAkJfQogCX0KIAoKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cuYycKLS0tIGEvc3RvcmFnZS9p
bm5vYmFzZS9yb3cvcm93MHJvdy5jCXJldmlkOmhvcnN0Lmh1bmdlckBzdW4uY29tLTIwMTEwNTI0
MDkxNjM0LWM1dmdzd2xyZHlnaTcyMjQKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJv
dy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTI0MTExMTIxLWJrNHRwMGEz
ejB3NDdldnYKQEAgLTQ3LDM1ICs0Nyw2IEBAIENyZWF0ZWQgNC8yMC8xOTk2IEhlaWtraSBUdXVy
aQogI2luY2x1ZGUgInJlYWQwcmVhZC5oIgogI2luY2x1ZGUgInV0MG1lbS5oIgogCi0vKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqLy8qKgotR2V0cyB0aGUgb2Zmc2V0IG9mIHRyeCBpZCBmaWVsZCwgaW4gYnl0ZXMgcmVs
YXRpdmUgdG8gdGhlIG9yaWdpbiBvZgotYSBjbHVzdGVyZWQgaW5kZXggcmVjb3JkLgotQHJldHVy
bglvZmZzZXQgb2YgREFUQV9UUlhfSUQgKi8KLVVOSVZfSU5URVJOCi11bGludAotcm93X2dldF90
cnhfaWRfb2Zmc2V0KAotLyo9PT09PT09PT09PT09PT09PT0qLwotCWNvbnN0IHJlY190KglyZWMg
X19hdHRyaWJ1dGVfXygodW51c2VkKSksCi0JCQkJLyohPCBpbjogcmVjb3JkICovCi0JZGljdF9p
bmRleF90KglpbmRleCwJLyohPCBpbjogY2x1c3RlcmVkIGluZGV4ICovCi0JY29uc3QgdWxpbnQq
CW9mZnNldHMpLyohPCBpbjogcmVjX2dldF9vZmZzZXRzKHJlYywgaW5kZXgpICovCi17Ci0JdWxp
bnQJcG9zOwotCXVsaW50CW9mZnNldDsKLQl1bGludAlsZW47Ci0KLQl1dF9hZChkaWN0X2luZGV4
X2lzX2NsdXN0KGluZGV4KSk7Ci0JdXRfYWQocmVjX29mZnNfdmFsaWRhdGUocmVjLCBpbmRleCwg
b2Zmc2V0cykpOwotCi0JcG9zID0gZGljdF9pbmRleF9nZXRfc3lzX2NvbF9wb3MoaW5kZXgsIERB
VEFfVFJYX0lEKTsKLQotCW9mZnNldCA9IHJlY19nZXRfbnRoX2ZpZWxkX29mZnMob2Zmc2V0cywg
cG9zLCAmbGVuKTsKLQotCXV0X2FkKGxlbiA9PSBEQVRBX1RSWF9JRF9MRU4pOwotCi0JcmV0dXJu
KG9mZnNldCk7Ci19Ci0KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFdoZW4gYW4gaW5zZXJ0IG9yIHB1cmdlIHRv
IGEgdGFibGUgaXMgcGVyZm9ybWVkLCB0aGlzIGZ1bmN0aW9uIGJ1aWxkcwogdGhlIGVudHJ5IHRv
IGJlIGluc2VydGVkIGludG8gb3IgcHVyZ2VkIGZyb20gYW4gaW5kZXggb24gdGhlIHRhYmxlLgoK

--===============0835840222==
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/mysql-5.5/
# testament_sha1: d79c200fa14dd49bc726366462b0d10c7f186506
# timestamp: 2011-05-24 14:11:30 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# base_revision_id: horst.hunger@stripped\
#   c5vgswlrdygi7224
# 
# Begin bundle
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


--===============0835840222==--