From: marko.makela
Date: May 24 2011 12:07pm
Subject: bzr commit into mysql-trunk branch (marko.makela:3103)
List-Archive: http://lists.mysql.com/commits/137979
Message-Id: <201105241207.p4OC7MxB029433@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0799915488=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC10cnVuay8g
YmFzZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MjQwODQyNTEtdmpt
dWZtc3R6cnltendmZwoKIDMxMDMgTWFya28gTcOka2Vsw6QJMjAxMS0wNS0yNCBbbWVyZ2VdCiAg
ICAgIE1lcmdlIG15c3FsLTUuNSB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2xvY2swcHJpdi5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jh
c2UvaW5jbHVkZS9sb2NrMHByaXYuaWMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3Jv
dzByb3cuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MHJvdy5pYwogICAgICBz
dG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9y
b3cvcm93MHJvdy5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv
bG9jazBwcml2LmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9sb2NrMHByaXYuaAly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUyNDA4NDI1MS12am11Zm1zdHpyeW16
d2ZnCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9sb2NrMHByaXYuaAlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUyNDEyMDU1Ny03ZzlmenlrYTdwc3dsdnh3CkBAIC0x
MTgsOSArMTE4LDEwIEBAIFVOSVZfSU5MSU5FCiB0cnhfaWRfdAogbG9ja19jbHVzdF9yZWNfc29t
ZV9oYXNfaW1wbCgKIC8qPT09PT09PT09PT09PT09PT09PT09PT09PSovCi0JY29uc3QgcmVjX3Qq
CXJlYywJCS8qITwgaW46IHVzZXIgcmVjb3JkICovCi0JZGljdF9pbmRleF90KglpbmRleCwJCS8q
ITwgaW46IGNsdXN0ZXJlZCBpbmRleCAqLwotCWNvbnN0IHVsaW50KglvZmZzZXRzKTsJLyohPCBp
bjogcmVjX2dldF9vZmZzZXRzKHJlYywgaW5kZXgpICovCisJY29uc3QgcmVjX3QqCQlyZWMsCS8q
ITwgaW46IHVzZXIgcmVjb3JkICovCisJY29uc3QgZGljdF9pbmRleF90KglpbmRleCwJLyohPCBp
bjogY2x1c3RlcmVkIGluZGV4ICovCisJY29uc3QgdWxpbnQqCQlvZmZzZXRzKS8qITwgaW46IHJl
Y19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4KSAqLworCV9fYXR0cmlidXRlX18oKG5vbm51bGwsIHdh
cm5fdW51c2VkX3Jlc3VsdCkpOwogCiAjaWZuZGVmIFVOSVZfTk9OSU5MCiAjaW5jbHVkZSAibG9j
azBwcml2LmljIgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9s
b2NrMHByaXYuaWMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9sb2NrMHByaXYuaWMJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MjQwODQyNTEtdmptdWZtc3R6cnlt
endmZworKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvbG9jazBwcml2LmljCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTI0MTIwNTU3LTdnOWZ6eWthN3Bzd2x2eHcKQEAg
LTU0LDkgKzU0LDkgQEAgVU5JVl9JTkxJTkUKIHRyeF9pZF90CiBsb2NrX2NsdXN0X3JlY19zb21l
X2hhc19pbXBsKAogLyo9PT09PT09PT09PT09PT09PT09PT09PT09Ki8KLQljb25zdCByZWNfdCoJ
cmVjLAkvKiE8IGluOiB1c2VyIHJlY29yZCAqLwotCWRpY3RfaW5kZXhfdCoJaW5kZXgsCS8qITwg
aW46IGNsdXN0ZXJlZCBpbmRleCAqLwotCWNvbnN0IHVsaW50KglvZmZzZXRzKS8qITwgaW46IHJl
Y19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4KSAqLworCWNvbnN0IHJlY190KgkJcmVjLAkvKiE8IGlu
OiB1c2VyIHJlY29yZCAqLworCWNvbnN0IGRpY3RfaW5kZXhfdCoJaW5kZXgsCS8qITwgaW46IGNs
dXN0ZXJlZCBpbmRleCAqLworCWNvbnN0IHVsaW50KgkJb2Zmc2V0cykvKiE8IGluOiByZWNfZ2V0
X29mZnNldHMocmVjLCBpbmRleCkgKi8KIHsKIAl1dF9hZChkaWN0X2luZGV4X2lzX2NsdXN0KGlu
ZGV4KSk7CiAJdXRfYWQocGFnZV9yZWNfaXNfdXNlcl9yZWMocmVjKSk7Cgo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzByb3cuaCcKLS0tIGEvc3RvcmFnZS9p
bm5vYmFzZS9pbmNsdWRlL3JvdzByb3cuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDExMDUyNDA4NDI1MS12am11Zm1zdHpyeW16d2ZnCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5j
bHVkZS9yb3cwcm93LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MjQxMjA1
NTctN2c5Znp5a2E3cHN3bHZ4dwpAQCAtNDEsMTMgKzQxLDI0IEBAIENyZWF0ZWQgNC8yMC8xOTk2
IEhlaWtraSBUdXVyaQogR2V0cyB0aGUgb2Zmc2V0IG9mIHRoZSB0cnggaWQgZmllbGQsIGluIGJ5
dGVzIHJlbGF0aXZlIHRvIHRoZSBvcmlnaW4gb2YKIGEgY2x1c3RlcmVkIGluZGV4IHJlY29yZC4K
IEByZXR1cm4Jb2Zmc2V0IG9mIERBVEFfVFJYX0lEICovCi1VTklWX0lOVEVSTgorVU5JVl9JTkxJ
TkUKIHVsaW50Ci1yb3dfZ2V0X3RyeF9pZF9vZmZzZXQoCi0vKj09PT09PT09PT09PT09PT09PSov
Ci0JY29uc3QgcmVjX3QqCXJlYywJLyohPCBpbjogcmVjb3JkICovCi0JZGljdF9pbmRleF90Kglp
bmRleCwJLyohPCBpbjogY2x1c3RlcmVkIGluZGV4ICovCi0JY29uc3QgdWxpbnQqCW9mZnNldHMp
Oy8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4KSAqLworcm93X2dldF90cnhfaWRf
b2Zmc2V0X2Z1bmMoCisvKj09PT09PT09PT09PT09PT09PT09PT09Ki8KKyNpZmRlZiBVTklWX0RF
QlVHCisJY29uc3QgcmVjX3QqCQlyZWMsCS8qITwgaW46IHJlY29yZCAqLworI2VuZGlmIC8qIFVO
SVZfREVCVUcgKi8KKwljb25zdCBkaWN0X2luZGV4X3QqCWluZGV4LAkvKiE8IGluOiBjbHVzdGVy
ZWQgaW5kZXggKi8KKwljb25zdCB1bGludCoJCW9mZnNldHMpLyohPCBpbjogcmVjX2dldF9vZmZz
ZXRzKHJlYywgaW5kZXgpICovCisJX19hdHRyaWJ1dGVfXygobm9ubnVsbCwgd2Fybl91bnVzZWRf
cmVzdWx0KSk7CisjaWZkZWYgVU5JVl9ERUJVRworIyBkZWZpbmUgcm93X2dldF90cnhfaWRfb2Zm
c2V0KHJlYywgaW5kZXgsIG9mZnNldHMpCVwKKwlyb3dfZ2V0X3RyeF9pZF9vZmZzZXRfZnVuYyhy
ZWMsIGluZGV4LCBvZmZzZXRzKQorI2Vsc2UgLyogVU5JVl9ERUJVRyAqLworIyBkZWZpbmUgcm93
X2dldF90cnhfaWRfb2Zmc2V0KHJlYywgaW5kZXgsIG9mZnNldHMpCVwKKwlyb3dfZ2V0X3RyeF9p
ZF9vZmZzZXRfZnVuYyhpbmRleCwgb2Zmc2V0cykKKyNlbmRpZiAvKiBVTklWX0RFQlVHICovCisK
IC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKiovLyoqCiBSZWFkcyB0aGUgdHJ4IGlkIGZpZWxkIGZyb20gYSBjbHVzdGVy
ZWQgaW5kZXggcmVjb3JkLgogQHJldHVybgl2YWx1ZSBvZiB0aGUgZmllbGQgKi8KQEAgLTU1LDkg
KzY2LDEwIEBAIFVOSVZfSU5MSU5FCiB0cnhfaWRfdAogcm93X2dldF9yZWNfdHJ4X2lkKAogLyo9
PT09PT09PT09PT09PT0qLwotCWNvbnN0IHJlY190KglyZWMsCS8qITwgaW46IHJlY29yZCAqLwot
CWRpY3RfaW5kZXhfdCoJaW5kZXgsCS8qITwgaW46IGNsdXN0ZXJlZCBpbmRleCAqLwotCWNvbnN0
IHVsaW50KglvZmZzZXRzKTsvKiE8IGluOiByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRleCkgKi8K
Kwljb25zdCByZWNfdCoJCXJlYywJLyohPCBpbjogcmVjb3JkICovCisJY29uc3QgZGljdF9pbmRl
eF90KglpbmRleCwJLyohPCBpbjogY2x1c3RlcmVkIGluZGV4ICovCisJY29uc3QgdWxpbnQqCQlv
ZmZzZXRzKS8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4KSAqLworCV9fYXR0cmli
dXRlX18oKG5vbm51bGwsIHdhcm5fdW51c2VkX3Jlc3VsdCkpOwogLyoqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioK
IFJlYWRzIHRoZSByb2xsIHBvaW50ZXIgZmllbGQgZnJvbSBhIGNsdXN0ZXJlZCBpbmRleCByZWNv
cmQuCiBAcmV0dXJuCXZhbHVlIG9mIHRoZSBmaWVsZCAqLwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cwcm93LmljJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvcm93MHJvdy5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUy
NDA4NDI1MS12am11Zm1zdHpyeW16d2ZnCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9y
b3cwcm93LmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTI0MTIwNTU3LTdn
OWZ6eWthN3Bzd2x2eHcKQEAgLTI4LDE1ICsyOCw0NSBAQCBDcmVhdGVkIDQvMjAvMTk5NiBIZWlr
a2kgVHV1cmkKICNpbmNsdWRlICJ0cngwdW5kby5oIgogCiAvKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgorR2V0
cyB0aGUgb2Zmc2V0IG9mIHRyeCBpZCBmaWVsZCwgaW4gYnl0ZXMgcmVsYXRpdmUgdG8gdGhlIG9y
aWdpbiBvZgorYSBjbHVzdGVyZWQgaW5kZXggcmVjb3JkLgorQHJldHVybglvZmZzZXQgb2YgREFU
QV9UUlhfSUQgKi8KK1VOSVZfSU5MSU5FCit1bGludAorcm93X2dldF90cnhfaWRfb2Zmc2V0X2Z1
bmMoCisvKj09PT09PT09PT09PT09PT09PT09PT09Ki8KKyNpZmRlZiBVTklWX0RFQlVHCisJY29u
c3QgcmVjX3QqCQlyZWMsCS8qITwgaW46IHJlY29yZCAqLworI2VuZGlmIC8qIFVOSVZfREVCVUcg
Ki8KKwljb25zdCBkaWN0X2luZGV4X3QqCWluZGV4LAkvKiE8IGluOiBjbHVzdGVyZWQgaW5kZXgg
Ki8KKwljb25zdCB1bGludCoJCW9mZnNldHMpLyohPCBpbjogcmVjX2dldF9vZmZzZXRzKHJlYywg
aW5kZXgpICovCit7CisJdWxpbnQJcG9zOworCXVsaW50CW9mZnNldDsKKwl1bGludAlsZW47CisK
Kwl1dF9hZChkaWN0X2luZGV4X2lzX2NsdXN0KGluZGV4KSk7CisJdXRfYWQocmVjX29mZnNfdmFs
aWRhdGUocmVjLCBpbmRleCwgb2Zmc2V0cykpOworCisJcG9zID0gZGljdF9pbmRleF9nZXRfc3lz
X2NvbF9wb3MoaW5kZXgsIERBVEFfVFJYX0lEKTsKKworCW9mZnNldCA9IHJlY19nZXRfbnRoX2Zp
ZWxkX29mZnMob2Zmc2V0cywgcG9zLCAmbGVuKTsKKworCXV0X2FkKGxlbiA9PSBEQVRBX1RSWF9J
RF9MRU4pOworCisJcmV0dXJuKG9mZnNldCk7Cit9CisKKy8qKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBSZWFk
cyB0aGUgdHJ4IGlkIGZpZWxkIGZyb20gYSBjbHVzdGVyZWQgaW5kZXggcmVjb3JkLgogQHJldHVy
bgl2YWx1ZSBvZiB0aGUgZmllbGQgKi8KIFVOSVZfSU5MSU5FCiB0cnhfaWRfdAogcm93X2dldF9y
ZWNfdHJ4X2lkKAogLyo9PT09PT09PT09PT09PT0qLwotCWNvbnN0IHJlY190KglyZWMsCS8qITwg
aW46IHJlY29yZCAqLwotCWRpY3RfaW5kZXhfdCoJaW5kZXgsCS8qITwgaW46IGNsdXN0ZXJlZCBp
bmRleCAqLwotCWNvbnN0IHVsaW50KglvZmZzZXRzKS8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhy
ZWMsIGluZGV4KSAqLworCWNvbnN0IHJlY190KgkJcmVjLAkvKiE8IGluOiByZWNvcmQgKi8KKwlj
b25zdCBkaWN0X2luZGV4X3QqCWluZGV4LAkvKiE8IGluOiBjbHVzdGVyZWQgaW5kZXggKi8KKwlj
b25zdCB1bGludCoJCW9mZnNldHMpLyohPCBpbjogcmVjX2dldF9vZmZzZXRzKHJlYywgaW5kZXgp
ICovCiB7CiAJdWxpbnQJb2Zmc2V0OwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
YmFzZS9sb2NrL2xvY2swbG9jay5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBs
b2NrLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MjQwODQyNTEtdmptdWZt
c3R6cnltendmZworKysgYi9zdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MjQxMjA1NTctN2c5Znp5a2E3cHN3bHZ4dwpA
QCAtMzYxLDYgKzM2MSw3IEBAIGlib29sCiBsb2NrX3ZhbGlkYXRlKHZvaWQpOwogLyo9PT09PT09
PT09PT09PT0qLwogCisjIGlmZGVmIFVOSVZfREVCVUdfTE9DS19WQUxJREFURQogLyoqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKi8vKioKIFZhbGlkYXRlcyB0aGUgcmVjb3JkIGxvY2sgcXVldWVzIG9uIGEgcGFnZS4KIEBy
ZXR1cm4JVFJVRSBpZiBvayAqLwpAQCAtMzY4LDEzICszNjksOSBAQCBzdGF0aWMKIGlib29sCiBs
b2NrX3JlY192YWxpZGF0ZV9wYWdlKAogLyo9PT09PT09PT09PT09PT09PT09Ki8KLQlpYm9vbAls
b2NrZWRfbG9ja190cnhfc3lzLAkvKiE8IGluOiBpZiB0aGUgY2FsbGVyIGhvbGRzCi0JCQkJCWJv
dGggdGhlIGxvY2sgbXV0ZXggYW5kCi0JCQkJCXRyeF9zeXNfdC0+bG9jay4gKi8KLQl1bGludAlz
cGFjZSwJCQkvKiE8IGluOiBzcGFjZSBpZCAqLwotCXVsaW50CXppcF9zaXplLAkJLyohPCBpbjog
Y29tcHJlc3NlZCBwYWdlIHNpemUKLQkJCQkJaW4gYnl0ZXMgb3IgMCBmb3IgdW5jb21wcmVzc2Vk
IHBhZ2VzICovCi0JdWxpbnQJcGFnZV9ubyk7CQkvKiE8IGluOiBwYWdlIG51bWJlciAqLworCWNv
bnN0IGJ1Zl9ibG9ja190KglibG9jaykJLyohPCBpbjogYnVmZmVyIGJsb2NrICovCisJX19hdHRy
aWJ1dGVfXygobm9ubnVsbCwgd2Fybl91bnVzZWRfcmVzdWx0KSk7CisjIGVuZGlmIC8qIFVOSVZf
REVCVUdfTE9DS19WQUxJREFURSAqLwogI2VuZGlmIC8qIFVOSVZfREVCVUcgKi8KIAogLyogVGhl
IGxvY2sgc3lzdGVtICovCkBAIC0xMTM1LDEwICsxMTMyLDEwIEBAIGxvY2tfcmVjX3Jlc2V0X250
aF9iaXQoCiBHZXRzIHRoZSBmaXJzdCBvciBuZXh0IHJlY29yZCBsb2NrIG9uIGEgcGFnZS4KIEBy
ZXR1cm4JbmV4dCBsb2NrLCBOVUxMIGlmIG5vbmUgZXhpc3RzICovCiBVTklWX0lOTElORQotbG9j
a190KgotbG9ja19yZWNfZ2V0X25leHRfb25fcGFnZSgKLS8qPT09PT09PT09PT09PT09PT09PT09
PSovCi0JbG9ja190Kglsb2NrKQkvKiE8IGluOiBhIHJlY29yZCBsb2NrICovCitjb25zdCBsb2Nr
X3QqCitsb2NrX3JlY19nZXRfbmV4dF9vbl9wYWdlX2NvbnN0KAorLyo9PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ki8KKwljb25zdCBsb2NrX3QqCWxvY2spCS8qITwgaW46IGEgcmVjb3JkIGxv
Y2sgKi8KIHsKIAl1bGludAlzcGFjZTsKIAl1bGludAlwYWdlX25vOwpAQCAtMTE3MSwxMiArMTE2
OCwxMiBAQCBsb2NrX3JlY19nZXRfbmV4dF9vbl9wYWdlKAogR2V0cyB0aGUgZmlyc3Qgb3IgbmV4
dCByZWNvcmQgbG9jayBvbiBhIHBhZ2UuCiBAcmV0dXJuCW5leHQgbG9jaywgTlVMTCBpZiBub25l
IGV4aXN0cyAqLwogVU5JVl9JTkxJTkUKLWNvbnN0IGxvY2tfdCoKLWxvY2tfcmVjX2dldF9uZXh0
X29uX3BhZ2VfY29uc3QoCi0vKj09PT09PT09PT09PT09PT09PT09PT09PT09PT0qLwotCWNvbnN0
IGxvY2tfdCoJbG9jaykJLyohPCBpbjogYSByZWNvcmQgbG9jayAqLworbG9ja190KgorbG9ja19y
ZWNfZ2V0X25leHRfb25fcGFnZSgKKy8qPT09PT09PT09PT09PT09PT09PT09PSovCisJbG9ja190
Kglsb2NrKQkvKiE8IGluOiBhIHJlY29yZCBsb2NrICovCiB7Ci0JcmV0dXJuKGxvY2tfcmVjX2dl
dF9uZXh0X29uX3BhZ2UoKGxvY2tfdCopIGxvY2spKTsKKwlyZXR1cm4oKGxvY2tfdCopIGxvY2tf
cmVjX2dldF9uZXh0X29uX3BhZ2VfY29uc3QobG9jaykpOwogfQogCiAvKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8q
KgpAQCAtMjc4MCwxMCArMjc3Nyw3IEBAIGxvY2tfbW92ZV9yZW9yZ2FuaXplX3BhZ2UoCiAJbWVt
X2hlYXBfZnJlZShoZWFwKTsKIAogI2lmZGVmIFVOSVZfREVCVUdfTE9DS19WQUxJREFURQotCXV0
X2FkKGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2UoRkFMU0UsCi0JCQkJICAgICBidWZfYmxvY2tfZ2V0
X3NwYWNlKGJsb2NrKSwKLQkJCQkgICAgIGJ1Zl9ibG9ja19nZXRfemlwX3NpemUoYmxvY2spLAot
CQkJCSAgICAgYnVmX2Jsb2NrX2dldF9wYWdlX25vKGJsb2NrKSkpOworCXV0X2FkKGxvY2tfcmVj
X3ZhbGlkYXRlX3BhZ2UoYmxvY2spKTsKICNlbmRpZgogfQogCkBAIC0yODcxLDE0ICsyODY1LDgg
QEAgbG9ja19tb3ZlX3JlY19saXN0X2VuZCgKIAlsb2NrX211dGV4X2V4aXQoKTsKIAogI2lmZGVm
IFVOSVZfREVCVUdfTE9DS19WQUxJREFURQotCXV0X2FkKGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2Uo
RkFMU0UsCi0JCQkJICAgICBidWZfYmxvY2tfZ2V0X3NwYWNlKGJsb2NrKSwKLQkJCQkgICAgIGJ1
Zl9ibG9ja19nZXRfemlwX3NpemUoYmxvY2spLAotCQkJCSAgICAgYnVmX2Jsb2NrX2dldF9wYWdl
X25vKGJsb2NrKSkpOwotCXV0X2FkKGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2UoRkFMU0UsCi0JCQkJ
ICAgICBidWZfYmxvY2tfZ2V0X3NwYWNlKG5ld19ibG9jayksCi0JCQkJICAgICBidWZfYmxvY2tf
Z2V0X3ppcF9zaXplKGJsb2NrKSwKLQkJCQkgICAgIGJ1Zl9ibG9ja19nZXRfcGFnZV9ubyhuZXdf
YmxvY2spKSk7CisJdXRfYWQobG9ja19yZWNfdmFsaWRhdGVfcGFnZShibG9jaykpOworCXV0X2Fk
KGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2UobmV3X2Jsb2NrKSk7CiAjZW5kaWYKIH0KIApAQCAtMjk4
NywxMCArMjk3NSw3IEBAIGxvY2tfbW92ZV9yZWNfbGlzdF9zdGFydCgKIAlsb2NrX211dGV4X2V4
aXQoKTsKIAogI2lmZGVmIFVOSVZfREVCVUdfTE9DS19WQUxJREFURQotCXV0X2FkKGxvY2tfcmVj
X3ZhbGlkYXRlX3BhZ2UoRkFMU0UsCi0JCQkJICAgICBidWZfYmxvY2tfZ2V0X3NwYWNlKGJsb2Nr
KSwKLQkJCQkgICAgIGJ1Zl9ibG9ja19nZXRfemlwX3NpemUoYmxvY2spLAotCQkJCSAgICAgYnVm
X2Jsb2NrX2dldF9wYWdlX25vKGJsb2NrKSkpOworCXV0X2FkKGxvY2tfcmVjX3ZhbGlkYXRlX3Bh
Z2UoYmxvY2spKTsKICNlbmRpZgogfQogCkBAIC00MDc1LDE3ICs0MDYwLDE4IEBAIENoZWNrcyBp
ZiBvdGhlciB0cmFuc2FjdGlvbnMgaGF2ZSBhbiBpbmMKIHRoZSBsb2NrIHF1ZXVlLgogQHJldHVy
bglsb2NrIG9yIE5VTEwgKi8KIFVOSVZfSU5MSU5FCi1sb2NrX3QqCitjb25zdCBsb2NrX3QqCiBs
b2NrX3RhYmxlX290aGVyX2hhc19pbmNvbXBhdGlibGUoCiAvKj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PSovCi0JdHJ4X3QqCQl0cngsCS8qITwgaW46IHRyYW5zYWN0aW9uLCBvciBOVUxM
IGlmIGFsbAotCQkJCXRyYW5zYWN0aW9ucyBzaG91bGQgYmUgaW5jbHVkZWQgKi8KLQl1bGludAkJ
d2FpdCwJLyohPCBpbjogTE9DS19XQUlUIGlmIGFsc28gd2FpdGluZyBsb2NrcyBhcmUKLQkJCQl0
YWtlbiBpbnRvIGFjY291bnQsIG9yIDAgaWYgbm90ICovCi0JZGljdF90YWJsZV90Kgl0YWJsZSwJ
LyohPCBpbjogdGFibGUgKi8KLQllbnVtIGxvY2tfbW9kZQltb2RlKQkvKiE8IGluOiBsb2NrIG1v
ZGUgKi8KKwljb25zdCB0cnhfdCoJCXRyeCwJLyohPCBpbjogdHJhbnNhY3Rpb24sIG9yIE5VTEwg
aWYgYWxsCisJCQkJCXRyYW5zYWN0aW9ucyBzaG91bGQgYmUgaW5jbHVkZWQgKi8KKwl1bGludAkJ
CXdhaXQsCS8qITwgaW46IExPQ0tfV0FJVCBpZiBhbHNvCisJCQkJCXdhaXRpbmcgbG9ja3MgYXJl
IHRha2VuIGludG8KKwkJCQkJYWNjb3VudCwgb3IgMCBpZiBub3QgKi8KKwljb25zdCBkaWN0X3Rh
YmxlX3QqCXRhYmxlLAkvKiE8IGluOiB0YWJsZSAqLworCWVudW0gbG9ja19tb2RlCQltb2RlKQkv
KiE8IGluOiBsb2NrIG1vZGUgKi8KIHsKLQlsb2NrX3QqCQlsb2NrOworCWNvbnN0IGxvY2tfdCoJ
bG9jazsKIAogCXV0X2FkKGxvY2tfbXV0ZXhfb3duKCkpOwogCkBAIC00MTIxLDcgKzQxMDcsNyBA
QCBsb2NrX3RhYmxlKAogewogCXRyeF90KgkJdHJ4OwogCXVsaW50CQllcnI7Ci0JbG9ja190KgkJ
bG9jazsKKwljb25zdCBsb2NrX3QqCWxvY2s7CiAKIAl1dF9hZCh0YWJsZSAmJiB0aHIpOwogCkBA
IC01MDgwLDkgKzUwNjYsOSBAQCBzdGF0aWMKIGlib29sCiBsb2NrX3RhYmxlX3F1ZXVlX3ZhbGlk
YXRlKAogLyo9PT09PT09PT09PT09PT09PT09PT09Ki8KLQlkaWN0X3RhYmxlX3QqCXRhYmxlKQkv
KiE8IGluOiB0YWJsZSAqLworCWNvbnN0IGRpY3RfdGFibGVfdCoJdGFibGUpCS8qITwgaW46IHRh
YmxlICovCiB7Ci0JbG9ja190KgkJbG9jazsKKwljb25zdCBsb2NrX3QqCWxvY2s7CiAKIAl1dF9h
ZChsb2NrX211dGV4X293bigpKTsKICNpZmRlZiBVTklWX1NZTkNfREVCVUcKQEAgLTUxMjgsNyAr
NTExNCw3IEBAIGxvY2tfcmVjX3F1ZXVlX3ZhbGlkYXRlKAogCQkJCQl0cnhfc3lzX3QtPmxvY2su
ICovCiAJY29uc3QgYnVmX2Jsb2NrX3QqCWJsb2NrLAkvKiE8IGluOiBidWZmZXIgYmxvY2sgY29u
dGFpbmluZyByZWMgKi8KIAljb25zdCByZWNfdCoJCXJlYywJLyohPCBpbjogcmVjb3JkIHRvIGxv
b2sgYXQgKi8KLQlkaWN0X2luZGV4X3QqCQlpbmRleCwJLyohPCBpbjogaW5kZXgsIG9yIE5VTEwg
aWYgbm90IGtub3duICovCisJY29uc3QgZGljdF9pbmRleF90KglpbmRleCwJLyohPCBpbjogaW5k
ZXgsIG9yIE5VTEwgaWYgbm90IGtub3duICovCiAJY29uc3QgdWxpbnQqCQlvZmZzZXRzKS8qITwg
aW46IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4KSAqLwogewogCWNvbnN0IHRyeF90KglpbXBs
X3RyeDsKQEAgLTUyMzUsNTkgKzUyMjEsMzAgQEAgZnVuY19leGl0OgogLyoqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8v
KioKIFZhbGlkYXRlcyB0aGUgcmVjb3JkIGxvY2sgcXVldWVzIG9uIGEgcGFnZS4KIEByZXR1cm4J
VFJVRSBpZiBvayAqLwotc3RhdGljCitzdGF0aWMgX19hdHRyaWJ1dGVfXygobm9ubnVsbCwgd2Fy
bl91bnVzZWRfcmVzdWx0KSkKIGlib29sCi1sb2NrX3JlY192YWxpZGF0ZV9wYWdlKAotLyo9PT09
PT09PT09PT09PT09PT09Ki8KLQlpYm9vbAlsb2NrZWRfbG9ja190cnhfc3lzLAkvKiE8IGluOiBp
ZiB0aGUgY2FsbGVyIGhvbGRzCi0JCQkJCWJvdGggdGhlIGxvY2sgbXV0ZXggYW5kCi0JCQkJCXRy
eF9zeXNfdC0+bG9jay4gKi8KLQl1bGludAlzcGFjZSwJCQkvKiE8IGluOiBzcGFjZSBpZCAqLwot
CXVsaW50CXppcF9zaXplLAkJLyohPCBpbjogY29tcHJlc3NlZCBwYWdlIHNpemUKLQkJCQkJaW4g
Ynl0ZXMgb3IgMCBmb3IgdW5jb21wcmVzc2VkIHBhZ2VzICovCi0JdWxpbnQJcGFnZV9ubykJCS8q
ITwgaW46IHBhZ2UgbnVtYmVyICovCitsb2NrX3JlY192YWxpZGF0ZV9wYWdlX2xvdygKKy8qPT09
PT09PT09PT09PT09PT09PT09PT0qLworCWNvbnN0IGJ1Zl9ibG9ja190KglibG9jaykJLyohPCBp
bjogYnVmZmVyIGJsb2NrICovCiB7Ci0JZGljdF9pbmRleF90KglpbmRleDsKLQlidWZfYmxvY2tf
dCoJYmxvY2s7Ci0JY29uc3QgcGFnZV90KglwYWdlOwogCWNvbnN0IGxvY2tfdCoJbG9jazsKIAlj
b25zdCByZWNfdCoJcmVjOwogCXVsaW50CQludGhfbG9jawk9IDA7CiAJdWxpbnQJCW50aF9iaXQJ
CT0gMDsKIAl1bGludAkJaTsKLQltdHJfdAkJbXRyOwogCW1lbV9oZWFwX3QqCWhlYXAJCT0gTlVM
TDsKIAl1bGludAkJb2Zmc2V0c19bUkVDX09GRlNfTk9STUFMX1NJWkVdOwogCXVsaW50KgkJb2Zm
c2V0cwkJPSBvZmZzZXRzXzsKIAlyZWNfb2Zmc19pbml0KG9mZnNldHNfKTsKIAotCS8qIFRoaXMg
aXMgdG8gcHJlc2VydmUgbGF0Y2hpbmcgb3JkZXIuICovCi0JaWYgKGxvY2tlZF9sb2NrX3RyeF9z
eXMpIHsKLQkJbG9ja19tdXRleF9leGl0KCk7Ci0JCXJ3X2xvY2tfc191bmxvY2soJnRyeF9zeXMt
PmxvY2spOwotCX0KLQotCXV0X2FkKCFsb2NrX211dGV4X293bigpKTsKKwl1dF9hZChsb2NrX211
dGV4X293bigpKTsKICNpZmRlZiBVTklWX1NZTkNfREVCVUcKLQl1dF9hZCghcndfbG9ja19vd24o
JnRyeF9zeXMtPmxvY2ssIFJXX0xPQ0tfU0hBUkVEKSk7Ci0JdXRfYWQoIXJ3X2xvY2tfb3duKCZ0
cnhfc3lzLT5sb2NrLCBSV19MT0NLX0VYKSk7CisJdXRfYWQocndfbG9ja19vd24oJnRyeF9zeXMt
PmxvY2ssIFJXX0xPQ0tfU0hBUkVEKSk7CiAjZW5kaWYgLyogVU5JVl9TWU5DX0RFQlVHICovCiAK
LQltdHJfc3RhcnQoJm10cik7Ci0KLQl1dF9hZCh6aXBfc2l6ZSAhPSBVTElOVF9VTkRFRklORUQp
OwotCWJsb2NrID0gYnVmX3BhZ2VfZ2V0KHNwYWNlLCB6aXBfc2l6ZSwgcGFnZV9ubywgUldfWF9M
QVRDSCwgJm10cik7Ci0JYnVmX2Jsb2NrX2RiZ19hZGRfbGV2ZWwoYmxvY2ssIFNZTkNfTk9fT1JE
RVJfQ0hFQ0spOwotCi0JcGFnZSA9IGJsb2NrLT5mcmFtZTsKLQotCS8qIEVpdGhlciB3YXkgd2Ug
bmVlZCB0byAocmUpYWNxdWlyZSB0aGUgbXV0ZXhlcy4gKi8KLQlsb2NrX211dGV4X2VudGVyKCk7
Ci0KLQlyd19sb2NrX3NfbG9jaygmdHJ4X3N5cy0+bG9jayk7Ci0KIGxvb3A6Ci0JbG9jayA9IGxv
Y2tfcmVjX2dldF9maXJzdF9vbl9wYWdlX2FkZHIoc3BhY2UsIHBhZ2Vfbm8pOworCWxvY2sgPSBs
b2NrX3JlY19nZXRfZmlyc3Rfb25fcGFnZV9hZGRyKGJ1Zl9ibG9ja19nZXRfc3BhY2UoYmxvY2sp
LAorCQkJCQkgICAgICAgYnVmX2Jsb2NrX2dldF9wYWdlX25vKGJsb2NrKSk7CiAKIAlpZiAoIWxv
Y2spIHsKIAkJZ290byBmdW5jdGlvbl9leGl0OwpAQCAtNTMxNSwxNSArNTI3MiwxNCBAQCBsb29w
OgogCiAJCWlmIChpID09IDEgfHwgbG9ja19yZWNfZ2V0X250aF9iaXQobG9jaywgaSkpIHsKIAot
CQkJaW5kZXggPSBsb2NrLT5pbmRleDsKLQkJCXJlYyA9IHBhZ2VfZmluZF9yZWNfd2l0aF9oZWFw
X25vKHBhZ2UsIGkpOworCQkJcmVjID0gcGFnZV9maW5kX3JlY193aXRoX2hlYXBfbm8oYmxvY2st
PmZyYW1lLCBpKTsKIAkJCXV0X2EocmVjKTsKLQkJCW9mZnNldHMgPSByZWNfZ2V0X29mZnNldHMo
cmVjLCBpbmRleCwgb2Zmc2V0cywKKwkJCW9mZnNldHMgPSByZWNfZ2V0X29mZnNldHMocmVjLCBs
b2NrLT5pbmRleCwgb2Zmc2V0cywKIAkJCQkJCSAgVUxJTlRfVU5ERUZJTkVELCAmaGVhcCk7CiAj
aWYgMAogCQkJZnByaW50ZihzdGRlcnIsCi0JCQkJIlZhbGlkYXRpbmcgJWx1ICVsdVxuIiwKLQkJ
CQkodWxvbmcpIHNwYWNlLCAodWxvbmcpIHBhZ2Vfbm8pOworCQkJCSJWYWxpZGF0aW5nICV1ICV1
XG4iLAorCQkJCWJsb2NrLT5wYWdlLnNwYWNlLCBibG9jay0+cGFnZS5vZmZzZXQpOwogI2VuZGlm
CiAJCQkvKiBJZiB0aGlzIHRocmVhZCBpcyBob2xkaW5nIHRoZSBmaWxlIHNwYWNlCiAJCQlsYXRj
aCAoZmlsX3NwYWNlX3Q6OmxhdGNoKSwgdGhlIGZvbGxvd2luZwpAQCAtNTMzMSw3ICs1Mjg3LDcg
QEAgbG9vcDoKIAkJCWNhdXNlIGEgZGVhZGxvY2sgb2YgdGhyZWFkcy4gKi8KIAogCQkJbG9ja19y
ZWNfcXVldWVfdmFsaWRhdGUoCi0JCQkJVFJVRSwgYmxvY2ssIHJlYywgaW5kZXgsIG9mZnNldHMp
OworCQkJCVRSVUUsIGJsb2NrLCByZWMsIGxvY2stPmluZGV4LCBvZmZzZXRzKTsKIAogCQkJbnRo
X2JpdCA9IGkgKyAxOwogCkBAIC01MzQ1LDIwICs1MzAxLDM0IEBAIGxvb3A6CiAJZ290byBsb29w
OwogCiBmdW5jdGlvbl9leGl0OgotCi0JbXRyX2NvbW1pdCgmbXRyKTsKLQotCWlmICghbG9ja2Vk
X2xvY2tfdHJ4X3N5cykgewotCQlsb2NrX211dGV4X2V4aXQoKTsKLQkJcndfbG9ja19zX3VubG9j
aygmdHJ4X3N5cy0+bG9jayk7Ci0JfQotCiAJaWYgKFVOSVZfTElLRUxZX05VTEwoaGVhcCkpIHsK
IAkJbWVtX2hlYXBfZnJlZShoZWFwKTsKIAl9CiAJcmV0dXJuKFRSVUUpOwogfQogCisjaWZkZWYg
VU5JVl9ERUJVR19MT0NLX1ZBTElEQVRFCisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgorVmFsaWRhdGVzIHRo
ZSByZWNvcmQgbG9jayBxdWV1ZXMgb24gYSBwYWdlLgorQHJldHVybglUUlVFIGlmIG9rICovCitz
dGF0aWMKK2lib29sCitsb2NrX3JlY192YWxpZGF0ZV9wYWdlKAorLyo9PT09PT09PT09PT09PT09
PT09Ki8KKwljb25zdCBidWZfYmxvY2tfdCoJYmxvY2spCS8qITwgaW46IGJ1ZmZlciBibG9jayAq
LworeworCWlib29sCXZhbGlkOworCisJbG9ja19tdXRleF9lbnRlcigpOworCXJ3X2xvY2tfc19s
b2NrKCZ0cnhfc3lzLT5sb2NrKTsKKwl2YWxpZCA9IGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2VfbG93
KGJsb2NrKTsKKwlsb2NrX211dGV4X2V4aXQoKTsKKwlyd19sb2NrX3NfdW5sb2NrKCZ0cnhfc3lz
LT5sb2NrKTsKKworCXJldHVybih2YWxpZCk7Cit9CisjZW5kaWYgLyogVU5JVl9ERUJVR19MT0NL
X1ZBTElEQVRFICovCisKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBWYWxpZGF0ZXMgdGhlIGxvY2sgc3lz
dGVtLgogQHJldHVybglUUlVFIGlmIG9rICovCkBAIC01MzY5LDggKzUzMzksNiBAQCBsb2NrX3Zh
bGlkYXRlKHZvaWQpCiB7CiAJY29uc3QgbG9ja190Kglsb2NrOwogCWNvbnN0IHRyeF90Kgl0cng7
Ci0JdWxpbnQJCXNwYWNlOwotCXVsaW50CQlwYWdlX25vOwogCXVsaW50CQlpOwogCiAJbG9ja19t
dXRleF9lbnRlcigpOwpAQCAtNTM5Niw5ICs1MzY0LDEzIEBAIGxvY2tfdmFsaWRhdGUodm9pZCkK
IAl9CiAKIAlmb3IgKGkgPSAwOyBpIDwgaGFzaF9nZXRfbl9jZWxscyhsb2NrX3N5cy0+cmVjX2hh
c2gpOyBpKyspIHsKLQkJaWJfdWludDY0X3QJbGltaXQgPSAwOyAKKwkJdWxpbnQJCXNwYWNlOwor
CQl1bGludAkJcGFnZV9ubzsKKwkJaWJfdWludDY0X3QJbGltaXQJPSAwOwogCiAJCWZvciAoOzsp
IHsKKwkJCW10cl90CQltdHI7CisJCQlidWZfYmxvY2tfdCoJYmxvY2s7CiAKIAkJCWZvciAobG9j
ayA9IEhBU0hfR0VUX0ZJUlNUKGxvY2tfc3lzLT5yZWNfaGFzaCwgaSk7CiAJCQkgICAgIGxvY2sg
IT0gTlVMTDsKQEAgLTU0MTksMTEgKzUzOTEsMTYgQEAgbG9ja192YWxpZGF0ZSh2b2lkKQogCQkJ
CWJyZWFrOwogCQkJfQogCi0JCQlsb2NrX3JlY192YWxpZGF0ZV9wYWdlKAotCQkJCVRSVUUsIHNw
YWNlLAotCQkJCWZpbF9zcGFjZV9nZXRfemlwX3NpemUoc3BhY2UpLCBwYWdlX25vKTsKKwkJCW10
cl9zdGFydCgmbXRyKTsKKwkJCWJsb2NrID0gYnVmX3BhZ2VfZ2V0KAorCQkJCXNwYWNlLCBmaWxf
c3BhY2VfZ2V0X3ppcF9zaXplKHNwYWNlKSwKKwkJCQlwYWdlX25vLCBSV19YX0xBVENILCAmbXRy
KTsKKwkJCWJ1Zl9ibG9ja19kYmdfYWRkX2xldmVsKGJsb2NrLCBTWU5DX05PX09SREVSX0NIRUNL
KTsKKworCQkJdXRfYWQobG9ja19yZWNfdmFsaWRhdGVfcGFnZV9sb3coYmxvY2spKTsKKwkJCW10
cl9jb21taXQoJm10cik7CiAKLQkJCWxpbWl0ID0gdXRfdWxsX2NyZWF0ZShzcGFjZSwgcGFnZV9u
byArIDEpOworCQkJbGltaXQrKzsKIAkJfQogCX0KIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3Jh
Z2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MHJvdy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTI0MDg0MjUxLXZqbXVm
bXN0enJ5bXp3ZmcKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTI0MTIwNTU3LTdnOWZ6eWthN3Bzd2x2eHcKQEAg
LTQ3LDM1ICs0Nyw2IEBAIENyZWF0ZWQgNC8yMC8xOTk2IEhlaWtraSBUdXVyaQogI2luY2x1ZGUg
InJlYWQwcmVhZC5oIgogI2luY2x1ZGUgInV0MG1lbS5oIgogCi0vKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgot
R2V0cyB0aGUgb2Zmc2V0IG9mIHRyeCBpZCBmaWVsZCwgaW4gYnl0ZXMgcmVsYXRpdmUgdG8gdGhl
IG9yaWdpbiBvZgotYSBjbHVzdGVyZWQgaW5kZXggcmVjb3JkLgotQHJldHVybglvZmZzZXQgb2Yg
REFUQV9UUlhfSUQgKi8KLVVOSVZfSU5URVJOCi11bGludAotcm93X2dldF90cnhfaWRfb2Zmc2V0
KAotLyo9PT09PT09PT09PT09PT09PT0qLwotCWNvbnN0IHJlY190KglyZWMgX19hdHRyaWJ1dGVf
XygodW51c2VkKSksCi0JCQkJLyohPCBpbjogcmVjb3JkICovCi0JZGljdF9pbmRleF90KglpbmRl
eCwJLyohPCBpbjogY2x1c3RlcmVkIGluZGV4ICovCi0JY29uc3QgdWxpbnQqCW9mZnNldHMpLyoh
PCBpbjogcmVjX2dldF9vZmZzZXRzKHJlYywgaW5kZXgpICovCi17Ci0JdWxpbnQJcG9zOwotCXVs
aW50CW9mZnNldDsKLQl1bGludAlsZW47Ci0KLQl1dF9hZChkaWN0X2luZGV4X2lzX2NsdXN0KGlu
ZGV4KSk7Ci0JdXRfYWQocmVjX29mZnNfdmFsaWRhdGUocmVjLCBpbmRleCwgb2Zmc2V0cykpOwot
Ci0JcG9zID0gZGljdF9pbmRleF9nZXRfc3lzX2NvbF9wb3MoaW5kZXgsIERBVEFfVFJYX0lEKTsK
LQotCW9mZnNldCA9IHJlY19nZXRfbnRoX2ZpZWxkX29mZnMob2Zmc2V0cywgcG9zLCAmbGVuKTsK
LQotCXV0X2FkKGxlbiA9PSBEQVRBX1RSWF9JRF9MRU4pOwotCi0JcmV0dXJuKG9mZnNldCk7Ci19
Ci0KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKi8vKioKIFdoZW4gYW4gaW5zZXJ0IG9yIHB1cmdlIHRvIGEgdGFibGUgaXMg
cGVyZm9ybWVkLCB0aGlzIGZ1bmN0aW9uIGJ1aWxkcwogdGhlIGVudHJ5IHRvIGJlIGluc2VydGVk
IGludG8gb3IgcHVyZ2VkIGZyb20gYW4gaW5kZXggb24gdGhlIHRhYmxlLgoK

--===============0799915488==
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:07:16 +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


--===============0799915488==--