From: marko.makela
Date: October 8 2012 1:29pm
Subject: bzr push into mysql-5.1 branch (marko.makela:3830 to 3831) Bug#14731482
List-Archive: http://lists.mysql.com/commits/144979
X-Bug: 14731482
Message-Id: <20121008132908.15134.251.3831@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4MzEgTWFya28gTcOka2Vsw6QJMjAxMi0xMC0wOAogICAgICBCdWcjMTQ3MzE0ODIgVVBEQVRF
IE9SIERFTEVURSBDT1JSVVBUUyBBIFJFQ09SRCBXSVRIIEEgTE9ORyBQUklNQVJZIEtFWQogICAg
ICAKICAgICAgV2UgZGlkIG5vdCBhbGxvY2F0ZSBlbm91Z2ggYml0cyBmb3IgaW5kZXgtPnRyeF9p
ZF9vZmZzZXQsIGNhdXNpbmcgYW4KICAgICAgVVBEQVRFIG9yIERFTEVURSBvZiBhIHRhYmxlIHdp
dGggYSBQUklNQVJZIEtFWSBsb25nZXIgdGhhbiAxMDI0IGJ5dGVzCiAgICAgIHRvIGNvcnJ1cHQg
dGhlIFBSSU1BUlkgS0VZLgogICAgICAKICAgICAgZGljdF9pbmRleF90OiBBbGxvY2F0ZSBlbm91
Z2ggYml0cy4KICAgICAgCiAgICAgIGRpY3RfaW5kZXhfYnVpbGRfaW50ZXJuYWxfY2x1c3QoKTog
Q2hlY2sgZm9yIG92ZXJmbG93IG9mCiAgICAgIGluZGV4LT50cnhfaWRfb2Zmc2V0LiBUcmlwIGEg
ZGVidWcgYXNzZXJ0aW9uIHdoZW4gb3ZlcmZsb3cgb2NjdXJzLgogICAgICAKICAgICAgcmI6MTM4
MCBhcHByb3ZlZCBieSBKaW1teSBZYW5nCgogICAgYWRkZWQ6CiAgICAgIGludGVybmFsL215c3Fs
LXRlc3Qvc3VpdGUvaV9pbm5vZGIvci9pbm5vZGJfYnVnMTQ3MzE0ODIucmVzdWx0CiAgICAgIGlu
dGVybmFsL215c3FsLXRlc3Qvc3VpdGUvaV9pbm5vZGIvdC9pbm5vZGJfYnVnMTQ3MzE0ODIudGVz
dAogICAgICBpbnRlcm5hbC9teXNxbC10ZXN0L3N1aXRlL2lfaW5ub2RiX3BsdWdpbi9yL2lubm9k
Yl9idWcxNDczMTQ4Mi5yZXN1bHQKICAgICAgaW50ZXJuYWwvbXlzcWwtdGVzdC9zdWl0ZS9pX2lu
bm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVnMTQ3MzE0ODIudGVzdAogICAgbW9kaWZpZWQ6CiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGRpY3QuYwogICAgICBzdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvZGljdDBtZW0uaAogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vZGljdC9kaWN0
MGRpY3QuYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9kaWN0MG1lbS5oCiAz
ODMwIFRvciBEaWRyaWtzZW4JMjAxMi0xMC0wMQogICAgICBCdWcjMTQ2ODM2NzYgRU5ETEVTUyBN
RU1PUlkgQ09OU1VNUFRJT04gSU4gU0VUVVBfUkVGX0FSUkFZIFdJVEggTUFYIElOIFNVQlFVRVJZ
CiAgICAgIAogICAgICBuX2NoaWxkX3N1bV9pdGVtcyBrZXB0IGluY3JlYXNpbmcuCiAgICAgIFNp
bmNlIGl0IGlzIHVzZWQgZm9yIGNhbGN1bGF0aW5nIHRoZSBzaXplIG9mIHJlZl9wb2ludGVyX2Fy
cmF5LAogICAgICB3ZSB3aWxsIGFsbG9jYXRlIGxhcmdlciBhbmQgbGFyZ2VyIGNodW5rcyBvZiBt
ZW1vcnksIHVudGlsIHdlIGhpdCBzb21lCiAgICAgIG9wZXJhdGluZyBzeXN0ZW0gbGltaXQuCiAg
ICAgIFRoZSBtZW1vcnkgaXMgZnJlZSgpZCBhdCBkaXNjb25uZWN0LCBidXQgaXMgbW9zdCBsaWtl
bHkgKm5vdCoKICAgICAgcmV0dXJuZWQgdG8gdGhlIG9wZXJhdGluZyBzeXN0ZW0uCgogICAgbW9k
aWZpZWQ6CiAgICAgIHNxbC9zcWxfbGV4LmNjCj09PSBhZGRlZCBmaWxlICdpbnRlcm5hbC9teXNx
bC10ZXN0L3N1aXRlL2lfaW5ub2RiL3IvaW5ub2RiX2J1ZzE0NzMxNDgyLnJlc3VsdCcKLS0tIGEv
aW50ZXJuYWwvbXlzcWwtdGVzdC9zdWl0ZS9pX2lubm9kYi9yL2lubm9kYl9idWcxNDczMTQ4Mi5y
ZXN1bHQJMTk3MC0wMS0wMSAwMDowMDowMCArMDAwMAorKysgYi9pbnRlcm5hbC9teXNxbC10ZXN0
L3N1aXRlL2lfaW5ub2RiL3IvaW5ub2RiX2J1ZzE0NzMxNDgyLnJlc3VsdAlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDEyMTAwODEzMDE1MC00am52Ym9zMXczZTIxMXgxCkBAIC0wLDAg
KzEsMTUgQEAKK0NSRUFURSBUQUJMRSB0MSgKK2EgSU5ULAorYzEgQ0hBUigyNTUpIE5PVCBOVUxM
IERFRkFVTFQgJycsIGMyIENIQVIoMjU1KSBOT1QgTlVMTCBERUZBVUxUICcnLAorYzMgQ0hBUigy
NTUpIE5PVCBOVUxMIERFRkFVTFQgJycsIGM0IENIQVIoMjU1KSBOT1QgTlVMTCBERUZBVUxUICcn
LAorYzUgQ0hBUigyNTUpIE5PVCBOVUxMIERFRkFVTFQgJycsIGM2IENIQVIoMjU1KSBOT1QgTlVM
TCBERUZBVUxUICcnLAorYzcgQ0hBUigyNTUpIE5PVCBOVUxMIERFRkFVTFQgJycsIGM4IENIQVIo
MjU1KSBOT1QgTlVMTCBERUZBVUxUICcnLAorYzkgQ0hBUigyNTUpIE5PVCBOVUxMIERFRkFVTFQg
JycsIGNhIENIQVIoMjU1KSBOT1QgTlVMTCBERUZBVUxUICcnLAorY2IgQ0hBUigyNTUpIE5PVCBO
VUxMIERFRkFVTFQgJycsIGNjIENIQVIoMjU1KSBOT1QgTlVMTCBERUZBVUxUICcnLAorY2QgQ0hB
UigyNTUpIE5PVCBOVUxMIERFRkFVTFQgJycsIGNlIENIQVIoMjU1KSBOT1QgTlVMTCBERUZBVUxU
ICcnLAorY2YgQ0hBUigyNTUpIE5PVCBOVUxMIERFRkFVTFQgJycsIGNnIENIQVIoMjU1KSBOT1Qg
TlVMTCBERUZBVUxUICcnLAorUFJJTUFSWSBLRVkoYSxjMSxjMixjMyxjNCxjNSxjNixjNyxjOCxj
OSxjYSxjYixjYykKKykgRU5HSU5FPUlubm9EQjsKK0lOU0VSVCBJTlRPIHQxIChhKSBWQUxVRVMo
MSksKDIpOworREVMRVRFIEZST00gdDE7CitEUk9QIFRBQkxFIHQxOwoKPT09IGFkZGVkIGZpbGUg
J2ludGVybmFsL215c3FsLXRlc3Qvc3VpdGUvaV9pbm5vZGIvdC9pbm5vZGJfYnVnMTQ3MzE0ODIu
dGVzdCcKLS0tIGEvaW50ZXJuYWwvbXlzcWwtdGVzdC9zdWl0ZS9pX2lubm9kYi90L2lubm9kYl9i
dWcxNDczMTQ4Mi50ZXN0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysrIGIvaW50ZXJuYWwv
bXlzcWwtdGVzdC9zdWl0ZS9pX2lubm9kYi90L2lubm9kYl9idWcxNDczMTQ4Mi50ZXN0CXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIxMDA4MTMwMTUwLTRqbnZib3MxdzNlMjExeDEK
QEAgLTAsMCArMSwyMSBAQAorIyBCdWcjMTQ3MzE0ODIgREVMRVRFIENPUlJVUFRTIEEgUkVDT1JE
IFdJVEggQSBMT05HIFBSSU1BUlkgS0VZCisKKy0tc291cmNlIGluY2x1ZGUvaGF2ZV9pbm5vZGIu
aW5jCisKK0NSRUFURSBUQUJMRSB0MSgKKyBhIElOVCwKKyBjMSBDSEFSKDI1NSkgTk9UIE5VTEwg
REVGQVVMVCAnJywgYzIgQ0hBUigyNTUpIE5PVCBOVUxMIERFRkFVTFQgJycsCisgYzMgQ0hBUigy
NTUpIE5PVCBOVUxMIERFRkFVTFQgJycsIGM0IENIQVIoMjU1KSBOT1QgTlVMTCBERUZBVUxUICcn
LAorIGM1IENIQVIoMjU1KSBOT1QgTlVMTCBERUZBVUxUICcnLCBjNiBDSEFSKDI1NSkgTk9UIE5V
TEwgREVGQVVMVCAnJywKKyBjNyBDSEFSKDI1NSkgTk9UIE5VTEwgREVGQVVMVCAnJywgYzggQ0hB
UigyNTUpIE5PVCBOVUxMIERFRkFVTFQgJycsCisgYzkgQ0hBUigyNTUpIE5PVCBOVUxMIERFRkFV
TFQgJycsIGNhIENIQVIoMjU1KSBOT1QgTlVMTCBERUZBVUxUICcnLAorIGNiIENIQVIoMjU1KSBO
T1QgTlVMTCBERUZBVUxUICcnLCBjYyBDSEFSKDI1NSkgTk9UIE5VTEwgREVGQVVMVCAnJywKKyBj
ZCBDSEFSKDI1NSkgTk9UIE5VTEwgREVGQVVMVCAnJywgY2UgQ0hBUigyNTUpIE5PVCBOVUxMIERF
RkFVTFQgJycsCisgY2YgQ0hBUigyNTUpIE5PVCBOVUxMIERFRkFVTFQgJycsIGNnIENIQVIoMjU1
KSBOT1QgTlVMTCBERUZBVUxUICcnLAorIFBSSU1BUlkgS0VZKGEsYzEsYzIsYzMsYzQsYzUsYzYs
YzcsYzgsYzksY2EsY2IsY2MpCispIEVOR0lORT1Jbm5vREI7CisKK0lOU0VSVCBJTlRPIHQxIChh
KSBWQUxVRVMoMSksKDIpOworCitERUxFVEUgRlJPTSB0MTsKK0RST1AgVEFCTEUgdDE7Cgo9PT0g
YWRkZWQgZmlsZSAnaW50ZXJuYWwvbXlzcWwtdGVzdC9zdWl0ZS9pX2lubm9kYl9wbHVnaW4vci9p
bm5vZGJfYnVnMTQ3MzE0ODIucmVzdWx0JwotLS0gYS9pbnRlcm5hbC9teXNxbC10ZXN0L3N1aXRl
L2lfaW5ub2RiX3BsdWdpbi9yL2lubm9kYl9idWcxNDczMTQ4Mi5yZXN1bHQJMTk3MC0wMS0wMSAw
MDowMDowMCArMDAwMAorKysgYi9pbnRlcm5hbC9teXNxbC10ZXN0L3N1aXRlL2lfaW5ub2RiX3Bs
dWdpbi9yL2lubm9kYl9idWcxNDczMTQ4Mi5yZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMjEwMDgxMzAxNTAtNGpudmJvczF3M2UyMTF4MQpAQCAtMCwwICsxLDE1IEBACitD
UkVBVEUgVEFCTEUgdDEoCithIElOVCwKK2MxIENIQVIoMjU1KSBOT1QgTlVMTCBERUZBVUxUICcn
LCBjMiBDSEFSKDI1NSkgTk9UIE5VTEwgREVGQVVMVCAnJywKK2MzIENIQVIoMjU1KSBOT1QgTlVM
TCBERUZBVUxUICcnLCBjNCBDSEFSKDI1NSkgTk9UIE5VTEwgREVGQVVMVCAnJywKK2M1IENIQVIo
MjU1KSBOT1QgTlVMTCBERUZBVUxUICcnLCBjNiBDSEFSKDI1NSkgTk9UIE5VTEwgREVGQVVMVCAn
JywKK2M3IENIQVIoMjU1KSBOT1QgTlVMTCBERUZBVUxUICcnLCBjOCBDSEFSKDI1NSkgTk9UIE5V
TEwgREVGQVVMVCAnJywKK2M5IENIQVIoMjU1KSBOT1QgTlVMTCBERUZBVUxUICcnLCBjYSBDSEFS
KDI1NSkgTk9UIE5VTEwgREVGQVVMVCAnJywKK2NiIENIQVIoMjU1KSBOT1QgTlVMTCBERUZBVUxU
ICcnLCBjYyBDSEFSKDI1NSkgTk9UIE5VTEwgREVGQVVMVCAnJywKK2NkIENIQVIoMjU1KSBOT1Qg
TlVMTCBERUZBVUxUICcnLCBjZSBDSEFSKDI1NSkgTk9UIE5VTEwgREVGQVVMVCAnJywKK2NmIENI
QVIoMjU1KSBOT1QgTlVMTCBERUZBVUxUICcnLCBjZyBDSEFSKDI1NSkgTk9UIE5VTEwgREVGQVVM
VCAnJywKK1BSSU1BUlkgS0VZKGEsYzEsYzIsYzMsYzQsYzUsYzYsYzcsYzgsYzksY2EsY2IsY2Mp
CispIEVOR0lORT1Jbm5vREI7CitJTlNFUlQgSU5UTyB0MSAoYSkgVkFMVUVTKDEpLCgyKTsKK0RF
TEVURSBGUk9NIHQxOworRFJPUCBUQUJMRSB0MTsKCj09PSBhZGRlZCBmaWxlICdpbnRlcm5hbC9t
eXNxbC10ZXN0L3N1aXRlL2lfaW5ub2RiX3BsdWdpbi90L2lubm9kYl9idWcxNDczMTQ4Mi50ZXN0
JwotLS0gYS9pbnRlcm5hbC9teXNxbC10ZXN0L3N1aXRlL2lfaW5ub2RiX3BsdWdpbi90L2lubm9k
Yl9idWcxNDczMTQ4Mi50ZXN0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysrIGIvaW50ZXJu
YWwvbXlzcWwtdGVzdC9zdWl0ZS9pX2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVnMTQ3MzE0ODIu
dGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMTAwODEzMDE1MC00am52Ym9z
MXczZTIxMXgxCkBAIC0wLDAgKzEsMjEgQEAKKyMgQnVnIzE0NzMxNDgyIERFTEVURSBDT1JSVVBU
UyBBIFJFQ09SRCBXSVRIIEEgTE9ORyBQUklNQVJZIEtFWQorCistLXNvdXJjZSBpbmNsdWRlL2hh
dmVfaW5ub2RiX3BsdWdpbi5pbmMKKworQ1JFQVRFIFRBQkxFIHQxKAorIGEgSU5ULAorIGMxIENI
QVIoMjU1KSBOT1QgTlVMTCBERUZBVUxUICcnLCBjMiBDSEFSKDI1NSkgTk9UIE5VTEwgREVGQVVM
VCAnJywKKyBjMyBDSEFSKDI1NSkgTk9UIE5VTEwgREVGQVVMVCAnJywgYzQgQ0hBUigyNTUpIE5P
VCBOVUxMIERFRkFVTFQgJycsCisgYzUgQ0hBUigyNTUpIE5PVCBOVUxMIERFRkFVTFQgJycsIGM2
IENIQVIoMjU1KSBOT1QgTlVMTCBERUZBVUxUICcnLAorIGM3IENIQVIoMjU1KSBOT1QgTlVMTCBE
RUZBVUxUICcnLCBjOCBDSEFSKDI1NSkgTk9UIE5VTEwgREVGQVVMVCAnJywKKyBjOSBDSEFSKDI1
NSkgTk9UIE5VTEwgREVGQVVMVCAnJywgY2EgQ0hBUigyNTUpIE5PVCBOVUxMIERFRkFVTFQgJycs
CisgY2IgQ0hBUigyNTUpIE5PVCBOVUxMIERFRkFVTFQgJycsIGNjIENIQVIoMjU1KSBOT1QgTlVM
TCBERUZBVUxUICcnLAorIGNkIENIQVIoMjU1KSBOT1QgTlVMTCBERUZBVUxUICcnLCBjZSBDSEFS
KDI1NSkgTk9UIE5VTEwgREVGQVVMVCAnJywKKyBjZiBDSEFSKDI1NSkgTk9UIE5VTEwgREVGQVVM
VCAnJywgY2cgQ0hBUigyNTUpIE5PVCBOVUxMIERFRkFVTFQgJycsCisgUFJJTUFSWSBLRVkoYSxj
MSxjMixjMyxjNCxjNSxjNixjNyxjOCxjOSxjYSxjYixjYykKKykgRU5HSU5FPUlubm9EQjsKKwor
SU5TRVJUIElOVE8gdDEgKGEpIFZBTFVFUygxKSwoMik7CisKK0RFTEVURSBGUk9NIHQxOworRFJP
UCBUQUJMRSB0MTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2RpY3QvZGlj
dDBkaWN0LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGRpY3QuYwlyZXZpZDp0
b3IuZGlkcmlrc2VuQG9yYWNsZS5jb20tMjAxMjEwMDExMTEyMzgtZ2VhdHZiZHVuMDJyaWFuawor
KysgYi9zdG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBkaWN0LmMJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMjEwMDgxMzAxNTAtNGpudmJvczF3M2UyMTF4MQpAQCAtMTYyOSw3ICsx
NjI5LDYgQEAgZGljdF9pbmRleF9idWlsZF9pbnRlcm5hbF9jbHVzdCgKIHsKIAlkaWN0X2luZGV4
X3QqCW5ld19pbmRleDsKIAlkaWN0X2ZpZWxkX3QqCWZpZWxkOwotCXVsaW50CQlmaXhlZF9zaXpl
OwogCXVsaW50CQl0cnhfaWRfcG9zOwogCXVsaW50CQlpOwogCWlib29sKgkJaW5kZXhlZDsKQEAg
LTE3MDYsNyArMTcwNSw3IEBAIGRpY3RfaW5kZXhfYnVpbGRfaW50ZXJuYWxfY2x1c3QoCiAKIAkJ
Zm9yIChpID0gMDsgaSA8IHRyeF9pZF9wb3M7IGkrKykgewogCi0JCQlmaXhlZF9zaXplID0gZGlj
dF9jb2xfZ2V0X2ZpeGVkX3NpemUoCisJCQl1bGludAlmaXhlZF9zaXplID0gZGljdF9jb2xfZ2V0
X2ZpeGVkX3NpemUoCiAJCQkJZGljdF9pbmRleF9nZXRfbnRoX2NvbChuZXdfaW5kZXgsIGkpKTsK
IAogCQkJaWYgKGZpeGVkX3NpemUgPT0gMCkgewpAQCAtMTcyMiw3ICsxNzIxLDIwIEBAIGRpY3Rf
aW5kZXhfYnVpbGRfaW50ZXJuYWxfY2x1c3QoCiAJCQkJYnJlYWs7CiAJCQl9CiAKLQkJCW5ld19p
bmRleC0+dHJ4X2lkX29mZnNldCArPSAodW5zaWduZWQgaW50KSBmaXhlZF9zaXplOworCQkJLyog
QWRkIGZpeGVkX3NpemUgdG8gbmV3X2luZGV4LT50cnhfaWRfb2Zmc2V0LgorCQkJQmVjYXVzZSB0
aGUgbGF0dGVyIGlzIGEgYml0LWZpZWxkLCBhbiBvdmVyZmxvdworCQkJY2FuIHRoZW9yZXRpY2Fs
bHkgb2NjdXIuIENoZWNrIGZvciBpdC4gKi8KKwkJCWZpeGVkX3NpemUgKz0gbmV3X2luZGV4LT50
cnhfaWRfb2Zmc2V0OworCisJCQluZXdfaW5kZXgtPnRyeF9pZF9vZmZzZXQgPSBmaXhlZF9zaXpl
OworCisJCQlpZiAobmV3X2luZGV4LT50cnhfaWRfb2Zmc2V0ICE9IGZpeGVkX3NpemUpIHsKKwkJ
CQkvKiBPdmVyZmxvdy4gUHJldGVuZCB0aGF0IHRoaXMgaXMgYQorCQkJCXZhcmlhYmxlLWxlbmd0
aCBQUklNQVJZIEtFWS4gKi8KKwkJCQl1dF9hZCgwKTsKKwkJCQluZXdfaW5kZXgtPnRyeF9pZF9v
ZmZzZXQgPSAwOworCQkJCWJyZWFrOworCQkJfQogCQl9CiAKIAl9Cgo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RpY3QwbWVtLmgnCi0tLSBhL3N0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS9kaWN0MG1lbS5oCXJldmlkOnRvci5kaWRyaWtzZW5Ab3JhY2xlLmNvbS0y
MDEyMTAwMTExMTIzOC1nZWF0dmJkdW4wMnJpYW5rCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5j
bHVkZS9kaWN0MG1lbS5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIxMDA4MTMw
MTUwLTRqbnZib3MxdzNlMjExeDEKQEAgLTE5NiwxMCArMTk2LDE1IEBAIHN0cnVjdCBkaWN0X2lu
ZGV4X3N0cnVjdHsKIAl1bnNpZ25lZAlzcGFjZTozMjsKIAkJCQkvKiBzcGFjZSB3aGVyZSB0aGUg
aW5kZXggdHJlZSBpcyBwbGFjZWQgKi8KIAl1bnNpZ25lZAlwYWdlOjMyOy8qIGluZGV4IHRyZWUg
cm9vdCBwYWdlIG51bWJlciAqLwotCXVuc2lnbmVkCXRyeF9pZF9vZmZzZXQ6MTA7LyogcG9zaXRp
b24gb2YgdGhlIHRoZSB0cnggaWQgY29sdW1uCisjZGVmaW5lIE1BWF9LRVlfTEVOR1RIX0JJVFMg
MTIKKwl1bnNpZ25lZAl0cnhfaWRfb2Zmc2V0Ok1BWF9LRVlfTEVOR1RIX0JJVFM7CisJCQkJLyog
cG9zaXRpb24gb2YgdGhlIHRyeCBpZCBjb2x1bW4KIAkJCQlpbiBhIGNsdXN0ZXJlZCBpbmRleCBy
ZWNvcmQsIGlmIHRoZSBmaWVsZHMKIAkJCQliZWZvcmUgaXQgYXJlIGtub3duIHRvIGJlIG9mIGEg
Zml4ZWQgc2l6ZSwKIAkJCQkwIG90aGVyd2lzZSAqLworI2lmICgxPDxNQVhfS0VZX0xFTkdUSF9C
SVRTKSA8IE1BWF9LRVlfTEVOR1RICisjIGVycm9yICgxPDxNQVhfS0VZX0xFTkdUSF9CSVRTKSA8
IE1BWF9LRVlfTEVOR1RICisjZW5kaWYKIAl1bnNpZ25lZAluX3VzZXJfZGVmaW5lZF9jb2xzOjEw
OwogCQkJCS8qIG51bWJlciBvZiBjb2x1bW5zIHRoZSB1c2VyIGRlZmluZWQgdG8KIAkJCQliZSBp
biB0aGUgaW5kZXg6IGluIHRoZSBpbnRlcm5hbAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9kaWN0L2RpY3QwZGljdC5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVn
aW4vZGljdC9kaWN0MGRpY3QuYwlyZXZpZDp0b3IuZGlkcmlrc2VuQG9yYWNsZS5jb20tMjAxMjEw
MDExMTEyMzgtZ2VhdHZiZHVuMDJyaWFuaworKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vZGlj
dC9kaWN0MGRpY3QuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMTAwODEzMDE1
MC00am52Ym9zMXczZTIxMXgxCkBAIC0xOTU5LDcgKzE5NTksNiBAQCBkaWN0X2luZGV4X2J1aWxk
X2ludGVybmFsX2NsdXN0KAogewogCWRpY3RfaW5kZXhfdCoJbmV3X2luZGV4OwogCWRpY3RfZmll
bGRfdCoJZmllbGQ7Ci0JdWxpbnQJCWZpeGVkX3NpemU7CiAJdWxpbnQJCXRyeF9pZF9wb3M7CiAJ
dWxpbnQJCWk7CiAJaWJvb2wqCQlpbmRleGVkOwpAQCAtMjAzNiw3ICsyMDM1LDcgQEAgZGljdF9p
bmRleF9idWlsZF9pbnRlcm5hbF9jbHVzdCgKIAogCQlmb3IgKGkgPSAwOyBpIDwgdHJ4X2lkX3Bv
czsgaSsrKSB7CiAKLQkJCWZpeGVkX3NpemUgPSBkaWN0X2NvbF9nZXRfZml4ZWRfc2l6ZSgKKwkJ
CXVsaW50CWZpeGVkX3NpemUgPSBkaWN0X2NvbF9nZXRfZml4ZWRfc2l6ZSgKIAkJCQlkaWN0X2lu
ZGV4X2dldF9udGhfY29sKG5ld19pbmRleCwgaSksCiAJCQkJZGljdF90YWJsZV9pc19jb21wKHRh
YmxlKSk7CiAKQEAgLTIwNTMsNyArMjA1MiwyMCBAQCBkaWN0X2luZGV4X2J1aWxkX2ludGVybmFs
X2NsdXN0KAogCQkJCWJyZWFrOwogCQkJfQogCi0JCQluZXdfaW5kZXgtPnRyeF9pZF9vZmZzZXQg
Kz0gKHVuc2lnbmVkIGludCkgZml4ZWRfc2l6ZTsKKwkJCS8qIEFkZCBmaXhlZF9zaXplIHRvIG5l
d19pbmRleC0+dHJ4X2lkX29mZnNldC4KKwkJCUJlY2F1c2UgdGhlIGxhdHRlciBpcyBhIGJpdC1m
aWVsZCwgYW4gb3ZlcmZsb3cKKwkJCWNhbiB0aGVvcmV0aWNhbGx5IG9jY3VyLiBDaGVjayBmb3Ig
aXQuICovCisJCQlmaXhlZF9zaXplICs9IG5ld19pbmRleC0+dHJ4X2lkX29mZnNldDsKKworCQkJ
bmV3X2luZGV4LT50cnhfaWRfb2Zmc2V0ID0gZml4ZWRfc2l6ZTsKKworCQkJaWYgKG5ld19pbmRl
eC0+dHJ4X2lkX29mZnNldCAhPSBmaXhlZF9zaXplKSB7CisJCQkJLyogT3ZlcmZsb3cuIFByZXRl
bmQgdGhhdCB0aGlzIGlzIGEKKwkJCQl2YXJpYWJsZS1sZW5ndGggUFJJTUFSWSBLRVkuICovCisJ
CQkJdXRfYWQoMCk7CisJCQkJbmV3X2luZGV4LT50cnhfaWRfb2Zmc2V0ID0gMDsKKwkJCQlicmVh
azsKKwkJCX0KIAkJfQogCiAJfQoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi9pbmNsdWRlL2RpY3QwbWVtLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNs
dWRlL2RpY3QwbWVtLmgJcmV2aWQ6dG9yLmRpZHJpa3NlbkBvcmFjbGUuY29tLTIwMTIxMDAxMTEx
MjM4LWdlYXR2YmR1bjAycmlhbmsKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUv
ZGljdDBtZW0uaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMTAwODEzMDE1MC00
am52Ym9zMXczZTIxMXgxCkBAIC0yODYsMTAgKzI4NiwxNSBAQCBzdHJ1Y3QgZGljdF9pbmRleF9z
dHJ1Y3R7CiAjZW5kaWYgLyogIVVOSVZfSE9UQkFDS1VQICovCiAJdW5zaWduZWQJdHlwZTo0Owkv
KiE8IGluZGV4IHR5cGUgKERJQ1RfQ0xVU1RFUkVELCBESUNUX1VOSVFVRSwKIAkJCQlESUNUX1VO
SVZFUlNBTCwgRElDVF9JQlVGKSAqLwotCXVuc2lnbmVkCXRyeF9pZF9vZmZzZXQ6MTA7LyohPCBw
b3NpdGlvbiBvZiB0aGUgdHJ4IGlkIGNvbHVtbgorI2RlZmluZSBNQVhfS0VZX0xFTkdUSF9CSVRT
IDEyCisJdW5zaWduZWQJdHJ4X2lkX29mZnNldDpNQVhfS0VZX0xFTkdUSF9CSVRTOworCQkJCS8q
ITwgcG9zaXRpb24gb2YgdGhlIHRyeCBpZCBjb2x1bW4KIAkJCQlpbiBhIGNsdXN0ZXJlZCBpbmRl
eCByZWNvcmQsIGlmIHRoZSBmaWVsZHMKIAkJCQliZWZvcmUgaXQgYXJlIGtub3duIHRvIGJlIG9m
IGEgZml4ZWQgc2l6ZSwKIAkJCQkwIG90aGVyd2lzZSAqLworI2lmICgxPDxNQVhfS0VZX0xFTkdU
SF9CSVRTKSA8IE1BWF9LRVlfTEVOR1RICisjIGVycm9yICgxPDxNQVhfS0VZX0xFTkdUSF9CSVRT
KSA8IE1BWF9LRVlfTEVOR1RICisjZW5kaWYKIAl1bnNpZ25lZAluX3VzZXJfZGVmaW5lZF9jb2xz
OjEwOwogCQkJCS8qITwgbnVtYmVyIG9mIGNvbHVtbnMgdGhlIHVzZXIgZGVmaW5lZCB0bwogCQkJ
CWJlIGluIHRoZSBpbmRleDogaW4gdGhlIGludGVybmFsCgpObyBidW5kbGUgKHJlYXNvbjogdXNl
bGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==