From: marko.makela
Date: May 24 2011 12:07pm
Subject: bzr push into mysql-5.5 branch (marko.makela:3396 to 3397) Bug#12584374
List-Archive: http://lists.mysql.com/commits/137980
X-Bug: 12584374
Message-Id: <201105241208.p4OC86Jn031748@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0319407565=="

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

IDMzOTcgTWFya28gTcOka2Vsw6QJMjAxMS0wNS0yNAogICAgICBCdWcjMTI1ODQzNzQgTE9DS19W
QUxJREFURSBUUklQUyBBU1NFUlRJT04gIUJMT0NLLT5QQUdFLkZJTEVfUEFHRV9XQVNfRlJFRUQK
ICAgICAgCiAgICAgIGxvY2tfY2x1c3RfcmVjX3NvbWVfaGFzX2ltcGwoKSwgcm93X2dldF9yZWNf
dHJ4X2lkKCksCiAgICAgIGxvY2tfcmVjX3F1ZXVlX3ZhbGlkYXRlKCksIGxvY2tfdGFibGVfb3Ro
ZXJfaGFzX2luY29tcGF0aWJsZSgpLAogICAgICBsb2NrX3RhYmxlX2hhc190b193YWl0X2luX3F1
ZXVlKCksIGxvY2tfdGFibGVfcXVldWVfdmFsaWRhdGUoKToKICAgICAgQWRkIGNvbnN0IHF1YWxp
ZmllcnMuCiAgICAgIAogICAgICByb3dfZ2V0X3RyeF9pZF9vZmZzZXQoKTogQWRkIGNvbnN0IHF1
YWxpZmllcnMuIEtlZXAgdGhlIHBhcmFtZXRlciByZWMKICAgICAgb25seSBpbiBVTklWX0RFQlVH
IGJ1aWxkcy4gSW5saW5lIHRoZSBmdW5jdGlvbi4KICAgICAgCiAgICAgIGxvY2tfcmVjX3ZhbGlk
YXRlX3BhZ2UoKTogVGFrZSB0aGUgYnVmZmVyIGJsb2NrIGFzIGEgcGFyYW1ldGVyLCB0bwogICAg
ICBhdm9pZCBhIGJ1Zl9wYWdlX2dldF9nZW4oKSBjYWxsIGluIG1vc3QgY2FzZXMuCiAgICAgIAog
ICAgICBsb2NrX3JlY192YWxpZGF0ZV9wYWdlX2xvdygpOiBBIHZlcnNpb24gb2YgbG9ja19yZWNf
dmFsaWRhdGVfcGFnZSgpCiAgICAgIHRoYXQgYXNzdW1lcyB0aGF0IHRoZSBsb2NrIHN5c3RlbSBt
dXRleGVzIGFyZSBhbHJlYWR5IGJlaW5nIGhlbGQuCiAgICAgIAogICAgICBsb2NrX3JlY19nZXRf
bmV4dF9vbl9wYWdlX2NvbnN0KCk6IEEgY29uc3QgdmFyaWFudCBvZgogICAgICBsb2NrX3JlY19n
ZXRfbmV4dF9vbl9wYWdlKCkuCiAgICAgIAogICAgICBsb2NrX3ZhbGlkYXRlKCk6IERvIG5vdCBy
ZWxlYXNlIHRoZSBsb2NrIHN5c3RlbSBtdXRleCB3aGlsZQogICAgICBidWZmZXItZml4aW5nIHRo
ZSBibG9jayBmb3IgdGhlIGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2UoKSBjYWxsLgogICAgICBSZWxl
YXNpbmcgdGhlIG11dGV4IGFwcGFyZW50bHkgY2F1c2VkIHRoZSBhc3NlcnRpb24gZmFpbHVyZS4K
ICAgICAgCiAgICAgIHJiOjY2NSBhcHByb3ZlZCBieSBTdW5ueSBCYWlucwoKICAgIG1vZGlmaWVk
OgogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvbG9jazBsb2NrLmgKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9pbmNsdWRlL2xvY2swbG9jay5pYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvcm93MHJvdy5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cwcm93Lmlj
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvbG9jay9sb2NrMGxvY2suYwogICAgICBzdG9yYWdlL2lu
bm9iYXNlL3Jvdy9yb3cwcm93LmMKIDMzOTYgSG9yc3QuSHVuZ2VyCTIwMTEtMDUtMjQKICAgICAg
TWVyZ2Ugb2YgdGhpcyB0ZXN0IGZyb20gdHJ1bmsgdG8gNS41IHRvIGhhdmUgYSBzdWNjZXNzZnVs
IHdlZWtseSB0ZXN0IG9uIFdpbmRvd3MuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qv
ci92YXJpYWJsZXMtYmlnLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3QvdmFyaWFibGVzLWJpZy50
ZXN0Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvbG9jazBsb2Nr
LmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9sb2NrMGxvY2suaAlyZXZpZDpob3Jz
dC5odW5nZXJAc3VuLmNvbS0yMDExMDUyNDA5MTYzNC1jNXZnc3dscmR5Z2k3MjI0CisrKyBiL3N0
b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9sb2NrMGxvY2suaAlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDExMDUyNDExMTEyMS1iazR0cDBhM3owdzQ3ZXZ2CkBAIC03Miw5ICs3MiwxMCBA
QCBVTklWX0lOTElORQogdHJ4X3QqCiBsb2NrX2NsdXN0X3JlY19zb21lX2hhc19pbXBsKAogLyo9
PT09PT09PT09PT09PT09PT09PT09PT09Ki8KLQljb25zdCByZWNfdCoJcmVjLAkvKiE8IGluOiB1
c2VyIHJlY29yZCAqLwotCWRpY3RfaW5kZXhfdCoJaW5kZXgsCS8qITwgaW46IGNsdXN0ZXJlZCBp
bmRleCAqLwotCWNvbnN0IHVsaW50KglvZmZzZXRzKTsvKiE8IGluOiByZWNfZ2V0X29mZnNldHMo
cmVjLCBpbmRleCkgKi8KKwljb25zdCByZWNfdCoJCXJlYywJLyohPCBpbjogdXNlciByZWNvcmQg
Ki8KKwljb25zdCBkaWN0X2luZGV4X3QqCWluZGV4LAkvKiE8IGluOiBjbHVzdGVyZWQgaW5kZXgg
Ki8KKwljb25zdCB1bGludCoJCW9mZnNldHMpLyohPCBpbjogcmVjX2dldF9vZmZzZXRzKHJlYywg
aW5kZXgpICovCisJX19hdHRyaWJ1dGVfXygobm9ubnVsbCwgd2Fybl91bnVzZWRfcmVzdWx0KSk7
CiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqLy8qKgogR2V0cyB0aGUgaGVhcF9ubyBvZiB0aGUgc21hbGxlc3QgdXNl
ciByZWNvcmQgb24gYSBwYWdlLgogQHJldHVybgloZWFwX25vIG9mIHNtYWxsZXN0IHVzZXIgcmVj
b3JkLCBvciBQQUdFX0hFQVBfTk9fU1VQUkVNVU0gKi8KCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvbG9jazBsb2NrLmljJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvbG9jazBsb2NrLmljCXJldmlkOmhvcnN0Lmh1bmdlckBzdW4uY29tLTIwMTEwNTI0
MDkxNjM0LWM1dmdzd2xyZHlnaTcyMjQKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2xv
Y2swbG9jay5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUyNDExMTEyMS1i
azR0cDBhM3owdzQ3ZXZ2CkBAIC03NSw5ICs3NSw5IEBAIFVOSVZfSU5MSU5FCiB0cnhfdCoKIGxv
Y2tfY2x1c3RfcmVjX3NvbWVfaGFzX2ltcGwoCiAvKj09PT09PT09PT09PT09PT09PT09PT09PT0q
LwotCWNvbnN0IHJlY190KglyZWMsCS8qITwgaW46IHVzZXIgcmVjb3JkICovCi0JZGljdF9pbmRl
eF90KglpbmRleCwJLyohPCBpbjogY2x1c3RlcmVkIGluZGV4ICovCi0JY29uc3QgdWxpbnQqCW9m
ZnNldHMpLyohPCBpbjogcmVjX2dldF9vZmZzZXRzKHJlYywgaW5kZXgpICovCisJY29uc3QgcmVj
X3QqCQlyZWMsCS8qITwgaW46IHVzZXIgcmVjb3JkICovCisJY29uc3QgZGljdF9pbmRleF90Kglp
bmRleCwJLyohPCBpbjogY2x1c3RlcmVkIGluZGV4ICovCisJY29uc3QgdWxpbnQqCQlvZmZzZXRz
KS8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4KSAqLwogewogCXRyeF9pZF90CXRy
eF9pZDsKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cw
cm93LmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cwcm93LmgJcmV2aWQ6aG9y
c3QuaHVuZ2VyQHN1bi5jb20tMjAxMTA1MjQwOTE2MzQtYzV2Z3N3bHJkeWdpNzIyNAorKysgYi9z
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MHJvdy5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTEwNTI0MTExMTIxLWJrNHRwMGEzejB3NDdldnYKQEAgLTQxLDEzICs0MSwyNCBA
QCBDcmVhdGVkIDQvMjAvMTk5NiBIZWlra2kgVHV1cmkKIEdldHMgdGhlIG9mZnNldCBvZiB0aGUg
dHJ4IGlkIGZpZWxkLCBpbiBieXRlcyByZWxhdGl2ZSB0byB0aGUgb3JpZ2luIG9mCiBhIGNsdXN0
ZXJlZCBpbmRleCByZWNvcmQuCiBAcmV0dXJuCW9mZnNldCBvZiBEQVRBX1RSWF9JRCAqLwotVU5J
Vl9JTlRFUk4KK1VOSVZfSU5MSU5FCiB1bGludAotcm93X2dldF90cnhfaWRfb2Zmc2V0KAotLyo9
PT09PT09PT09PT09PT09PT0qLwotCWNvbnN0IHJlY190KglyZWMsCS8qITwgaW46IHJlY29yZCAq
LwotCWRpY3RfaW5kZXhfdCoJaW5kZXgsCS8qITwgaW46IGNsdXN0ZXJlZCBpbmRleCAqLwotCWNv
bnN0IHVsaW50KglvZmZzZXRzKTsvKiE8IGluOiByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRleCkg
Ki8KK3Jvd19nZXRfdHJ4X2lkX29mZnNldF9mdW5jKAorLyo9PT09PT09PT09PT09PT09PT09PT09
PSovCisjaWZkZWYgVU5JVl9ERUJVRworCWNvbnN0IHJlY190KgkJcmVjLAkvKiE8IGluOiByZWNv
cmQgKi8KKyNlbmRpZiAvKiBVTklWX0RFQlVHICovCisJY29uc3QgZGljdF9pbmRleF90KglpbmRl
eCwJLyohPCBpbjogY2x1c3RlcmVkIGluZGV4ICovCisJY29uc3QgdWxpbnQqCQlvZmZzZXRzKS8q
ITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4KSAqLworCV9fYXR0cmlidXRlX18oKG5v
bm51bGwsIHdhcm5fdW51c2VkX3Jlc3VsdCkpOworI2lmZGVmIFVOSVZfREVCVUcKKyMgZGVmaW5l
IHJvd19nZXRfdHJ4X2lkX29mZnNldChyZWMsIGluZGV4LCBvZmZzZXRzKQlcCisJcm93X2dldF90
cnhfaWRfb2Zmc2V0X2Z1bmMocmVjLCBpbmRleCwgb2Zmc2V0cykKKyNlbHNlIC8qIFVOSVZfREVC
VUcgKi8KKyMgZGVmaW5lIHJvd19nZXRfdHJ4X2lkX29mZnNldChyZWMsIGluZGV4LCBvZmZzZXRz
KQlcCisJcm93X2dldF90cnhfaWRfb2Zmc2V0X2Z1bmMoaW5kZXgsIG9mZnNldHMpCisjZW5kaWYg
LyogVU5JVl9ERUJVRyAqLworCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogUmVhZHMgdGhlIHRyeCBpZCBm
aWVsZCBmcm9tIGEgY2x1c3RlcmVkIGluZGV4IHJlY29yZC4KIEByZXR1cm4JdmFsdWUgb2YgdGhl
IGZpZWxkICovCkBAIC01NSw5ICs2NiwxMCBAQCBVTklWX0lOTElORQogdHJ4X2lkX3QKIHJvd19n
ZXRfcmVjX3RyeF9pZCgKIC8qPT09PT09PT09PT09PT09Ki8KLQljb25zdCByZWNfdCoJcmVjLAkv
KiE8IGluOiByZWNvcmQgKi8KLQlkaWN0X2luZGV4X3QqCWluZGV4LAkvKiE8IGluOiBjbHVzdGVy
ZWQgaW5kZXggKi8KLQljb25zdCB1bGludCoJb2Zmc2V0cyk7LyohPCBpbjogcmVjX2dldF9vZmZz
ZXRzKHJlYywgaW5kZXgpICovCisJY29uc3QgcmVjX3QqCQlyZWMsCS8qITwgaW46IHJlY29yZCAq
LworCWNvbnN0IGRpY3RfaW5kZXhfdCoJaW5kZXgsCS8qITwgaW46IGNsdXN0ZXJlZCBpbmRleCAq
LworCWNvbnN0IHVsaW50KgkJb2Zmc2V0cykvKiE8IGluOiByZWNfZ2V0X29mZnNldHMocmVjLCBp
bmRleCkgKi8KKwlfX2F0dHJpYnV0ZV9fKChub25udWxsLCB3YXJuX3VudXNlZF9yZXN1bHQpKTsK
IC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKiovLyoqCiBSZWFkcyB0aGUgcm9sbCBwb2ludGVyIGZpZWxkIGZyb20gYSBj
bHVzdGVyZWQgaW5kZXggcmVjb3JkLgogQHJldHVybgl2YWx1ZSBvZiB0aGUgZmllbGQgKi8KCj09
PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MHJvdy5pYycKLS0t
IGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzByb3cuaWMJcmV2aWQ6aG9yc3QuaHVuZ2Vy
QHN1bi5jb20tMjAxMTA1MjQwOTE2MzQtYzV2Z3N3bHJkeWdpNzIyNAorKysgYi9zdG9yYWdlL2lu
bm9iYXNlL2luY2x1ZGUvcm93MHJvdy5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDExMDUyNDExMTEyMS1iazR0cDBhM3owdzQ3ZXZ2CkBAIC0yOCwxNSArMjgsNDUgQEAgQ3JlYXRl
ZCA0LzIwLzE5OTYgSGVpa2tpIFR1dXJpCiAjaW5jbHVkZSAidHJ4MHVuZG8uaCIKIAogLyoqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKi8vKioKK0dldHMgdGhlIG9mZnNldCBvZiB0cnggaWQgZmllbGQsIGluIGJ5dGVzIHJl
bGF0aXZlIHRvIHRoZSBvcmlnaW4gb2YKK2EgY2x1c3RlcmVkIGluZGV4IHJlY29yZC4KK0ByZXR1
cm4Jb2Zmc2V0IG9mIERBVEFfVFJYX0lEICovCitVTklWX0lOTElORQordWxpbnQKK3Jvd19nZXRf
dHJ4X2lkX29mZnNldF9mdW5jKAorLyo9PT09PT09PT09PT09PT09PT09PT09PSovCisjaWZkZWYg
VU5JVl9ERUJVRworCWNvbnN0IHJlY190KgkJcmVjLAkvKiE8IGluOiByZWNvcmQgKi8KKyNlbmRp
ZiAvKiBVTklWX0RFQlVHICovCisJY29uc3QgZGljdF9pbmRleF90KglpbmRleCwJLyohPCBpbjog
Y2x1c3RlcmVkIGluZGV4ICovCisJY29uc3QgdWxpbnQqCQlvZmZzZXRzKS8qITwgaW46IHJlY19n
ZXRfb2Zmc2V0cyhyZWMsIGluZGV4KSAqLworeworCXVsaW50CXBvczsKKwl1bGludAlvZmZzZXQ7
CisJdWxpbnQJbGVuOworCisJdXRfYWQoZGljdF9pbmRleF9pc19jbHVzdChpbmRleCkpOworCXV0
X2FkKHJlY19vZmZzX3ZhbGlkYXRlKHJlYywgaW5kZXgsIG9mZnNldHMpKTsKKworCXBvcyA9IGRp
Y3RfaW5kZXhfZ2V0X3N5c19jb2xfcG9zKGluZGV4LCBEQVRBX1RSWF9JRCk7CisKKwlvZmZzZXQg
PSByZWNfZ2V0X250aF9maWVsZF9vZmZzKG9mZnNldHMsIHBvcywgJmxlbik7CisKKwl1dF9hZChs
ZW4gPT0gREFUQV9UUlhfSURfTEVOKTsKKworCXJldHVybihvZmZzZXQpOworfQorCisvKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqLy8qKgogUmVhZHMgdGhlIHRyeCBpZCBmaWVsZCBmcm9tIGEgY2x1c3RlcmVkIGluZGV4
IHJlY29yZC4KIEByZXR1cm4JdmFsdWUgb2YgdGhlIGZpZWxkICovCiBVTklWX0lOTElORQogdHJ4
X2lkX3QKIHJvd19nZXRfcmVjX3RyeF9pZCgKIC8qPT09PT09PT09PT09PT09Ki8KLQljb25zdCBy
ZWNfdCoJcmVjLAkvKiE8IGluOiByZWNvcmQgKi8KLQlkaWN0X2luZGV4X3QqCWluZGV4LAkvKiE8
IGluOiBjbHVzdGVyZWQgaW5kZXggKi8KLQljb25zdCB1bGludCoJb2Zmc2V0cykvKiE8IGluOiBy
ZWNfZ2V0X29mZnNldHMocmVjLCBpbmRleCkgKi8KKwljb25zdCByZWNfdCoJCXJlYywJLyohPCBp
bjogcmVjb3JkICovCisJY29uc3QgZGljdF9pbmRleF90KglpbmRleCwJLyohPCBpbjogY2x1c3Rl
cmVkIGluZGV4ICovCisJY29uc3QgdWxpbnQqCQlvZmZzZXRzKS8qITwgaW46IHJlY19nZXRfb2Zm
c2V0cyhyZWMsIGluZGV4KSAqLwogewogCXVsaW50CW9mZnNldDsKIAoKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvbG9jay9sb2NrMGxvY2suYycKLS0tIGEvc3RvcmFnZS9pbm5v
YmFzZS9sb2NrL2xvY2swbG9jay5jCXJldmlkOmhvcnN0Lmh1bmdlckBzdW4uY29tLTIwMTEwNTI0
MDkxNjM0LWM1dmdzd2xyZHlnaTcyMjQKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2sw
bG9jay5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTI0MTExMTIxLWJrNHRw
MGEzejB3NDdldnYKQEAgLTM1Miw2ICszNTIsNyBAQCBpYm9vbAogbG9ja192YWxpZGF0ZSh2b2lk
KTsKIC8qPT09PT09PT09PT09PT09Ki8KIAorIyBpZmRlZiBVTklWX0RFQlVHX0xPQ0tfVkFMSURB
VEUKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKiovLyoqCiBWYWxpZGF0ZXMgdGhlIHJlY29yZCBsb2NrIHF1ZXVlcyBv
biBhIHBhZ2UuCiBAcmV0dXJuCVRSVUUgaWYgb2sgKi8KQEAgLTM1OSwxMCArMzYwLDkgQEAgc3Rh
dGljCiBpYm9vbAogbG9ja19yZWNfdmFsaWRhdGVfcGFnZSgKIC8qPT09PT09PT09PT09PT09PT09
PSovCi0JdWxpbnQJc3BhY2UsCS8qITwgaW46IHNwYWNlIGlkICovCi0JdWxpbnQJemlwX3NpemUs
LyohPCBpbjogY29tcHJlc3NlZCBwYWdlIHNpemUgaW4gYnl0ZXMKLQkJCW9yIDAgZm9yIHVuY29t
cHJlc3NlZCBwYWdlcyAqLwotCXVsaW50CXBhZ2Vfbm8pOy8qITwgaW46IHBhZ2UgbnVtYmVyICov
CisJY29uc3QgYnVmX2Jsb2NrX3QqCWJsb2NrKQkvKiE8IGluOiBidWZmZXIgYmxvY2sgKi8KKwlf
X2F0dHJpYnV0ZV9fKChub25udWxsLCB3YXJuX3VudXNlZF9yZXN1bHQpKTsKKyMgZW5kaWYgLyog
VU5JVl9ERUJVR19MT0NLX1ZBTElEQVRFICovCiAjZW5kaWYgLyogVU5JVl9ERUJVRyAqLwogCiAv
KiBUaGUgbG9jayBzeXN0ZW0gKi8KQEAgLTExMDAsMTAgKzExMDAsMTAgQEAgbG9ja19yZWNfcmVz
ZXRfbnRoX2JpdCgKIEdldHMgdGhlIGZpcnN0IG9yIG5leHQgcmVjb3JkIGxvY2sgb24gYSBwYWdl
LgogQHJldHVybgluZXh0IGxvY2ssIE5VTEwgaWYgbm9uZSBleGlzdHMgKi8KIFVOSVZfSU5MSU5F
Ci1sb2NrX3QqCi1sb2NrX3JlY19nZXRfbmV4dF9vbl9wYWdlKAotLyo9PT09PT09PT09PT09PT09
PT09PT09Ki8KLQlsb2NrX3QqCWxvY2spCS8qITwgaW46IGEgcmVjb3JkIGxvY2sgKi8KK2NvbnN0
IGxvY2tfdCoKK2xvY2tfcmVjX2dldF9uZXh0X29uX3BhZ2VfY29uc3QoCisvKj09PT09PT09PT09
PT09PT09PT09PT09PT09PT0qLworCWNvbnN0IGxvY2tfdCoJbG9jaykJLyohPCBpbjogYSByZWNv
cmQgbG9jayAqLwogewogCXVsaW50CXNwYWNlOwogCXVsaW50CXBhZ2Vfbm87CkBAIC0xMTMzLDYg
KzExMzMsMTggQEAgbG9ja19yZWNfZ2V0X25leHRfb25fcGFnZSgKIH0KIAogLyoqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ki8vKioKK0dldHMgdGhlIGZpcnN0IG9yIG5leHQgcmVjb3JkIGxvY2sgb24gYSBwYWdlLgorQHJl
dHVybgluZXh0IGxvY2ssIE5VTEwgaWYgbm9uZSBleGlzdHMgKi8KK1VOSVZfSU5MSU5FCitsb2Nr
X3QqCitsb2NrX3JlY19nZXRfbmV4dF9vbl9wYWdlKAorLyo9PT09PT09PT09PT09PT09PT09PT09
Ki8KKwlsb2NrX3QqCWxvY2spCS8qITwgaW46IGEgcmVjb3JkIGxvY2sgKi8KK3sKKwlyZXR1cm4o
KGxvY2tfdCopIGxvY2tfcmVjX2dldF9uZXh0X29uX3BhZ2VfY29uc3QobG9jaykpOworfQorCisv
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqLy8qKgogR2V0cyB0aGUgZmlyc3QgcmVjb3JkIGxvY2sgb24gYSBwYWdlLCB3
aGVyZSB0aGUgcGFnZSBpcyBpZGVudGlmaWVkIGJ5IGl0cwogZmlsZSBhZGRyZXNzLgogQHJldHVy
bglmaXJzdCBsb2NrLCBOVUxMIGlmIG5vbmUgZXhpc3RzICovCkBAIC0yNjQ1LDkgKzI2NTcsNyBA
QCBsb2NrX21vdmVfcmVvcmdhbml6ZV9wYWdlKAogCW1lbV9oZWFwX2ZyZWUoaGVhcCk7CiAKICNp
ZmRlZiBVTklWX0RFQlVHX0xPQ0tfVkFMSURBVEUKLQl1dF9hZChsb2NrX3JlY192YWxpZGF0ZV9w
YWdlKGJ1Zl9ibG9ja19nZXRfc3BhY2UoYmxvY2spLAotCQkJCSAgICAgYnVmX2Jsb2NrX2dldF96
aXBfc2l6ZShibG9jayksCi0JCQkJICAgICBidWZfYmxvY2tfZ2V0X3BhZ2Vfbm8oYmxvY2spKSk7
CisJdXRfYWQobG9ja19yZWNfdmFsaWRhdGVfcGFnZShibG9jaykpOwogI2VuZGlmCiB9CiAKQEAg
LTI3MzUsMTIgKzI3NDUsOCBAQCBsb2NrX21vdmVfcmVjX2xpc3RfZW5kKAogCWxvY2tfbXV0ZXhf
ZXhpdF9rZXJuZWwoKTsKIAogI2lmZGVmIFVOSVZfREVCVUdfTE9DS19WQUxJREFURQotCXV0X2Fk
KGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2UoYnVmX2Jsb2NrX2dldF9zcGFjZShibG9jayksCi0JCQkJ
ICAgICBidWZfYmxvY2tfZ2V0X3ppcF9zaXplKGJsb2NrKSwKLQkJCQkgICAgIGJ1Zl9ibG9ja19n
ZXRfcGFnZV9ubyhibG9jaykpKTsKLQl1dF9hZChsb2NrX3JlY192YWxpZGF0ZV9wYWdlKGJ1Zl9i
bG9ja19nZXRfc3BhY2UobmV3X2Jsb2NrKSwKLQkJCQkgICAgIGJ1Zl9ibG9ja19nZXRfemlwX3Np
emUoYmxvY2spLAotCQkJCSAgICAgYnVmX2Jsb2NrX2dldF9wYWdlX25vKG5ld19ibG9jaykpKTsK
Kwl1dF9hZChsb2NrX3JlY192YWxpZGF0ZV9wYWdlKGJsb2NrKSk7CisJdXRfYWQobG9ja19yZWNf
dmFsaWRhdGVfcGFnZShuZXdfYmxvY2spKTsKICNlbmRpZgogfQogCkBAIC0yODQ4LDkgKzI4NTQs
NyBAQCBsb2NrX21vdmVfcmVjX2xpc3Rfc3RhcnQoCiAJbG9ja19tdXRleF9leGl0X2tlcm5lbCgp
OwogCiAjaWZkZWYgVU5JVl9ERUJVR19MT0NLX1ZBTElEQVRFCi0JdXRfYWQobG9ja19yZWNfdmFs
aWRhdGVfcGFnZShidWZfYmxvY2tfZ2V0X3NwYWNlKGJsb2NrKSwKLQkJCQkgICAgIGJ1Zl9ibG9j
a19nZXRfemlwX3NpemUoYmxvY2spLAotCQkJCSAgICAgYnVmX2Jsb2NrX2dldF9wYWdlX25vKGJs
b2NrKSkpOworCXV0X2FkKGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2UoYmxvY2spKTsKICNlbmRpZgog
fQogCkBAIC0zODMzLDE3ICszODM3LDE4IEBAIENoZWNrcyBpZiBvdGhlciB0cmFuc2FjdGlvbnMg
aGF2ZSBhbiBpbmMKIHRoZSBsb2NrIHF1ZXVlLgogQHJldHVybglsb2NrIG9yIE5VTEwgKi8KIFVO
SVZfSU5MSU5FCi1sb2NrX3QqCitjb25zdCBsb2NrX3QqCiBsb2NrX3RhYmxlX290aGVyX2hhc19p
bmNvbXBhdGlibGUoCiAvKj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSovCi0JdHJ4X3Qq
CQl0cngsCS8qITwgaW46IHRyYW5zYWN0aW9uLCBvciBOVUxMIGlmIGFsbAotCQkJCXRyYW5zYWN0
aW9ucyBzaG91bGQgYmUgaW5jbHVkZWQgKi8KLQl1bGludAkJd2FpdCwJLyohPCBpbjogTE9DS19X
QUlUIGlmIGFsc28gd2FpdGluZyBsb2NrcyBhcmUKLQkJCQl0YWtlbiBpbnRvIGFjY291bnQsIG9y
IDAgaWYgbm90ICovCi0JZGljdF90YWJsZV90Kgl0YWJsZSwJLyohPCBpbjogdGFibGUgKi8KLQll
bnVtIGxvY2tfbW9kZQltb2RlKQkvKiE8IGluOiBsb2NrIG1vZGUgKi8KKwljb25zdCB0cnhfdCoJ
CXRyeCwJLyohPCBpbjogdHJhbnNhY3Rpb24sIG9yIE5VTEwgaWYgYWxsCisJCQkJCXRyYW5zYWN0
aW9ucyBzaG91bGQgYmUgaW5jbHVkZWQgKi8KKwl1bGludAkJCXdhaXQsCS8qITwgaW46IExPQ0tf
V0FJVCBpZiBhbHNvCisJCQkJCXdhaXRpbmcgbG9ja3MgYXJlIHRha2VuIGludG8KKwkJCQkJYWNj
b3VudCwgb3IgMCBpZiBub3QgKi8KKwljb25zdCBkaWN0X3RhYmxlX3QqCXRhYmxlLAkvKiE8IGlu
OiB0YWJsZSAqLworCWVudW0gbG9ja19tb2RlCQltb2RlKQkvKiE8IGluOiBsb2NrIG1vZGUgKi8K
IHsKLQlsb2NrX3QqCWxvY2s7CisJY29uc3QgbG9ja190Kglsb2NrOwogCiAJdXRfYWQobXV0ZXhf
b3duKCZrZXJuZWxfbXV0ZXgpKTsKIApAQCAtMzkzNCwxMCArMzkzOSwxMCBAQCBzdGF0aWMKIGli
b29sCiBsb2NrX3RhYmxlX2hhc190b193YWl0X2luX3F1ZXVlKAogLyo9PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ki8KLQlsb2NrX3QqCXdhaXRfbG9jaykJLyohPCBpbjogd2FpdGluZyB0YWJs
ZSBsb2NrICovCisJY29uc3QgbG9ja190Kgl3YWl0X2xvY2spCS8qITwgaW46IHdhaXRpbmcgdGFi
bGUgbG9jayAqLwogewotCWRpY3RfdGFibGVfdCoJdGFibGU7Ci0JbG9ja190KgkJbG9jazsKKwlj
b25zdCBkaWN0X3RhYmxlX3QqCXRhYmxlOworCWNvbnN0IGxvY2tfdCoJCWxvY2s7CiAKIAl1dF9h
ZChtdXRleF9vd24oJmtlcm5lbF9tdXRleCkpOwogCXV0X2FkKGxvY2tfZ2V0X3dhaXQod2FpdF9s
b2NrKSk7CkBAIC00Njc3LDkgKzQ2ODIsOSBAQCBzdGF0aWMKIGlib29sCiBsb2NrX3RhYmxlX3F1
ZXVlX3ZhbGlkYXRlKAogLyo9PT09PT09PT09PT09PT09PT09PT09Ki8KLQlkaWN0X3RhYmxlX3Qq
CXRhYmxlKQkvKiE8IGluOiB0YWJsZSAqLworCWNvbnN0IGRpY3RfdGFibGVfdCoJdGFibGUpCS8q
ITwgaW46IHRhYmxlICovCiB7Ci0JbG9ja190Kglsb2NrOworCWNvbnN0IGxvY2tfdCoJbG9jazsK
IAogCXV0X2FkKG11dGV4X293bigma2VybmVsX211dGV4KSk7CiAKQEAgLTQ3MTUsNyArNDcyMCw3
IEBAIGxvY2tfcmVjX3F1ZXVlX3ZhbGlkYXRlKAogLyo9PT09PT09PT09PT09PT09PT09PSovCiAJ
Y29uc3QgYnVmX2Jsb2NrX3QqCWJsb2NrLAkvKiE8IGluOiBidWZmZXIgYmxvY2sgY29udGFpbmlu
ZyByZWMgKi8KIAljb25zdCByZWNfdCoJCXJlYywJLyohPCBpbjogcmVjb3JkIHRvIGxvb2sgYXQg
Ki8KLQlkaWN0X2luZGV4X3QqCQlpbmRleCwJLyohPCBpbjogaW5kZXgsIG9yIE5VTEwgaWYgbm90
IGtub3duICovCisJY29uc3QgZGljdF9pbmRleF90KglpbmRleCwJLyohPCBpbjogaW5kZXgsIG9y
IE5VTEwgaWYgbm90IGtub3duICovCiAJY29uc3QgdWxpbnQqCQlvZmZzZXRzKS8qITwgaW46IHJl
Y19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4KSAqLwogewogCXRyeF90KglpbXBsX3RyeDsKQEAgLTQ4
NjAsNDIgKzQ4NjUsMjggQEAgbG9ja19yZWNfcXVldWVfdmFsaWRhdGUoCiAvKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ly8qKgogVmFsaWRhdGVzIHRoZSByZWNvcmQgbG9jayBxdWV1ZXMgb24gYSBwYWdlLgogQHJldHVy
bglUUlVFIGlmIG9rICovCi1zdGF0aWMKK3N0YXRpYyBfX2F0dHJpYnV0ZV9fKChub25udWxsLCB3
YXJuX3VudXNlZF9yZXN1bHQpKQogaWJvb2wKLWxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2UoCi0vKj09
PT09PT09PT09PT09PT09PT0qLwotCXVsaW50CXNwYWNlLAkvKiE8IGluOiBzcGFjZSBpZCAqLwot
CXVsaW50CXppcF9zaXplLC8qITwgaW46IGNvbXByZXNzZWQgcGFnZSBzaXplIGluIGJ5dGVzCi0J
CQlvciAwIGZvciB1bmNvbXByZXNzZWQgcGFnZXMgKi8KLQl1bGludAlwYWdlX25vKS8qITwgaW46
IHBhZ2UgbnVtYmVyICovCitsb2NrX3JlY192YWxpZGF0ZV9wYWdlX2xvdygKKy8qPT09PT09PT09
PT09PT09PT09PT09PT0qLworCWNvbnN0IGJ1Zl9ibG9ja190KglibG9jaykJLyohPCBpbjogYnVm
ZmVyIGJsb2NrICovCiB7Ci0JZGljdF9pbmRleF90KglpbmRleDsKLQlidWZfYmxvY2tfdCoJYmxv
Y2s7Ci0JY29uc3QgcGFnZV90KglwYWdlOwotCWxvY2tfdCoJCWxvY2s7CisJY29uc3QgbG9ja190
Kglsb2NrOwogCWNvbnN0IHJlY190KglyZWM7CiAJdWxpbnQJCW50aF9sb2NrCT0gMDsKIAl1bGlu
dAkJbnRoX2JpdAkJPSAwOwogCXVsaW50CQlpOwotCW10cl90CQltdHI7CiAJbWVtX2hlYXBfdCoJ
aGVhcAkJPSBOVUxMOwogCXVsaW50CQlvZmZzZXRzX1tSRUNfT0ZGU19OT1JNQUxfU0laRV07CiAJ
dWxpbnQqCQlvZmZzZXRzCQk9IG9mZnNldHNfOwogCXJlY19vZmZzX2luaXQob2Zmc2V0c18pOwog
Ci0JdXRfYWQoIW11dGV4X293bigma2VybmVsX211dGV4KSk7Ci0KLQltdHJfc3RhcnQoJm10cik7
Ci0KLQl1dF9hZCh6aXBfc2l6ZSAhPSBVTElOVF9VTkRFRklORUQpOwotCWJsb2NrID0gYnVmX3Bh
Z2VfZ2V0KHNwYWNlLCB6aXBfc2l6ZSwgcGFnZV9ubywgUldfWF9MQVRDSCwgJm10cik7Ci0JYnVm
X2Jsb2NrX2RiZ19hZGRfbGV2ZWwoYmxvY2ssIFNZTkNfTk9fT1JERVJfQ0hFQ0spOwotCi0JcGFn
ZSA9IGJsb2NrLT5mcmFtZTsKKwl1dF9hZChtdXRleF9vd24oJmtlcm5lbF9tdXRleCkpOworCXV0
X2FkKGJ1Zl9ibG9ja19nZXRfc3RhdGUoYmxvY2spID09IEJVRl9CTE9DS19GSUxFX1BBR0UpOwog
Ci0JbG9ja19tdXRleF9lbnRlcl9rZXJuZWwoKTsKIGxvb3A6Ci0JbG9jayA9IGxvY2tfcmVjX2dl
dF9maXJzdF9vbl9wYWdlX2FkZHIoc3BhY2UsIHBhZ2Vfbm8pOworCWxvY2sgPSBsb2NrX3JlY19n
ZXRfZmlyc3Rfb25fcGFnZV9hZGRyKGJ1Zl9ibG9ja19nZXRfc3BhY2UoYmxvY2spLAorCQkJCQkg
ICAgICAgYnVmX2Jsb2NrX2dldF9wYWdlX25vKGJsb2NrKSk7CiAKIAlpZiAoIWxvY2spIHsKIAkJ
Z290byBmdW5jdGlvbl9leGl0OwpAQCAtNDkwMyw3ICs0ODk0LDcgQEAgbG9vcDoKIAogCWZvciAo
aSA9IDA7IGkgPCBudGhfbG9jazsgaSsrKSB7CiAKLQkJbG9jayA9IGxvY2tfcmVjX2dldF9uZXh0
X29uX3BhZ2UobG9jayk7CisJCWxvY2sgPSBsb2NrX3JlY19nZXRfbmV4dF9vbl9wYWdlX2NvbnN0
KGxvY2spOwogCiAJCWlmICghbG9jaykgewogCQkJZ290byBmdW5jdGlvbl9leGl0OwpAQCAtNDky
NiwxNSArNDkxNywxNCBAQCBsb29wOgogCiAJCWlmIChpID09IDEgfHwgbG9ja19yZWNfZ2V0X250
aF9iaXQobG9jaywgaSkpIHsKIAotCQkJaW5kZXggPSBsb2NrLT5pbmRleDsKLQkJCXJlYyA9IHBh
Z2VfZmluZF9yZWNfd2l0aF9oZWFwX25vKHBhZ2UsIGkpOworCQkJcmVjID0gcGFnZV9maW5kX3Jl
Y193aXRoX2hlYXBfbm8oYmxvY2stPmZyYW1lLCBpKTsKIAkJCXV0X2EocmVjKTsKLQkJCW9mZnNl
dHMgPSByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRleCwgb2Zmc2V0cywKKwkJCW9mZnNldHMgPSBy
ZWNfZ2V0X29mZnNldHMocmVjLCBsb2NrLT5pbmRleCwgb2Zmc2V0cywKIAkJCQkJCSAgVUxJTlRf
VU5ERUZJTkVELCAmaGVhcCk7CiAjaWYgMAogCQkJZnByaW50ZihzdGRlcnIsCi0JCQkJIlZhbGlk
YXRpbmcgJWx1ICVsdVxuIiwKLQkJCQkodWxvbmcpIHNwYWNlLCAodWxvbmcpIHBhZ2Vfbm8pOwor
CQkJCSJWYWxpZGF0aW5nICV1ICV1XG4iLAorCQkJCWJsb2NrLT5wYWdlLnNwYWNlLCBibG9jay0+
cGFnZS5vZmZzZXQpOwogI2VuZGlmCiAJCQlsb2NrX211dGV4X2V4aXRfa2VybmVsKCk7CiAKQEAg
LTQ5NDMsNyArNDkzMyw4IEBAIGxvb3A6CiAJCQljaGVjayBXSUxMIGJyZWFrIHRoZSBsYXRjaGlu
ZyBvcmRlciBhbmQgbWF5CiAJCQljYXVzZSBhIGRlYWRsb2NrIG9mIHRocmVhZHMuICovCiAKLQkJ
CWxvY2tfcmVjX3F1ZXVlX3ZhbGlkYXRlKGJsb2NrLCByZWMsIGluZGV4LCBvZmZzZXRzKTsKKwkJ
CWxvY2tfcmVjX3F1ZXVlX3ZhbGlkYXRlKGJsb2NrLCByZWMsIGxvY2stPmluZGV4LAorCQkJCQkJ
b2Zmc2V0cyk7CiAKIAkJCWxvY2tfbXV0ZXhfZW50ZXJfa2VybmVsKCk7CiAKQEAgLTQ5NTksMTYg
KzQ5NTAsMzIgQEAgbG9vcDoKIAlnb3RvIGxvb3A7CiAKIGZ1bmN0aW9uX2V4aXQ6Ci0JbG9ja19t
dXRleF9leGl0X2tlcm5lbCgpOwotCi0JbXRyX2NvbW1pdCgmbXRyKTsKLQogCWlmIChVTklWX0xJ
S0VMWV9OVUxMKGhlYXApKSB7CiAJCW1lbV9oZWFwX2ZyZWUoaGVhcCk7CiAJfQogCXJldHVybihU
UlVFKTsKIH0KIAorI2lmZGVmIFVOSVZfREVCVUdfTE9DS19WQUxJREFURQorLyoqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ki8vKioKK1ZhbGlkYXRlcyB0aGUgcmVjb3JkIGxvY2sgcXVldWVzIG9uIGEgcGFnZS4KK0ByZXR1
cm4JVFJVRSBpZiBvayAqLworc3RhdGljCitpYm9vbAorbG9ja19yZWNfdmFsaWRhdGVfcGFnZSgK
Ky8qPT09PT09PT09PT09PT09PT09PSovCisJY29uc3QgYnVmX2Jsb2NrX3QqCWJsb2NrKQkvKiE8
IGluOiBidWZmZXIgYmxvY2sgKi8KK3sKKwlpYm9vbAl2YWxpZDsKKworCWxvY2tfbXV0ZXhfZW50
ZXJfa2VybmVsKCk7CisJdmFsaWQgPSBsb2NrX3JlY192YWxpZGF0ZV9wYWdlX2xvdyhibG9jayk7
CisJbG9ja19tdXRleF9leGl0X2tlcm5lbCgpOworCisJcmV0dXJuKHZhbGlkKTsKK30KKyNlbmRp
ZiAvKiBVTklWX0RFQlVHX0xPQ0tfVkFMSURBVEUgKi8KKwogLyoqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFZh
bGlkYXRlcyB0aGUgbG9jayBzeXN0ZW0uCiBAcmV0dXJuCVRSVUUgaWYgb2sgKi8KQEAgLTQ5Nzcs
MTEgKzQ5ODQsOCBAQCBpYm9vbAogbG9ja192YWxpZGF0ZSh2b2lkKQogLyo9PT09PT09PT09PT09
PT0qLwogewotCWxvY2tfdCoJCWxvY2s7Ci0JdHJ4X3QqCQl0cng7Ci0JaWJfdWludDY0X3QJbGlt
aXQ7Ci0JdWxpbnQJCXNwYWNlOwotCXVsaW50CQlwYWdlX25vOworCWNvbnN0IGxvY2tfdCoJbG9j
azsKKwljb25zdCB0cnhfdCoJdHJ4OwogCXVsaW50CQlpOwogCiAJbG9ja19tdXRleF9lbnRlcl9r
ZXJuZWwoKTsKQEAgLTUwMDYsOSArNTAxMCwxNCBAQCBsb2NrX3ZhbGlkYXRlKHZvaWQpCiAKIAlm
b3IgKGkgPSAwOyBpIDwgaGFzaF9nZXRfbl9jZWxscyhsb2NrX3N5cy0+cmVjX2hhc2gpOyBpKysp
IHsKIAotCQlsaW1pdCA9IDA7CisJCXVsaW50CQlzcGFjZTsKKwkJdWxpbnQJCXBhZ2Vfbm87CisJ
CWliX3VpbnQ2NF90CWxpbWl0CT0gMDsKIAogCQlmb3IgKDs7KSB7CisJCQltdHJfdAkJbXRyOwor
CQkJYnVmX2Jsb2NrX3QqCWJsb2NrOworCiAJCQlsb2NrID0gSEFTSF9HRVRfRklSU1QobG9ja19z
eXMtPnJlY19oYXNoLCBpKTsKIAogCQkJd2hpbGUgKGxvY2spIHsKQEAgLTUwMzIsMTUgKzUwNDEs
MTYgQEAgbG9ja192YWxpZGF0ZSh2b2lkKQogCQkJCWJyZWFrOwogCQkJfQogCi0JCQlsb2NrX211
dGV4X2V4aXRfa2VybmVsKCk7Ci0KLQkJCWxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2Uoc3BhY2UsCi0J
CQkJCSAgICAgICBmaWxfc3BhY2VfZ2V0X3ppcF9zaXplKHNwYWNlKSwKLQkJCQkJICAgICAgIHBh
Z2Vfbm8pOworCQkJbXRyX3N0YXJ0KCZtdHIpOworCQkJYmxvY2sgPSBidWZfcGFnZV9nZXQoCisJ
CQkJc3BhY2UsIGZpbF9zcGFjZV9nZXRfemlwX3NpemUoc3BhY2UpLAorCQkJCXBhZ2Vfbm8sIFJX
X1hfTEFUQ0gsICZtdHIpOworCQkJYnVmX2Jsb2NrX2RiZ19hZGRfbGV2ZWwoYmxvY2ssIFNZTkNf
Tk9fT1JERVJfQ0hFQ0spOwogCi0JCQlsb2NrX211dGV4X2VudGVyX2tlcm5lbCgpOworCQkJdXRf
YWQobG9ja19yZWNfdmFsaWRhdGVfcGFnZV9sb3coYmxvY2spKTsKKwkJCW10cl9jb21taXQoJm10
cik7CiAKLQkJCWxpbWl0ID0gdXRfdWxsX2NyZWF0ZShzcGFjZSwgcGFnZV9ubyArIDEpOworCQkJ
bGltaXQrKzsKIAkJfQogCX0KIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uv
cm93L3JvdzByb3cuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jCXJldmlk
OmhvcnN0Lmh1bmdlckBzdW4uY29tLTIwMTEwNTI0MDkxNjM0LWM1dmdzd2xyZHlnaTcyMjQKKysr
IGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTEwNTI0MTExMTIxLWJrNHRwMGEzejB3NDdldnYKQEAgLTQ3LDM1ICs0Nyw2IEBA
IENyZWF0ZWQgNC8yMC8xOTk2IEhlaWtraSBUdXVyaQogI2luY2x1ZGUgInJlYWQwcmVhZC5oIgog
I2luY2x1ZGUgInV0MG1lbS5oIgogCi0vKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgotR2V0cyB0aGUgb2Zmc2V0
IG9mIHRyeCBpZCBmaWVsZCwgaW4gYnl0ZXMgcmVsYXRpdmUgdG8gdGhlIG9yaWdpbiBvZgotYSBj
bHVzdGVyZWQgaW5kZXggcmVjb3JkLgotQHJldHVybglvZmZzZXQgb2YgREFUQV9UUlhfSUQgKi8K
LVVOSVZfSU5URVJOCi11bGludAotcm93X2dldF90cnhfaWRfb2Zmc2V0KAotLyo9PT09PT09PT09
PT09PT09PT0qLwotCWNvbnN0IHJlY190KglyZWMgX19hdHRyaWJ1dGVfXygodW51c2VkKSksCi0J
CQkJLyohPCBpbjogcmVjb3JkICovCi0JZGljdF9pbmRleF90KglpbmRleCwJLyohPCBpbjogY2x1
c3RlcmVkIGluZGV4ICovCi0JY29uc3QgdWxpbnQqCW9mZnNldHMpLyohPCBpbjogcmVjX2dldF9v
ZmZzZXRzKHJlYywgaW5kZXgpICovCi17Ci0JdWxpbnQJcG9zOwotCXVsaW50CW9mZnNldDsKLQl1
bGludAlsZW47Ci0KLQl1dF9hZChkaWN0X2luZGV4X2lzX2NsdXN0KGluZGV4KSk7Ci0JdXRfYWQo
cmVjX29mZnNfdmFsaWRhdGUocmVjLCBpbmRleCwgb2Zmc2V0cykpOwotCi0JcG9zID0gZGljdF9p
bmRleF9nZXRfc3lzX2NvbF9wb3MoaW5kZXgsIERBVEFfVFJYX0lEKTsKLQotCW9mZnNldCA9IHJl
Y19nZXRfbnRoX2ZpZWxkX29mZnMob2Zmc2V0cywgcG9zLCAmbGVuKTsKLQotCXV0X2FkKGxlbiA9
PSBEQVRBX1RSWF9JRF9MRU4pOwotCi0JcmV0dXJuKG9mZnNldCk7Ci19Ci0KIC8qKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8v
KioKIFdoZW4gYW4gaW5zZXJ0IG9yIHB1cmdlIHRvIGEgdGFibGUgaXMgcGVyZm9ybWVkLCB0aGlz
IGZ1bmN0aW9uIGJ1aWxkcwogdGhlIGVudHJ5IHRvIGJlIGluc2VydGVkIGludG8gb3IgcHVyZ2Vk
IGZyb20gYW4gaW5kZXggb24gdGhlIHRhYmxlLgoK

--===============0319407565==
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 15:08:00 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# base_revision_id: horst.hunger@stripped\
#   c5vgswlrdygi7224
# 
# Begin bundle
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


--===============0319407565==--