From: marko.makela
Date: May 24 2011 12:07pm
Subject: bzr push into mysql-trunk branch (marko.makela:3102 to 3103)
List-Archive: http://lists.mysql.com/commits/137981
Message-Id: <201105241208.p4OC8ERw030133@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1682471095=="

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

IDMxMDMgTWFya28gTcOka2Vsw6QJMjAxMS0wNS0yNCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNSB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL2xvY2swcHJpdi5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9sb2Nr
MHByaXYuaWMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzByb3cuaAogICAgICBz
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MHJvdy5pYwogICAgICBzdG9yYWdlL2lubm9iYXNl
L2xvY2svbG9jazBsb2NrLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jCiAz
MTAyIE1hcmtvIE3DpGtlbMOkCTIwMTEtMDUtMjQgW21lcmdlXQogICAgICBNZXJnZSBmcm9tIG15
c3FsLTUuNSB0byBteXNxbC10cnVuayAobm8gZGlmZikuCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vYmFzZS9pbmNsdWRlL2xvY2swcHJpdi5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvbG9jazBwcml2LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1
MjQwODQyNTEtdmptdWZtc3R6cnltendmZworKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv
bG9jazBwcml2LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MjQxMjA1NTct
N2c5Znp5a2E3cHN3bHZ4dwpAQCAtMTE4LDkgKzExOCwxMCBAQCBVTklWX0lOTElORQogdHJ4X2lk
X3QKIGxvY2tfY2x1c3RfcmVjX3NvbWVfaGFzX2ltcGwoCiAvKj09PT09PT09PT09PT09PT09PT09
PT09PT0qLwotCWNvbnN0IHJlY190KglyZWMsCQkvKiE8IGluOiB1c2VyIHJlY29yZCAqLwotCWRp
Y3RfaW5kZXhfdCoJaW5kZXgsCQkvKiE8IGluOiBjbHVzdGVyZWQgaW5kZXggKi8KLQljb25zdCB1
bGludCoJb2Zmc2V0cyk7CS8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4KSAqLwor
CWNvbnN0IHJlY190KgkJcmVjLAkvKiE8IGluOiB1c2VyIHJlY29yZCAqLworCWNvbnN0IGRpY3Rf
aW5kZXhfdCoJaW5kZXgsCS8qITwgaW46IGNsdXN0ZXJlZCBpbmRleCAqLworCWNvbnN0IHVsaW50
KgkJb2Zmc2V0cykvKiE8IGluOiByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRleCkgKi8KKwlfX2F0
dHJpYnV0ZV9fKChub25udWxsLCB3YXJuX3VudXNlZF9yZXN1bHQpKTsKIAogI2lmbmRlZiBVTklW
X05PTklOTAogI2luY2x1ZGUgImxvY2swcHJpdi5pYyIKCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvbG9jazBwcml2LmljJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvbG9jazBwcml2LmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEw
NTI0MDg0MjUxLXZqbXVmbXN0enJ5bXp3ZmcKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRl
L2xvY2swcHJpdi5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUyNDEyMDU1
Ny03ZzlmenlrYTdwc3dsdnh3CkBAIC01NCw5ICs1NCw5IEBAIFVOSVZfSU5MSU5FCiB0cnhfaWRf
dAogbG9ja19jbHVzdF9yZWNfc29tZV9oYXNfaW1wbCgKIC8qPT09PT09PT09PT09PT09PT09PT09
PT09PSovCi0JY29uc3QgcmVjX3QqCXJlYywJLyohPCBpbjogdXNlciByZWNvcmQgKi8KLQlkaWN0
X2luZGV4X3QqCWluZGV4LAkvKiE8IGluOiBjbHVzdGVyZWQgaW5kZXggKi8KLQljb25zdCB1bGlu
dCoJb2Zmc2V0cykvKiE8IGluOiByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRleCkgKi8KKwljb25z
dCByZWNfdCoJCXJlYywJLyohPCBpbjogdXNlciByZWNvcmQgKi8KKwljb25zdCBkaWN0X2luZGV4
X3QqCWluZGV4LAkvKiE8IGluOiBjbHVzdGVyZWQgaW5kZXggKi8KKwljb25zdCB1bGludCoJCW9m
ZnNldHMpLyohPCBpbjogcmVjX2dldF9vZmZzZXRzKHJlYywgaW5kZXgpICovCiB7CiAJdXRfYWQo
ZGljdF9pbmRleF9pc19jbHVzdChpbmRleCkpOwogCXV0X2FkKHBhZ2VfcmVjX2lzX3VzZXJfcmVj
KHJlYykpOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cw
cm93LmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cwcm93LmgJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MjQwODQyNTEtdmptdWZtc3R6cnltendmZworKysg
Yi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MHJvdy5oCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTEwNTI0MTIwNTU3LTdnOWZ6eWthN3Bzd2x2eHcKQEAgLTQxLDEzICs0MSwy
NCBAQCBDcmVhdGVkIDQvMjAvMTk5NiBIZWlra2kgVHV1cmkKIEdldHMgdGhlIG9mZnNldCBvZiB0
aGUgdHJ4IGlkIGZpZWxkLCBpbiBieXRlcyByZWxhdGl2ZSB0byB0aGUgb3JpZ2luIG9mCiBhIGNs
dXN0ZXJlZCBpbmRleCByZWNvcmQuCiBAcmV0dXJuCW9mZnNldCBvZiBEQVRBX1RSWF9JRCAqLwot
VU5JVl9JTlRFUk4KK1VOSVZfSU5MSU5FCiB1bGludAotcm93X2dldF90cnhfaWRfb2Zmc2V0KAot
Lyo9PT09PT09PT09PT09PT09PT0qLwotCWNvbnN0IHJlY190KglyZWMsCS8qITwgaW46IHJlY29y
ZCAqLwotCWRpY3RfaW5kZXhfdCoJaW5kZXgsCS8qITwgaW46IGNsdXN0ZXJlZCBpbmRleCAqLwot
CWNvbnN0IHVsaW50KglvZmZzZXRzKTsvKiE8IGluOiByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRl
eCkgKi8KK3Jvd19nZXRfdHJ4X2lkX29mZnNldF9mdW5jKAorLyo9PT09PT09PT09PT09PT09PT09
PT09PSovCisjaWZkZWYgVU5JVl9ERUJVRworCWNvbnN0IHJlY190KgkJcmVjLAkvKiE8IGluOiBy
ZWNvcmQgKi8KKyNlbmRpZiAvKiBVTklWX0RFQlVHICovCisJY29uc3QgZGljdF9pbmRleF90Kglp
bmRleCwJLyohPCBpbjogY2x1c3RlcmVkIGluZGV4ICovCisJY29uc3QgdWxpbnQqCQlvZmZzZXRz
KS8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4KSAqLworCV9fYXR0cmlidXRlX18o
KG5vbm51bGwsIHdhcm5fdW51c2VkX3Jlc3VsdCkpOworI2lmZGVmIFVOSVZfREVCVUcKKyMgZGVm
aW5lIHJvd19nZXRfdHJ4X2lkX29mZnNldChyZWMsIGluZGV4LCBvZmZzZXRzKQlcCisJcm93X2dl
dF90cnhfaWRfb2Zmc2V0X2Z1bmMocmVjLCBpbmRleCwgb2Zmc2V0cykKKyNlbHNlIC8qIFVOSVZf
REVCVUcgKi8KKyMgZGVmaW5lIHJvd19nZXRfdHJ4X2lkX29mZnNldChyZWMsIGluZGV4LCBvZmZz
ZXRzKQlcCisJcm93X2dldF90cnhfaWRfb2Zmc2V0X2Z1bmMoaW5kZXgsIG9mZnNldHMpCisjZW5k
aWYgLyogVU5JVl9ERUJVRyAqLworCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogUmVhZHMgdGhlIHRyeCBp
ZCBmaWVsZCBmcm9tIGEgY2x1c3RlcmVkIGluZGV4IHJlY29yZC4KIEByZXR1cm4JdmFsdWUgb2Yg
dGhlIGZpZWxkICovCkBAIC01NSw5ICs2NiwxMCBAQCBVTklWX0lOTElORQogdHJ4X2lkX3QKIHJv
d19nZXRfcmVjX3RyeF9pZCgKIC8qPT09PT09PT09PT09PT09Ki8KLQljb25zdCByZWNfdCoJcmVj
LAkvKiE8IGluOiByZWNvcmQgKi8KLQlkaWN0X2luZGV4X3QqCWluZGV4LAkvKiE8IGluOiBjbHVz
dGVyZWQgaW5kZXggKi8KLQljb25zdCB1bGludCoJb2Zmc2V0cyk7LyohPCBpbjogcmVjX2dldF9v
ZmZzZXRzKHJlYywgaW5kZXgpICovCisJY29uc3QgcmVjX3QqCQlyZWMsCS8qITwgaW46IHJlY29y
ZCAqLworCWNvbnN0IGRpY3RfaW5kZXhfdCoJaW5kZXgsCS8qITwgaW46IGNsdXN0ZXJlZCBpbmRl
eCAqLworCWNvbnN0IHVsaW50KgkJb2Zmc2V0cykvKiE8IGluOiByZWNfZ2V0X29mZnNldHMocmVj
LCBpbmRleCkgKi8KKwlfX2F0dHJpYnV0ZV9fKChub25udWxsLCB3YXJuX3VudXNlZF9yZXN1bHQp
KTsKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKiovLyoqCiBSZWFkcyB0aGUgcm9sbCBwb2ludGVyIGZpZWxkIGZyb20g
YSBjbHVzdGVyZWQgaW5kZXggcmVjb3JkLgogQHJldHVybgl2YWx1ZSBvZiB0aGUgZmllbGQgKi8K
Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MHJvdy5pYycK
LS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzByb3cuaWMJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMTA1MjQwODQyNTEtdmptdWZtc3R6cnltendmZworKysgYi9zdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MHJvdy5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDExMDUyNDEyMDU1Ny03ZzlmenlrYTdwc3dsdnh3CkBAIC0yOCwxNSArMjgsNDUgQEAg
Q3JlYXRlZCA0LzIwLzE5OTYgSGVpa2tpIFR1dXJpCiAjaW5jbHVkZSAidHJ4MHVuZG8uaCIKIAog
LyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKi8vKioKK0dldHMgdGhlIG9mZnNldCBvZiB0cnggaWQgZmllbGQsIGluIGJ5
dGVzIHJlbGF0aXZlIHRvIHRoZSBvcmlnaW4gb2YKK2EgY2x1c3RlcmVkIGluZGV4IHJlY29yZC4K
K0ByZXR1cm4Jb2Zmc2V0IG9mIERBVEFfVFJYX0lEICovCitVTklWX0lOTElORQordWxpbnQKK3Jv
d19nZXRfdHJ4X2lkX29mZnNldF9mdW5jKAorLyo9PT09PT09PT09PT09PT09PT09PT09PSovCisj
aWZkZWYgVU5JVl9ERUJVRworCWNvbnN0IHJlY190KgkJcmVjLAkvKiE8IGluOiByZWNvcmQgKi8K
KyNlbmRpZiAvKiBVTklWX0RFQlVHICovCisJY29uc3QgZGljdF9pbmRleF90KglpbmRleCwJLyoh
PCBpbjogY2x1c3RlcmVkIGluZGV4ICovCisJY29uc3QgdWxpbnQqCQlvZmZzZXRzKS8qITwgaW46
IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4KSAqLworeworCXVsaW50CXBvczsKKwl1bGludAlv
ZmZzZXQ7CisJdWxpbnQJbGVuOworCisJdXRfYWQoZGljdF9pbmRleF9pc19jbHVzdChpbmRleCkp
OworCXV0X2FkKHJlY19vZmZzX3ZhbGlkYXRlKHJlYywgaW5kZXgsIG9mZnNldHMpKTsKKworCXBv
cyA9IGRpY3RfaW5kZXhfZ2V0X3N5c19jb2xfcG9zKGluZGV4LCBEQVRBX1RSWF9JRCk7CisKKwlv
ZmZzZXQgPSByZWNfZ2V0X250aF9maWVsZF9vZmZzKG9mZnNldHMsIHBvcywgJmxlbik7CisKKwl1
dF9hZChsZW4gPT0gREFUQV9UUlhfSURfTEVOKTsKKworCXJldHVybihvZmZzZXQpOworfQorCisv
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqLy8qKgogUmVhZHMgdGhlIHRyeCBpZCBmaWVsZCBmcm9tIGEgY2x1c3RlcmVk
IGluZGV4IHJlY29yZC4KIEByZXR1cm4JdmFsdWUgb2YgdGhlIGZpZWxkICovCiBVTklWX0lOTElO
RQogdHJ4X2lkX3QKIHJvd19nZXRfcmVjX3RyeF9pZCgKIC8qPT09PT09PT09PT09PT09Ki8KLQlj
b25zdCByZWNfdCoJcmVjLAkvKiE8IGluOiByZWNvcmQgKi8KLQlkaWN0X2luZGV4X3QqCWluZGV4
LAkvKiE8IGluOiBjbHVzdGVyZWQgaW5kZXggKi8KLQljb25zdCB1bGludCoJb2Zmc2V0cykvKiE8
IGluOiByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRleCkgKi8KKwljb25zdCByZWNfdCoJCXJlYywJ
LyohPCBpbjogcmVjb3JkICovCisJY29uc3QgZGljdF9pbmRleF90KglpbmRleCwJLyohPCBpbjog
Y2x1c3RlcmVkIGluZGV4ICovCisJY29uc3QgdWxpbnQqCQlvZmZzZXRzKS8qITwgaW46IHJlY19n
ZXRfb2Zmc2V0cyhyZWMsIGluZGV4KSAqLwogewogCXVsaW50CW9mZnNldDsKIAoKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvbG9jay9sb2NrMGxvY2suYycKLS0tIGEvc3RvcmFn
ZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTEwNTI0MDg0MjUxLXZqbXVmbXN0enJ5bXp3ZmcKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9s
b2NrL2xvY2swbG9jay5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTI0MTIw
NTU3LTdnOWZ6eWthN3Bzd2x2eHcKQEAgLTM2MSw2ICszNjEsNyBAQCBpYm9vbAogbG9ja192YWxp
ZGF0ZSh2b2lkKTsKIC8qPT09PT09PT09PT09PT09Ki8KIAorIyBpZmRlZiBVTklWX0RFQlVHX0xP
Q0tfVkFMSURBVEUKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBWYWxpZGF0ZXMgdGhlIHJlY29yZCBsb2Nr
IHF1ZXVlcyBvbiBhIHBhZ2UuCiBAcmV0dXJuCVRSVUUgaWYgb2sgKi8KQEAgLTM2OCwxMyArMzY5
LDkgQEAgc3RhdGljCiBpYm9vbAogbG9ja19yZWNfdmFsaWRhdGVfcGFnZSgKIC8qPT09PT09PT09
PT09PT09PT09PSovCi0JaWJvb2wJbG9ja2VkX2xvY2tfdHJ4X3N5cywJLyohPCBpbjogaWYgdGhl
IGNhbGxlciBob2xkcwotCQkJCQlib3RoIHRoZSBsb2NrIG11dGV4IGFuZAotCQkJCQl0cnhfc3lz
X3QtPmxvY2suICovCi0JdWxpbnQJc3BhY2UsCQkJLyohPCBpbjogc3BhY2UgaWQgKi8KLQl1bGlu
dAl6aXBfc2l6ZSwJCS8qITwgaW46IGNvbXByZXNzZWQgcGFnZSBzaXplCi0JCQkJCWluIGJ5dGVz
IG9yIDAgZm9yIHVuY29tcHJlc3NlZCBwYWdlcyAqLwotCXVsaW50CXBhZ2Vfbm8pOwkJLyohPCBp
bjogcGFnZSBudW1iZXIgKi8KKwljb25zdCBidWZfYmxvY2tfdCoJYmxvY2spCS8qITwgaW46IGJ1
ZmZlciBibG9jayAqLworCV9fYXR0cmlidXRlX18oKG5vbm51bGwsIHdhcm5fdW51c2VkX3Jlc3Vs
dCkpOworIyBlbmRpZiAvKiBVTklWX0RFQlVHX0xPQ0tfVkFMSURBVEUgKi8KICNlbmRpZiAvKiBV
TklWX0RFQlVHICovCiAKIC8qIFRoZSBsb2NrIHN5c3RlbSAqLwpAQCAtMTEzNSwxMCArMTEzMiwx
MCBAQCBsb2NrX3JlY19yZXNldF9udGhfYml0KAogR2V0cyB0aGUgZmlyc3Qgb3IgbmV4dCByZWNv
cmQgbG9jayBvbiBhIHBhZ2UuCiBAcmV0dXJuCW5leHQgbG9jaywgTlVMTCBpZiBub25lIGV4aXN0
cyAqLwogVU5JVl9JTkxJTkUKLWxvY2tfdCoKLWxvY2tfcmVjX2dldF9uZXh0X29uX3BhZ2UoCi0v
Kj09PT09PT09PT09PT09PT09PT09PT0qLwotCWxvY2tfdCoJbG9jaykJLyohPCBpbjogYSByZWNv
cmQgbG9jayAqLworY29uc3QgbG9ja190KgorbG9ja19yZWNfZ2V0X25leHRfb25fcGFnZV9jb25z
dCgKKy8qPT09PT09PT09PT09PT09PT09PT09PT09PT09PSovCisJY29uc3QgbG9ja190Kglsb2Nr
KQkvKiE8IGluOiBhIHJlY29yZCBsb2NrICovCiB7CiAJdWxpbnQJc3BhY2U7CiAJdWxpbnQJcGFn
ZV9ubzsKQEAgLTExNzEsMTIgKzExNjgsMTIgQEAgbG9ja19yZWNfZ2V0X25leHRfb25fcGFnZSgK
IEdldHMgdGhlIGZpcnN0IG9yIG5leHQgcmVjb3JkIGxvY2sgb24gYSBwYWdlLgogQHJldHVybglu
ZXh0IGxvY2ssIE5VTEwgaWYgbm9uZSBleGlzdHMgKi8KIFVOSVZfSU5MSU5FCi1jb25zdCBsb2Nr
X3QqCi1sb2NrX3JlY19nZXRfbmV4dF9vbl9wYWdlX2NvbnN0KAotLyo9PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ki8KLQljb25zdCBsb2NrX3QqCWxvY2spCS8qITwgaW46IGEgcmVjb3JkIGxv
Y2sgKi8KK2xvY2tfdCoKK2xvY2tfcmVjX2dldF9uZXh0X29uX3BhZ2UoCisvKj09PT09PT09PT09
PT09PT09PT09PT0qLworCWxvY2tfdCoJbG9jaykJLyohPCBpbjogYSByZWNvcmQgbG9jayAqLwog
ewotCXJldHVybihsb2NrX3JlY19nZXRfbmV4dF9vbl9wYWdlKChsb2NrX3QqKSBsb2NrKSk7CisJ
cmV0dXJuKChsb2NrX3QqKSBsb2NrX3JlY19nZXRfbmV4dF9vbl9wYWdlX2NvbnN0KGxvY2spKTsK
IH0KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKi8vKioKQEAgLTI3ODAsMTAgKzI3NzcsNyBAQCBsb2NrX21vdmVf
cmVvcmdhbml6ZV9wYWdlKAogCW1lbV9oZWFwX2ZyZWUoaGVhcCk7CiAKICNpZmRlZiBVTklWX0RF
QlVHX0xPQ0tfVkFMSURBVEUKLQl1dF9hZChsb2NrX3JlY192YWxpZGF0ZV9wYWdlKEZBTFNFLAot
CQkJCSAgICAgYnVmX2Jsb2NrX2dldF9zcGFjZShibG9jayksCi0JCQkJICAgICBidWZfYmxvY2tf
Z2V0X3ppcF9zaXplKGJsb2NrKSwKLQkJCQkgICAgIGJ1Zl9ibG9ja19nZXRfcGFnZV9ubyhibG9j
aykpKTsKKwl1dF9hZChsb2NrX3JlY192YWxpZGF0ZV9wYWdlKGJsb2NrKSk7CiAjZW5kaWYKIH0K
IApAQCAtMjg3MSwxNCArMjg2NSw4IEBAIGxvY2tfbW92ZV9yZWNfbGlzdF9lbmQoCiAJbG9ja19t
dXRleF9leGl0KCk7CiAKICNpZmRlZiBVTklWX0RFQlVHX0xPQ0tfVkFMSURBVEUKLQl1dF9hZChs
b2NrX3JlY192YWxpZGF0ZV9wYWdlKEZBTFNFLAotCQkJCSAgICAgYnVmX2Jsb2NrX2dldF9zcGFj
ZShibG9jayksCi0JCQkJICAgICBidWZfYmxvY2tfZ2V0X3ppcF9zaXplKGJsb2NrKSwKLQkJCQkg
ICAgIGJ1Zl9ibG9ja19nZXRfcGFnZV9ubyhibG9jaykpKTsKLQl1dF9hZChsb2NrX3JlY192YWxp
ZGF0ZV9wYWdlKEZBTFNFLAotCQkJCSAgICAgYnVmX2Jsb2NrX2dldF9zcGFjZShuZXdfYmxvY2sp
LAotCQkJCSAgICAgYnVmX2Jsb2NrX2dldF96aXBfc2l6ZShibG9jayksCi0JCQkJICAgICBidWZf
YmxvY2tfZ2V0X3BhZ2Vfbm8obmV3X2Jsb2NrKSkpOworCXV0X2FkKGxvY2tfcmVjX3ZhbGlkYXRl
X3BhZ2UoYmxvY2spKTsKKwl1dF9hZChsb2NrX3JlY192YWxpZGF0ZV9wYWdlKG5ld19ibG9jaykp
OwogI2VuZGlmCiB9CiAKQEAgLTI5ODcsMTAgKzI5NzUsNyBAQCBsb2NrX21vdmVfcmVjX2xpc3Rf
c3RhcnQoCiAJbG9ja19tdXRleF9leGl0KCk7CiAKICNpZmRlZiBVTklWX0RFQlVHX0xPQ0tfVkFM
SURBVEUKLQl1dF9hZChsb2NrX3JlY192YWxpZGF0ZV9wYWdlKEZBTFNFLAotCQkJCSAgICAgYnVm
X2Jsb2NrX2dldF9zcGFjZShibG9jayksCi0JCQkJICAgICBidWZfYmxvY2tfZ2V0X3ppcF9zaXpl
KGJsb2NrKSwKLQkJCQkgICAgIGJ1Zl9ibG9ja19nZXRfcGFnZV9ubyhibG9jaykpKTsKKwl1dF9h
ZChsb2NrX3JlY192YWxpZGF0ZV9wYWdlKGJsb2NrKSk7CiAjZW5kaWYKIH0KIApAQCAtNDA3NSwx
NyArNDA2MCwxOCBAQCBDaGVja3MgaWYgb3RoZXIgdHJhbnNhY3Rpb25zIGhhdmUgYW4gaW5jCiB0
aGUgbG9jayBxdWV1ZS4KIEByZXR1cm4JbG9jayBvciBOVUxMICovCiBVTklWX0lOTElORQotbG9j
a190KgorY29uc3QgbG9ja190KgogbG9ja190YWJsZV9vdGhlcl9oYXNfaW5jb21wYXRpYmxlKAog
Lyo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0qLwotCXRyeF90KgkJdHJ4LAkvKiE8IGlu
OiB0cmFuc2FjdGlvbiwgb3IgTlVMTCBpZiBhbGwKLQkJCQl0cmFuc2FjdGlvbnMgc2hvdWxkIGJl
IGluY2x1ZGVkICovCi0JdWxpbnQJCXdhaXQsCS8qITwgaW46IExPQ0tfV0FJVCBpZiBhbHNvIHdh
aXRpbmcgbG9ja3MgYXJlCi0JCQkJdGFrZW4gaW50byBhY2NvdW50LCBvciAwIGlmIG5vdCAqLwot
CWRpY3RfdGFibGVfdCoJdGFibGUsCS8qITwgaW46IHRhYmxlICovCi0JZW51bSBsb2NrX21vZGUJ
bW9kZSkJLyohPCBpbjogbG9jayBtb2RlICovCisJY29uc3QgdHJ4X3QqCQl0cngsCS8qITwgaW46
IHRyYW5zYWN0aW9uLCBvciBOVUxMIGlmIGFsbAorCQkJCQl0cmFuc2FjdGlvbnMgc2hvdWxkIGJl
IGluY2x1ZGVkICovCisJdWxpbnQJCQl3YWl0LAkvKiE8IGluOiBMT0NLX1dBSVQgaWYgYWxzbwor
CQkJCQl3YWl0aW5nIGxvY2tzIGFyZSB0YWtlbiBpbnRvCisJCQkJCWFjY291bnQsIG9yIDAgaWYg
bm90ICovCisJY29uc3QgZGljdF90YWJsZV90Kgl0YWJsZSwJLyohPCBpbjogdGFibGUgKi8KKwll
bnVtIGxvY2tfbW9kZQkJbW9kZSkJLyohPCBpbjogbG9jayBtb2RlICovCiB7Ci0JbG9ja190KgkJ
bG9jazsKKwljb25zdCBsb2NrX3QqCWxvY2s7CiAKIAl1dF9hZChsb2NrX211dGV4X293bigpKTsK
IApAQCAtNDEyMSw3ICs0MTA3LDcgQEAgbG9ja190YWJsZSgKIHsKIAl0cnhfdCoJCXRyeDsKIAl1
bGludAkJZXJyOwotCWxvY2tfdCoJCWxvY2s7CisJY29uc3QgbG9ja190Kglsb2NrOwogCiAJdXRf
YWQodGFibGUgJiYgdGhyKTsKIApAQCAtNTA4MCw5ICs1MDY2LDkgQEAgc3RhdGljCiBpYm9vbAog
bG9ja190YWJsZV9xdWV1ZV92YWxpZGF0ZSgKIC8qPT09PT09PT09PT09PT09PT09PT09PSovCi0J
ZGljdF90YWJsZV90Kgl0YWJsZSkJLyohPCBpbjogdGFibGUgKi8KKwljb25zdCBkaWN0X3RhYmxl
X3QqCXRhYmxlKQkvKiE8IGluOiB0YWJsZSAqLwogewotCWxvY2tfdCoJCWxvY2s7CisJY29uc3Qg
bG9ja190Kglsb2NrOwogCiAJdXRfYWQobG9ja19tdXRleF9vd24oKSk7CiAjaWZkZWYgVU5JVl9T
WU5DX0RFQlVHCkBAIC01MTI4LDcgKzUxMTQsNyBAQCBsb2NrX3JlY19xdWV1ZV92YWxpZGF0ZSgK
IAkJCQkJdHJ4X3N5c190LT5sb2NrLiAqLwogCWNvbnN0IGJ1Zl9ibG9ja190KglibG9jaywJLyoh
PCBpbjogYnVmZmVyIGJsb2NrIGNvbnRhaW5pbmcgcmVjICovCiAJY29uc3QgcmVjX3QqCQlyZWMs
CS8qITwgaW46IHJlY29yZCB0byBsb29rIGF0ICovCi0JZGljdF9pbmRleF90KgkJaW5kZXgsCS8q
ITwgaW46IGluZGV4LCBvciBOVUxMIGlmIG5vdCBrbm93biAqLworCWNvbnN0IGRpY3RfaW5kZXhf
dCoJaW5kZXgsCS8qITwgaW46IGluZGV4LCBvciBOVUxMIGlmIG5vdCBrbm93biAqLwogCWNvbnN0
IHVsaW50KgkJb2Zmc2V0cykvKiE8IGluOiByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRleCkgKi8K
IHsKIAljb25zdCB0cnhfdCoJaW1wbF90cng7CkBAIC01MjM1LDU5ICs1MjIxLDMwIEBAIGZ1bmNf
ZXhpdDoKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKiovLyoqCiBWYWxpZGF0ZXMgdGhlIHJlY29yZCBsb2NrIHF1ZXVl
cyBvbiBhIHBhZ2UuCiBAcmV0dXJuCVRSVUUgaWYgb2sgKi8KLXN0YXRpYworc3RhdGljIF9fYXR0
cmlidXRlX18oKG5vbm51bGwsIHdhcm5fdW51c2VkX3Jlc3VsdCkpCiBpYm9vbAotbG9ja19yZWNf
dmFsaWRhdGVfcGFnZSgKLS8qPT09PT09PT09PT09PT09PT09PSovCi0JaWJvb2wJbG9ja2VkX2xv
Y2tfdHJ4X3N5cywJLyohPCBpbjogaWYgdGhlIGNhbGxlciBob2xkcwotCQkJCQlib3RoIHRoZSBs
b2NrIG11dGV4IGFuZAotCQkJCQl0cnhfc3lzX3QtPmxvY2suICovCi0JdWxpbnQJc3BhY2UsCQkJ
LyohPCBpbjogc3BhY2UgaWQgKi8KLQl1bGludAl6aXBfc2l6ZSwJCS8qITwgaW46IGNvbXByZXNz
ZWQgcGFnZSBzaXplCi0JCQkJCWluIGJ5dGVzIG9yIDAgZm9yIHVuY29tcHJlc3NlZCBwYWdlcyAq
LwotCXVsaW50CXBhZ2Vfbm8pCQkvKiE8IGluOiBwYWdlIG51bWJlciAqLworbG9ja19yZWNfdmFs
aWRhdGVfcGFnZV9sb3coCisvKj09PT09PT09PT09PT09PT09PT09PT09Ki8KKwljb25zdCBidWZf
YmxvY2tfdCoJYmxvY2spCS8qITwgaW46IGJ1ZmZlciBibG9jayAqLwogewotCWRpY3RfaW5kZXhf
dCoJaW5kZXg7Ci0JYnVmX2Jsb2NrX3QqCWJsb2NrOwotCWNvbnN0IHBhZ2VfdCoJcGFnZTsKIAlj
b25zdCBsb2NrX3QqCWxvY2s7CiAJY29uc3QgcmVjX3QqCXJlYzsKIAl1bGludAkJbnRoX2xvY2sJ
PSAwOwogCXVsaW50CQludGhfYml0CQk9IDA7CiAJdWxpbnQJCWk7Ci0JbXRyX3QJCW10cjsKIAlt
ZW1faGVhcF90KgloZWFwCQk9IE5VTEw7CiAJdWxpbnQJCW9mZnNldHNfW1JFQ19PRkZTX05PUk1B
TF9TSVpFXTsKIAl1bGludCoJCW9mZnNldHMJCT0gb2Zmc2V0c187CiAJcmVjX29mZnNfaW5pdChv
ZmZzZXRzXyk7CiAKLQkvKiBUaGlzIGlzIHRvIHByZXNlcnZlIGxhdGNoaW5nIG9yZGVyLiAqLwot
CWlmIChsb2NrZWRfbG9ja190cnhfc3lzKSB7Ci0JCWxvY2tfbXV0ZXhfZXhpdCgpOwotCQlyd19s
b2NrX3NfdW5sb2NrKCZ0cnhfc3lzLT5sb2NrKTsKLQl9Ci0KLQl1dF9hZCghbG9ja19tdXRleF9v
d24oKSk7CisJdXRfYWQobG9ja19tdXRleF9vd24oKSk7CiAjaWZkZWYgVU5JVl9TWU5DX0RFQlVH
Ci0JdXRfYWQoIXJ3X2xvY2tfb3duKCZ0cnhfc3lzLT5sb2NrLCBSV19MT0NLX1NIQVJFRCkpOwot
CXV0X2FkKCFyd19sb2NrX293bigmdHJ4X3N5cy0+bG9jaywgUldfTE9DS19FWCkpOworCXV0X2Fk
KHJ3X2xvY2tfb3duKCZ0cnhfc3lzLT5sb2NrLCBSV19MT0NLX1NIQVJFRCkpOwogI2VuZGlmIC8q
IFVOSVZfU1lOQ19ERUJVRyAqLwogCi0JbXRyX3N0YXJ0KCZtdHIpOwotCi0JdXRfYWQoemlwX3Np
emUgIT0gVUxJTlRfVU5ERUZJTkVEKTsKLQlibG9jayA9IGJ1Zl9wYWdlX2dldChzcGFjZSwgemlw
X3NpemUsIHBhZ2Vfbm8sIFJXX1hfTEFUQ0gsICZtdHIpOwotCWJ1Zl9ibG9ja19kYmdfYWRkX2xl
dmVsKGJsb2NrLCBTWU5DX05PX09SREVSX0NIRUNLKTsKLQotCXBhZ2UgPSBibG9jay0+ZnJhbWU7
Ci0KLQkvKiBFaXRoZXIgd2F5IHdlIG5lZWQgdG8gKHJlKWFjcXVpcmUgdGhlIG11dGV4ZXMuICov
Ci0JbG9ja19tdXRleF9lbnRlcigpOwotCi0JcndfbG9ja19zX2xvY2soJnRyeF9zeXMtPmxvY2sp
OwotCiBsb29wOgotCWxvY2sgPSBsb2NrX3JlY19nZXRfZmlyc3Rfb25fcGFnZV9hZGRyKHNwYWNl
LCBwYWdlX25vKTsKKwlsb2NrID0gbG9ja19yZWNfZ2V0X2ZpcnN0X29uX3BhZ2VfYWRkcihidWZf
YmxvY2tfZ2V0X3NwYWNlKGJsb2NrKSwKKwkJCQkJICAgICAgIGJ1Zl9ibG9ja19nZXRfcGFnZV9u
byhibG9jaykpOwogCiAJaWYgKCFsb2NrKSB7CiAJCWdvdG8gZnVuY3Rpb25fZXhpdDsKQEAgLTUz
MTUsMTUgKzUyNzIsMTQgQEAgbG9vcDoKIAogCQlpZiAoaSA9PSAxIHx8IGxvY2tfcmVjX2dldF9u
dGhfYml0KGxvY2ssIGkpKSB7CiAKLQkJCWluZGV4ID0gbG9jay0+aW5kZXg7Ci0JCQlyZWMgPSBw
YWdlX2ZpbmRfcmVjX3dpdGhfaGVhcF9ubyhwYWdlLCBpKTsKKwkJCXJlYyA9IHBhZ2VfZmluZF9y
ZWNfd2l0aF9oZWFwX25vKGJsb2NrLT5mcmFtZSwgaSk7CiAJCQl1dF9hKHJlYyk7Ci0JCQlvZmZz
ZXRzID0gcmVjX2dldF9vZmZzZXRzKHJlYywgaW5kZXgsIG9mZnNldHMsCisJCQlvZmZzZXRzID0g
cmVjX2dldF9vZmZzZXRzKHJlYywgbG9jay0+aW5kZXgsIG9mZnNldHMsCiAJCQkJCQkgIFVMSU5U
X1VOREVGSU5FRCwgJmhlYXApOwogI2lmIDAKIAkJCWZwcmludGYoc3RkZXJyLAotCQkJCSJWYWxp
ZGF0aW5nICVsdSAlbHVcbiIsCi0JCQkJKHVsb25nKSBzcGFjZSwgKHVsb25nKSBwYWdlX25vKTsK
KwkJCQkiVmFsaWRhdGluZyAldSAldVxuIiwKKwkJCQlibG9jay0+cGFnZS5zcGFjZSwgYmxvY2st
PnBhZ2Uub2Zmc2V0KTsKICNlbmRpZgogCQkJLyogSWYgdGhpcyB0aHJlYWQgaXMgaG9sZGluZyB0
aGUgZmlsZSBzcGFjZQogCQkJbGF0Y2ggKGZpbF9zcGFjZV90OjpsYXRjaCksIHRoZSBmb2xsb3dp
bmcKQEAgLTUzMzEsNyArNTI4Nyw3IEBAIGxvb3A6CiAJCQljYXVzZSBhIGRlYWRsb2NrIG9mIHRo
cmVhZHMuICovCiAKIAkJCWxvY2tfcmVjX3F1ZXVlX3ZhbGlkYXRlKAotCQkJCVRSVUUsIGJsb2Nr
LCByZWMsIGluZGV4LCBvZmZzZXRzKTsKKwkJCQlUUlVFLCBibG9jaywgcmVjLCBsb2NrLT5pbmRl
eCwgb2Zmc2V0cyk7CiAKIAkJCW50aF9iaXQgPSBpICsgMTsKIApAQCAtNTM0NSwyMCArNTMwMSwz
NCBAQCBsb29wOgogCWdvdG8gbG9vcDsKIAogZnVuY3Rpb25fZXhpdDoKLQotCW10cl9jb21taXQo
Jm10cik7Ci0KLQlpZiAoIWxvY2tlZF9sb2NrX3RyeF9zeXMpIHsKLQkJbG9ja19tdXRleF9leGl0
KCk7Ci0JCXJ3X2xvY2tfc191bmxvY2soJnRyeF9zeXMtPmxvY2spOwotCX0KLQogCWlmIChVTklW
X0xJS0VMWV9OVUxMKGhlYXApKSB7CiAJCW1lbV9oZWFwX2ZyZWUoaGVhcCk7CiAJfQogCXJldHVy
bihUUlVFKTsKIH0KIAorI2lmZGVmIFVOSVZfREVCVUdfTE9DS19WQUxJREFURQorLyoqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKi8vKioKK1ZhbGlkYXRlcyB0aGUgcmVjb3JkIGxvY2sgcXVldWVzIG9uIGEgcGFnZS4KK0By
ZXR1cm4JVFJVRSBpZiBvayAqLworc3RhdGljCitpYm9vbAorbG9ja19yZWNfdmFsaWRhdGVfcGFn
ZSgKKy8qPT09PT09PT09PT09PT09PT09PSovCisJY29uc3QgYnVmX2Jsb2NrX3QqCWJsb2NrKQkv
KiE8IGluOiBidWZmZXIgYmxvY2sgKi8KK3sKKwlpYm9vbAl2YWxpZDsKKworCWxvY2tfbXV0ZXhf
ZW50ZXIoKTsKKwlyd19sb2NrX3NfbG9jaygmdHJ4X3N5cy0+bG9jayk7CisJdmFsaWQgPSBsb2Nr
X3JlY192YWxpZGF0ZV9wYWdlX2xvdyhibG9jayk7CisJbG9ja19tdXRleF9leGl0KCk7CisJcndf
bG9ja19zX3VubG9jaygmdHJ4X3N5cy0+bG9jayk7CisKKwlyZXR1cm4odmFsaWQpOworfQorI2Vu
ZGlmIC8qIFVOSVZfREVCVUdfTE9DS19WQUxJREFURSAqLworCiAvKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgog
VmFsaWRhdGVzIHRoZSBsb2NrIHN5c3RlbS4KIEByZXR1cm4JVFJVRSBpZiBvayAqLwpAQCAtNTM2
OSw4ICs1MzM5LDYgQEAgbG9ja192YWxpZGF0ZSh2b2lkKQogewogCWNvbnN0IGxvY2tfdCoJbG9j
azsKIAljb25zdCB0cnhfdCoJdHJ4OwotCXVsaW50CQlzcGFjZTsKLQl1bGludAkJcGFnZV9ubzsK
IAl1bGludAkJaTsKIAogCWxvY2tfbXV0ZXhfZW50ZXIoKTsKQEAgLTUzOTYsOSArNTM2NCwxMyBA
QCBsb2NrX3ZhbGlkYXRlKHZvaWQpCiAJfQogCiAJZm9yIChpID0gMDsgaSA8IGhhc2hfZ2V0X25f
Y2VsbHMobG9ja19zeXMtPnJlY19oYXNoKTsgaSsrKSB7Ci0JCWliX3VpbnQ2NF90CWxpbWl0ID0g
MDsgCisJCXVsaW50CQlzcGFjZTsKKwkJdWxpbnQJCXBhZ2Vfbm87CisJCWliX3VpbnQ2NF90CWxp
bWl0CT0gMDsKIAogCQlmb3IgKDs7KSB7CisJCQltdHJfdAkJbXRyOworCQkJYnVmX2Jsb2NrX3Qq
CWJsb2NrOwogCiAJCQlmb3IgKGxvY2sgPSBIQVNIX0dFVF9GSVJTVChsb2NrX3N5cy0+cmVjX2hh
c2gsIGkpOwogCQkJICAgICBsb2NrICE9IE5VTEw7CkBAIC01NDE5LDExICs1MzkxLDE2IEBAIGxv
Y2tfdmFsaWRhdGUodm9pZCkKIAkJCQlicmVhazsKIAkJCX0KIAotCQkJbG9ja19yZWNfdmFsaWRh
dGVfcGFnZSgKLQkJCQlUUlVFLCBzcGFjZSwKLQkJCQlmaWxfc3BhY2VfZ2V0X3ppcF9zaXplKHNw
YWNlKSwgcGFnZV9ubyk7CisJCQltdHJfc3RhcnQoJm10cik7CisJCQlibG9jayA9IGJ1Zl9wYWdl
X2dldCgKKwkJCQlzcGFjZSwgZmlsX3NwYWNlX2dldF96aXBfc2l6ZShzcGFjZSksCisJCQkJcGFn
ZV9ubywgUldfWF9MQVRDSCwgJm10cik7CisJCQlidWZfYmxvY2tfZGJnX2FkZF9sZXZlbChibG9j
aywgU1lOQ19OT19PUkRFUl9DSEVDSyk7CisKKwkJCXV0X2FkKGxvY2tfcmVjX3ZhbGlkYXRlX3Bh
Z2VfbG93KGJsb2NrKSk7CisJCQltdHJfY29tbWl0KCZtdHIpOwogCi0JCQlsaW1pdCA9IHV0X3Vs
bF9jcmVhdGUoc3BhY2UsIHBhZ2Vfbm8gKyAxKTsKKwkJCWxpbWl0Kys7CiAJCX0KIAl9CiAKCj09
PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmMnCi0tLSBhL3N0
b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDExMDUyNDA4NDI1MS12am11Zm1zdHpyeW16d2ZnCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uv
cm93L3JvdzByb3cuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUyNDEyMDU1
Ny03ZzlmenlrYTdwc3dsdnh3CkBAIC00NywzNSArNDcsNiBAQCBDcmVhdGVkIDQvMjAvMTk5NiBI
ZWlra2kgVHV1cmkKICNpbmNsdWRlICJyZWFkMHJlYWQuaCIKICNpbmNsdWRlICJ1dDBtZW0uaCIK
IAotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKi8vKioKLUdldHMgdGhlIG9mZnNldCBvZiB0cnggaWQgZmllbGQsIGlu
IGJ5dGVzIHJlbGF0aXZlIHRvIHRoZSBvcmlnaW4gb2YKLWEgY2x1c3RlcmVkIGluZGV4IHJlY29y
ZC4KLUByZXR1cm4Jb2Zmc2V0IG9mIERBVEFfVFJYX0lEICovCi1VTklWX0lOVEVSTgotdWxpbnQK
LXJvd19nZXRfdHJ4X2lkX29mZnNldCgKLS8qPT09PT09PT09PT09PT09PT09Ki8KLQljb25zdCBy
ZWNfdCoJcmVjIF9fYXR0cmlidXRlX18oKHVudXNlZCkpLAotCQkJCS8qITwgaW46IHJlY29yZCAq
LwotCWRpY3RfaW5kZXhfdCoJaW5kZXgsCS8qITwgaW46IGNsdXN0ZXJlZCBpbmRleCAqLwotCWNv
bnN0IHVsaW50KglvZmZzZXRzKS8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4KSAq
LwotewotCXVsaW50CXBvczsKLQl1bGludAlvZmZzZXQ7Ci0JdWxpbnQJbGVuOwotCi0JdXRfYWQo
ZGljdF9pbmRleF9pc19jbHVzdChpbmRleCkpOwotCXV0X2FkKHJlY19vZmZzX3ZhbGlkYXRlKHJl
YywgaW5kZXgsIG9mZnNldHMpKTsKLQotCXBvcyA9IGRpY3RfaW5kZXhfZ2V0X3N5c19jb2xfcG9z
KGluZGV4LCBEQVRBX1RSWF9JRCk7Ci0KLQlvZmZzZXQgPSByZWNfZ2V0X250aF9maWVsZF9vZmZz
KG9mZnNldHMsIHBvcywgJmxlbik7Ci0KLQl1dF9hZChsZW4gPT0gREFUQV9UUlhfSURfTEVOKTsK
LQotCXJldHVybihvZmZzZXQpOwotfQotCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBXaGVuIGFuIGluc2VydCBv
ciBwdXJnZSB0byBhIHRhYmxlIGlzIHBlcmZvcm1lZCwgdGhpcyBmdW5jdGlvbiBidWlsZHMKIHRo
ZSBlbnRyeSB0byBiZSBpbnNlcnRlZCBpbnRvIG9yIHB1cmdlZCBmcm9tIGFuIGluZGV4IG9uIHRo
ZSB0YWJsZS4KCg==

--===============1682471095==
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-trunk/
# testament_sha1: f9d2a5e6495daad7f6933b5114bd697626688fa5
# timestamp: 2011-05-24 15:08:09 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/
# base_revision_id: marko.makela@stripped\
#   vjmufmstzrymzwfg
# 
# Begin bundle
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
5LYA


--===============1682471095==--