From: Tor Didriksen
Date: February 2 2011 1:41pm
Subject: bzr push into mysql-5.5 branch (tor.didriksen:3295 to 3296) Bug#36022
List-Archive: http://lists.mysql.com/commits/130222
X-Bug: 36022
Message-Id: <20110202134148.9611C3768@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDMyOTYgVG9yIERpZHJpa3NlbgkyMDExLTAyLTAyCiAgICAgIEJ1ZyAjMzYwMjIgcGxlYXNlIGxv
ZyBtb3JlIGluZm9ybWF0aW9uIGFib3V0ICJTb3J0IGFib3J0ZWQiIHF1ZXJpZXMKICAgICAgCiAg
ICAgIFdyaXRlIGFuIGFkZGl0aW9uYWwgd2FybmluZyBtZXNzYWdlIHRvIHRoZSBzZXJ2ZXIgbG9n
LCAKICAgICAgZXhwbGFpbmluZyB3aHkgYSBzb3J0IG9wZXJhdGlvbiBpcyBhYm9ydGVkLgogICAg
ICAKICAgICAgVGhlIG91dHB1dCBpbiBteXNxbGQuZXJyIHdpbGwgbG9vayBzb21ldGhpbmcgbGlr
ZToKICAgICAgMTEwMTI3IDE1OjA3OjU0IFtFUlJPUl0gbXlzcWxkOiBTb3J0IGFib3J0ZWQ6IE91
dCBvZiBtZW1vcnkgKE5lZWRlZCAyNCBieXRlcykKICAgICAgMTEwMTI3IDE1OjA3OjU0IFtFUlJP
Ul0gbXlzcWxkOiBPdXQgb2Ygc29ydCBtZW1vcnksIGNvbnNpZGVyIGluY3JlYXNpbmcgc2VydmVy
IHNvcnQgYnVmZmVyIHNpemUKICAgICAgMTEwMTI3IDE1OjA3OjU0IFtFUlJPUl0gbXlzcWxkOiBT
b3J0IGFib3J0ZWQ6IE91dCBvZiBzb3J0IG1lbW9yeSwgY29uc2lkZXIgaW5jcmVhc2luZyBzZXJ2
ZXIgc29ydCBidWZmZXIgc2l6ZQogICAgICAxMTAxMjcgMTU6MDc6NTQgW0VSUk9SXSBteXNxbGQ6
IFNvcnQgYWJvcnRlZDogSW5jb3JyZWN0IG51bWJlciBvZiBhcmd1bWVudHMgZm9yIEZVTkNUSU9O
IHRlc3QuZjE7IGV4cGVjdGVkIDAsIGdvdCAxCiAgICAgIAogICAgICBJZiAtLWxvZy13YXJuPTIg
aXMgZW5hYmxlZCwgd2Ugb3V0cHV0IGluZm9ybWF0aW9uIGFib3V0IGhvc3QvdXNlci9xdWVyeSBh
cyB3ZWxsLgogICAgIEAgaW5jbHVkZS9teV9zeXMuaAogICAgICAgIFVwZGF0ZSBjb21tZW50IGZv
ciBNRV9OT1JFRlJFU0gKICAgICBAIG15c3FsLXRlc3QvaW5jbHVkZS9tdHJfd2FybmluZ3Muc3Fs
CiAgICAgICAgUmVtb3ZlIGdsb2JhbCBmaWx0ZXJpbmcgb2YgIk91dCBvZiBzb3J0IG1lbW9yeSIs
IGxldCBlYWNoIGluZGl2aWR1YWwgdGVzdCBzZXQgaXQgaW5zdGVhZC4KICAgICBAIG15c3FsLXRl
c3Qvci9maWxlc29ydF9kZWJ1Zy5yZXN1bHQKICAgICAgICBOZXcgdGVzdCBjYXNlLgogICAgIEAg
bXlzcWwtdGVzdC9yL29yZGVyX2J5LnJlc3VsdAogICAgICAgIElnbm9yZSAiT3V0IG9mIG1lbW9y
eSIgZm9yIHRoaXMgdGVzdC4KICAgICBAIG15c3FsLXRlc3QvdC9maWxlc29ydF9kZWJ1Zy50ZXN0
CiAgICAgICAgTmV3IHRlc3QgY2FzZS4KICAgICBAIG15c3FsLXRlc3QvdC9vcmRlcl9ieS50ZXN0
CiAgICAgICAgSWdub3JlICJPdXQgb2YgbWVtb3J5IiBmb3IgdGhpcyB0ZXN0LgogICAgIEAgc3Fs
L2ZpbGVzb3J0LmNjCiAgICAgICAgT3V0cHV0IGFuIGV4cGxhbmF0aW9uIHVzaW5nIHRoZSBlcnJv
ciBtZXNzYWdlIGZyb20gdGhlIFRIRCBEaWFnbm9zdGljc19hcmVhLgogICAgIEAgc3FsL3Byb3Rv
Y29sLmNjCiAgICAgICAgRG8gbm90IERCVUdfUkVUVVJOKGZ1bmN0aW9uX2NhbGxfd2l0aCBEQlVH
X1JFVFVSTikKICAgICAgICBhcyBpdCBtZXNzZXMgdXAgdGhlIGNhbGwgc3RhY2sgaW4gdGhlIGRl
YnVnIG91dHB1dC4KICAgICBAIHNxbC9zaGFyZS9lcnJtc2ctdXRmOC50eHQKICAgICAgICBDaGFu
Z2UgZXJyb3IgbWVzc2FnZSBmb3IgIk91dCBvZiBzb3J0IG1lbW9yeSIKICAgICBAIHNxbC91bmly
ZWcuaAogICAgICAgIFJlbW92ZSB1bnVzZWQvY29uZnVzaW5nIEVSUk1BUFAgbWFjcm8uCgogICAg
YWRkZWQ6CiAgICAgIG15c3FsLXRlc3Qvci9maWxlc29ydF9kZWJ1Zy5yZXN1bHQKICAgICAgbXlz
cWwtdGVzdC90L2ZpbGVzb3J0X2RlYnVnLnRlc3QKICAgIG1vZGlmaWVkOgogICAgICBpbmNsdWRl
L215X3N5cy5oCiAgICAgIG15c3FsLXRlc3QvaW5jbHVkZS9tdHJfd2FybmluZ3Muc3FsCiAgICAg
IG15c3FsLXRlc3Qvci9vcmRlcl9ieS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC90L29yZGVyX2J5
LnRlc3QKICAgICAgc3FsL2ZpbGVzb3J0LmNjCiAgICAgIHNxbC9wcm90b2NvbC5jYwogICAgICBz
cWwvc2hhcmUvZXJybXNnLXV0ZjgudHh0CiAgICAgIHNxbC91bmlyZWcuaAogMzI5NSBUb3IgRGlk
cmlrc2VuCTIwMTEtMDItMDIKICAgICAgQmFja3BvcnQgb2YgZml4IGZvciBCdWcjNTIxMjMKCiAg
ICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9yL2Z1bmNfZ3JvdXAucmVzdWx0CiAgICAgIG15
c3FsLXRlc3QvdC9mdW5jX2dyb3VwLnRlc3QKICAgICAgc3FsL2l0ZW1fc3VtLmNjCiAgICAgIHNx
bC9pdGVtX3N1bS5oCj09PSBtb2RpZmllZCBmaWxlICdpbmNsdWRlL215X3N5cy5oJwotLS0gYS9p
bmNsdWRlL215X3N5cy5oCTIwMTEtMDEtMTcgMDc6NDQ6MzcgKzAwMDAKKysrIGIvaW5jbHVkZS9t
eV9zeXMuaAkyMDExLTAyLTAyIDExOjU0OjQ5ICswMDAwCkBAIC0xLDQgKzEsNCBAQAotLyogQ29w
eXJpZ2h0IChjKSAyMDAwLCAyMDEwLCBPcmFjbGUgYW5kL29yIGl0cyBhZmZpbGlhdGVzLiBBbGwg
cmlnaHRzIHJlc2VydmVkLgorLyogQ29weXJpZ2h0IChjKSAyMDAwLCAyMDExLCBPcmFjbGUgYW5k
L29yIGl0cyBhZmZpbGlhdGVzLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogCiAgICBUaGlzIHByb2dy
YW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlm
eQogICAgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5z
ZSBhcyBwdWJsaXNoZWQgYnkKQEAgLTEwNCw3ICsxMDQsNyBAQCB0eXBlZGVmIHN0cnVjdCBteV9h
aW9fcmVzdWx0IHsKICNkZWZpbmUgTUVfSE9MRFRBTkcJOAkvKiBEb24ndCBkZWxldGUgbGFzdCBr
ZXlzICovCiAjZGVmaW5lIE1FX1dBSVRUT1QJMTYJLyogV2FpdCBmb3IgZXJydGltZSBzZWNzIG9m
IGZvciBhIGFjdGlvbiAqLwogI2RlZmluZSBNRV9XQUlUVEFORwkzMgkvKiBXYWl0IGZvciBhIHVz
ZXIgYWN0aW9uICAqLwotI2RlZmluZSBNRV9OT1JFRlJFU0gJNjQJLyogRG9udCByZWZyZXNoIHNj
cmVlbiAqLworI2RlZmluZSBNRV9OT1JFRlJFU0gJNjQJLyogV3JpdGUgdGhlIGVycm9yIG1lc3Nh
Z2UgdG8gZXJyb3IgbG9nICovCiAjZGVmaW5lIE1FX05PSU5QVVQJMTI4CS8qIERvbnQgdXNlIHRo
ZSBpbnB1dCBsaWJhcnkgKi8KICNkZWZpbmUgTUVfQ09MT1VSMQkoKDEgPDwgTUVfSElHSEJZVEUp
KQkvKiBQb3NzaWJseSBlcnJvci1jb2xvdXJzICovCiAjZGVmaW5lIE1FX0NPTE9VUjIJKCgyIDw8
IE1FX0hJR0hCWVRFKSkKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L2luY2x1ZGUvbXRy
X3dhcm5pbmdzLnNxbCcKLS0tIGEvbXlzcWwtdGVzdC9pbmNsdWRlL210cl93YXJuaW5ncy5zcWwJ
MjAxMC0xMC0xNCAxMDowNTo1OSArMDAwMAorKysgYi9teXNxbC10ZXN0L2luY2x1ZGUvbXRyX3dh
cm5pbmdzLnNxbAkyMDExLTAyLTAyIDExOjU0OjQ5ICswMDAwCkBAIC0xODMsOSArMTgzLDYgQEAg
SU5TRVJUIElOVE8gZ2xvYmFsX3N1cHByZXNzaW9ucyBWQUxVRVMKICAoIlRoZSBzbGF2ZSBJLk8g
dGhyZWFkIHN0b3BzIGJlY2F1c2UgYSBmYXRhbCBlcnJvciBpcyBlbmNvdW50ZXJlZCB3aGVuIGl0
IHRyeSB0byBnZXQgdGhlIHZhbHVlIG9mIFNFUlZFUl9JRCB2YXJpYWJsZSBmcm9tIG1hc3Rlci4i
KSwKICAoIi5TRUxFQ1QgVU5JWF9USU1FU1RBTVAuLi4gZmFpbGVkIG9uIG1hc3RlciwgZG8gbm90
IHRydXN0IGNvbHVtbiBTZWNvbmRzX0JlaGluZF9NYXN0ZXIgb2YgU0hPVyBTTEFWRSBTVEFUVVMi
KSwKIAotIC8qIFRlc3QgY2FzZSBmb3IgQnVnIzMxNTkwIGluIG9yZGVyX2J5LnRlc3QgcHJvZHVj
ZXMgdGhlIGZvbGxvd2luZyBlcnJvciAqLwotICgiT3V0IG9mIHNvcnQgbWVtb3J5OyBpbmNyZWFz
ZSBzZXJ2ZXIgc29ydCBidWZmZXIgc2l6ZSIpLAotCiAgLyogU3BlY2lhbCBjYXNlIGZvciBCdWcg
IzI2NDAyIGluIHNob3dfY2hlY2sudGVzdAogICAgIC0gUXVlc3Rpb24gbWFya3MgYXJlIG5vdCB2
YWxpZCBmaWxlIG5hbWUgcGFydHMgb24gV2luZG93cy4gSWdub3JlCiAgICAgICB0aGlzIGVycm9y
IG1lc3NhZ2UuCgo9PT0gYWRkZWQgZmlsZSAnbXlzcWwtdGVzdC9yL2ZpbGVzb3J0X2RlYnVnLnJl
c3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9yL2ZpbGVzb3J0X2RlYnVnLnJlc3VsdAkxOTcwLTAxLTAx
IDAwOjAwOjAwICswMDAwCisrKyBiL215c3FsLXRlc3Qvci9maWxlc29ydF9kZWJ1Zy5yZXN1bHQJ
MjAxMS0wMi0wMiAxMTo1NDo0OSArMDAwMApAQCAtMCwwICsxLDE2IEBACitTRVQgQG9sZF9kZWJ1
Zz0gQEBzZXNzaW9uLmRlYnVnOworIworIyBCdWcjMzYwMjIgcGxlYXNlIGxvZyBtb3JlIGluZm9y
bWF0aW9uIGFib3V0ICJTb3J0IGFib3J0ZWQiIHF1ZXJpZXMKKyMKK0NSRUFURSBUQUJMRSB0MShm
MCBpbnQgYXV0b19pbmNyZW1lbnQgcHJpbWFyeSBrZXksIGYxIGludCk7CitJTlNFUlQgSU5UTyB0
MShmMSkgVkFMVUVTICgwKSwoMSksKDIpLCgzKSwoNCksKDUpOworU0VUIHNlc3Npb24gZGVidWc9
ICcrZCxtYWtlX2NoYXJfYXJyYXlfZmFpbCc7CitDQUxMIG10ci5hZGRfc3VwcHJlc3Npb24oIk91
dCBvZiBzb3J0IG1lbW9yeSIpOworU0VMRUNUICogRlJPTSB0MSBPUkRFUiBCWSBmMSBBU0MsIGYw
OworRVJST1IgSFkwMDE6IE91dCBvZiBzb3J0IG1lbW9yeSwgY29uc2lkZXIgaW5jcmVhc2luZyBz
ZXJ2ZXIgc29ydCBidWZmZXIgc2l6ZQorU0VUIHNlc3Npb24gZGVidWc9IEBvbGRfZGVidWc7CitD
UkVBVEUgRlVOQ1RJT04gZjEoKSBSRVRVUk5TIElOVCBSRVRVUk4gMTsKK0RFTEVURSBGUk9NIHQx
IE9SREVSIEJZIChmMSgxMCkpIExJTUlUIDE7CitFUlJPUiA0MjAwMDogSW5jb3JyZWN0IG51bWJl
ciBvZiBhcmd1bWVudHMgZm9yIEZVTkNUSU9OIHRlc3QuZjE7IGV4cGVjdGVkIDAsIGdvdCAxCitE
Uk9QIFRBQkxFIHQxOworRFJPUCBGVU5DVElPTiBmMTsKCj09PSBtb2RpZmllZCBmaWxlICdteXNx
bC10ZXN0L3Ivb3JkZXJfYnkucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3Ivb3JkZXJfYnkucmVz
dWx0CTIwMTAtMDktMTMgMTI6NDY6NTUgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9yL29yZGVyX2J5
LnJlc3VsdAkyMDExLTAyLTAyIDExOjU0OjQ5ICswMDAwCkBAIC0xNDI1LDggKzE0MjUsOSBAQCBz
ZXQgc2Vzc2lvbiBzb3J0X2J1ZmZlcl9zaXplPSAzMDAwMDsKIFdhcm5pbmdzOgogV2FybmluZwkx
MjkyCVRydW5jYXRlZCBpbmNvcnJlY3Qgc29ydF9idWZmZXJfc2l6ZSB2YWx1ZTogJzMwMDAwJwog
c2V0IHNlc3Npb24gbWF4X3NvcnRfbGVuZ3RoPSAyMTgwOworQ0FMTCBtdHIuYWRkX3N1cHByZXNz
aW9uKCJPdXQgb2Ygc29ydCBtZW1vcnkiKTsKIHNlbGVjdCAqIGZyb20gdDEgb3JkZXIgYnkgYjsK
LUVSUk9SIEhZMDAxOiBPdXQgb2Ygc29ydCBtZW1vcnk7IGluY3JlYXNlIHNlcnZlciBzb3J0IGJ1
ZmZlciBzaXplCitFUlJPUiBIWTAwMTogT3V0IG9mIHNvcnQgbWVtb3J5LCBjb25zaWRlciBpbmNy
ZWFzaW5nIHNlcnZlciBzb3J0IGJ1ZmZlciBzaXplCiBkcm9wIHRhYmxlIHQxOwogIwogIyBCdWcg
IzM5ODQ0OiBRdWVyeSBDcmFzaCBNeXNxbCBTZXJ2ZXIgNS4wLjY3Cgo9PT0gYWRkZWQgZmlsZSAn
bXlzcWwtdGVzdC90L2ZpbGVzb3J0X2RlYnVnLnRlc3QnCi0tLSBhL215c3FsLXRlc3QvdC9maWxl
c29ydF9kZWJ1Zy50ZXN0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysrIGIvbXlzcWwtdGVz
dC90L2ZpbGVzb3J0X2RlYnVnLnRlc3QJMjAxMS0wMi0wMiAxMTo1NDo0OSArMDAwMApAQCAtMCww
ICsxLDIzIEBACistLXNvdXJjZSBpbmNsdWRlL2hhdmVfZGVidWcuaW5jCisKK1NFVCBAb2xkX2Rl
YnVnPSBAQHNlc3Npb24uZGVidWc7CisKKy0tZWNobyAjCistLWVjaG8gIyBCdWcjMzYwMjIgcGxl
YXNlIGxvZyBtb3JlIGluZm9ybWF0aW9uIGFib3V0ICJTb3J0IGFib3J0ZWQiIHF1ZXJpZXMKKy0t
ZWNobyAjCisKK0NSRUFURSBUQUJMRSB0MShmMCBpbnQgYXV0b19pbmNyZW1lbnQgcHJpbWFyeSBr
ZXksIGYxIGludCk7CitJTlNFUlQgSU5UTyB0MShmMSkgVkFMVUVTICgwKSwoMSksKDIpLCgzKSwo
NCksKDUpOworCitTRVQgc2Vzc2lvbiBkZWJ1Zz0gJytkLG1ha2VfY2hhcl9hcnJheV9mYWlsJzsK
K0NBTEwgbXRyLmFkZF9zdXBwcmVzc2lvbigiT3V0IG9mIHNvcnQgbWVtb3J5Iik7CistLWVycm9y
IEVSX09VVF9PRl9TT1JUTUVNT1JZCitTRUxFQ1QgKiBGUk9NIHQxIE9SREVSIEJZIGYxIEFTQywg
ZjA7CitTRVQgc2Vzc2lvbiBkZWJ1Zz0gQG9sZF9kZWJ1ZzsKKworQ1JFQVRFIEZVTkNUSU9OIGYx
KCkgUkVUVVJOUyBJTlQgUkVUVVJOIDE7CistLWVycm9yIEVSX1NQX1dST05HX05PX09GX0FSR1MK
K0RFTEVURSBGUk9NIHQxIE9SREVSIEJZIChmMSgxMCkpIExJTUlUIDE7CisKK0RST1AgVEFCTEUg
dDE7CitEUk9QIEZVTkNUSU9OIGYxOwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3QvdC9v
cmRlcl9ieS50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3Qvb3JkZXJfYnkudGVzdAkyMDEwLTA5LTEz
IDEyOjQ2OjU1ICswMDAwCisrKyBiL215c3FsLXRlc3QvdC9vcmRlcl9ieS50ZXN0CTIwMTEtMDIt
MDIgMTE6NTQ6NDkgKzAwMDAKQEAgLTg0Myw3ICs4NDMsOCBAQCBjcmVhdGUgdGFibGUgdDEoYSBp
bnQsIGIgdGlueXRleHQpOwogaW5zZXJ0IGludG8gdDEgdmFsdWVzICgxLDIpLCgzLDIpOwogc2V0
IHNlc3Npb24gc29ydF9idWZmZXJfc2l6ZT0gMzAwMDA7CiBzZXQgc2Vzc2lvbiBtYXhfc29ydF9s
ZW5ndGg9IDIxODA7Ci0tLWVycm9yIDEwMzgKK0NBTEwgbXRyLmFkZF9zdXBwcmVzc2lvbigiT3V0
IG9mIHNvcnQgbWVtb3J5Iik7CistLWVycm9yIEVSX09VVF9PRl9TT1JUTUVNT1JZCiBzZWxlY3Qg
KiBmcm9tIHQxIG9yZGVyIGJ5IGI7CiBkcm9wIHRhYmxlIHQxOwogCgo9PT0gbW9kaWZpZWQgZmls
ZSAnc3FsL2ZpbGVzb3J0LmNjJwotLS0gYS9zcWwvZmlsZXNvcnQuY2MJMjAxMS0wMS0xMSAwOTow
NzozNyArMDAwMAorKysgYi9zcWwvZmlsZXNvcnQuY2MJMjAxMS0wMi0wMiAxMTo1NDo0OSArMDAw
MApAQCAtMzI0LDggKzMyNCwyNCBAQCBoYV9yb3dzIGZpbGVzb3J0KFRIRCAqdGhkLCBUQUJMRSAq
dGFibGUsCiAgICAgfQogICB9CiAgIGlmIChlcnJvcikKLSAgICBteV9tZXNzYWdlKEVSX0ZJTFNP
UlRfQUJPUlQsIEVSKEVSX0ZJTFNPUlRfQUJPUlQpLAotICAgICAgICAgICAgICAgTVlGKE1FX0VS
Uk9SK01FX1dBSVRUQU5HKSk7CisgIHsKKyAgICBEQlVHX0FTU0VSVCh0aGQtPmlzX2Vycm9yKCkp
OworICAgIG15X3ByaW50Zl9lcnJvcihFUl9GSUxTT1JUX0FCT1JULAorICAgICAgICAgICAgICAg
ICAgICAiJXM6ICVzIiwKKyAgICAgICAgICAgICAgICAgICAgTVlGKE1FX0VSUk9SICsgTUVfV0FJ
VFRBTkcpLAorICAgICAgICAgICAgICAgICAgICBFUl9USEQodGhkLCBFUl9GSUxTT1JUX0FCT1JU
KSwKKyAgICAgICAgICAgICAgICAgICAgdGhkLT5zdG10X2RhLT5tZXNzYWdlKCkpOworICAgICAg
ICAgICAgICAgICAgICAKKyAgICBpZiAoZ2xvYmFsX3N5c3RlbV92YXJpYWJsZXMubG9nX3dhcm5p
bmdzID4gMSkKKyAgICB7CisgICAgICBzcWxfcHJpbnRfd2FybmluZygiJXMsIGhvc3Q6ICVzLCB1
c2VyOiAlcywgdGhyZWFkOiAlbHUsIHF1ZXJ5OiAlLS40MDk2cyIsCisgICAgICAgICAgICAgICAg
ICAgICAgICBFUl9USEQodGhkLCBFUl9GSUxTT1JUX0FCT1JUKSwKKyAgICAgICAgICAgICAgICAg
ICAgICAgIHRoZC0+c2VjdXJpdHlfY3R4LT5ob3N0X29yX2lwLAorICAgICAgICAgICAgICAgICAg
ICAgICAgJnRoZC0+c2VjdXJpdHlfY3R4LT5wcml2X3VzZXJbMF0sCisgICAgICAgICAgICAgICAg
ICAgICAgICAodWxvbmcpIHRoZC0+dGhyZWFkX2lkLAorICAgICAgICAgICAgICAgICAgICAgICAg
dGhkLT5xdWVyeSgpKTsKKyAgICB9CisgIH0KICAgZWxzZQogICAgIHN0YXRpc3RpY19hZGQodGhk
LT5zdGF0dXNfdmFyLmZpbGVzb3J0X3Jvd3MsCiAJCSAgKHVsb25nKSByZWNvcmRzLCAmTE9DS19z
dGF0dXMpOwpAQCAtMzY5LDYgKzM4NSw5IEBAIHN0YXRpYyBjaGFyICoqbWFrZV9jaGFyX2FycmF5
KGNoYXIgKipvbGQKICAgY2hhciAqY2hhcl9wb3M7CiAgIERCVUdfRU5URVIoIm1ha2VfY2hhcl9h
cnJheSIpOwogCisgIERCVUdfRVhFQ1VURV9JRigibWFrZV9jaGFyX2FycmF5X2ZhaWwiLAorICAg
ICAgICAgICAgICAgICAgREJVR19TRVQoIitkLHNpbXVsYXRlX291dF9vZl9tZW1vcnkiKTspOwor
CiAgIGlmIChvbGRfcG9zIHx8CiAgICAgICAob2xkX3Bvcz0gKGNoYXIqKikgbXlfbWFsbG9jKCh1
aW50KSBmaWVsZHMqKGxlbmd0aCtzaXplb2YoY2hhciopKSwKIAkJCQkgICBteV9mbGFnKSkpCgo9
PT0gbW9kaWZpZWQgZmlsZSAnc3FsL3Byb3RvY29sLmNjJwotLS0gYS9zcWwvcHJvdG9jb2wuY2MJ
MjAxMC0xMS0xMiAxMjo1NjoyMSArMDAwMAorKysgYi9zcWwvcHJvdG9jb2wuY2MJMjAxMS0wMi0w
MiAxMTo1NDo0OSArMDAwMApAQCAtMSw0ICsxLDQgQEAKLS8qIENvcHlyaWdodCAoYykgMjAwMCwg
MjAxMCBPcmFjbGUgYW5kL29yIGl0cyBhZmZpbGlhdGVzLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor
LyogQ29weXJpZ2h0IChjKSAyMDAwLCAyMDExIE9yYWNsZSBhbmQvb3IgaXRzIGFmZmlsaWF0ZXMu
IEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAKICAgIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJl
OyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5CiAgICBpdCB1bmRlciB0aGUg
dGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQpA
QCAtNTQzLDkgKzU0MywxMCBAQCBib29sIFByb3RvY29sOjpzZW5kX29rKHVpbnQgc2VydmVyX3N0
YXR1CiAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKm1lc3NhZ2UpCiB7CiAgIERC
VUdfRU5URVIoIlByb3RvY29sOjpzZW5kX29rIik7Ci0KLSAgREJVR19SRVRVUk4obmV0X3NlbmRf
b2sodGhkLCBzZXJ2ZXJfc3RhdHVzLCBzdGF0ZW1lbnRfd2Fybl9jb3VudCwKLSAgICAgICAgICAg
ICAgICAgICAgICAgICAgYWZmZWN0ZWRfcm93cywgbGFzdF9pbnNlcnRfaWQsIG1lc3NhZ2UpKTsK
KyAgY29uc3QgYm9vbCByZXR2YWw9IAorICAgIG5ldF9zZW5kX29rKHRoZCwgc2VydmVyX3N0YXR1
cywgc3RhdGVtZW50X3dhcm5fY291bnQsCisgICAgICAgICAgICAgICAgYWZmZWN0ZWRfcm93cywg
bGFzdF9pbnNlcnRfaWQsIG1lc3NhZ2UpOworICBEQlVHX1JFVFVSTihyZXR2YWwpOwogfQogCiAK
QEAgLTU1OCw4ICs1NTksOCBAQCBib29sIFByb3RvY29sOjpzZW5kX29rKHVpbnQgc2VydmVyX3N0
YXR1CiBib29sIFByb3RvY29sOjpzZW5kX2VvZih1aW50IHNlcnZlcl9zdGF0dXMsIHVpbnQgc3Rh
dGVtZW50X3dhcm5fY291bnQpCiB7CiAgIERCVUdfRU5URVIoIlByb3RvY29sOjpzZW5kX2VvZiIp
OwotCi0gIERCVUdfUkVUVVJOKG5ldF9zZW5kX2VvZih0aGQsIHNlcnZlcl9zdGF0dXMsIHN0YXRl
bWVudF93YXJuX2NvdW50KSk7CisgIGNvbnN0IGJvb2wgcmV0dmFsPSBuZXRfc2VuZF9lb2YodGhk
LCBzZXJ2ZXJfc3RhdHVzLCBzdGF0ZW1lbnRfd2Fybl9jb3VudCk7CisgIERCVUdfUkVUVVJOKHJl
dHZhbCk7CiB9CiAKIApAQCAtNTczLDggKzU3NCw4IEBAIGJvb2wgUHJvdG9jb2w6OnNlbmRfZXJy
b3IodWludCBzcWxfZXJybm8KICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgY2hhciAq
c3FsX3N0YXRlKQogewogICBEQlVHX0VOVEVSKCJQcm90b2NvbDo6c2VuZF9lcnJvciIpOwotCi0g
IERCVUdfUkVUVVJOKG5ldF9zZW5kX2Vycm9yX3BhY2tldCh0aGQsIHNxbF9lcnJubywgZXJyX21z
Zywgc3FsX3N0YXRlKSk7CisgIGNvbnN0IGJvb2wgcmV0dmFsPSBuZXRfc2VuZF9lcnJvcl9wYWNr
ZXQodGhkLCBzcWxfZXJybm8sIGVycl9tc2csIHNxbF9zdGF0ZSk7CisgIERCVUdfUkVUVVJOKHJl
dHZhbCk7CiB9CiAKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3NxbC9zaGFyZS9lcnJtc2ctdXRmOC50
eHQnCi0tLSBhL3NxbC9zaGFyZS9lcnJtc2ctdXRmOC50eHQJMjAxMC0xMS0wNSAxNzo0MjozNyAr
MDAwMAorKysgYi9zcWwvc2hhcmUvZXJybXNnLXV0ZjgudHh0CTIwMTEtMDItMDIgMTE6NTQ6NDkg
KzAwMDAKQEAgLTg5Nyw3ICs4OTcsNyBAQCBFUl9PVVRfT0ZfU09SVE1FTU9SWSBIWTAwMSBTMTAw
MQogICAgICAgICBjemUgIk0bLULDoWxvIHBhbcSbdGkgcHJvIHTFmcOtZMSbbsOtLiBadnnFoXRl
IHZlbGlrb3N0IHTFmcOtZMOtY8OtaG8gYnVmZmVydSIKICAgICAgICAgZGFuICJJa2tlIG1lcmUg
c29ydGVyaW5nc2h1a29tbWVsc2UuIMOYZyBzb3J0ZXJpbmdzaHVrb21tZWxzZSAoc29ydCBidWZm
ZXIgc2l6ZSkgZm9yIHNlcnZlcmVuIgogICAgICAgICBubGEgIkdlZW4gZ2VoZXVnZW4gb20gdGUg
c29ydGVyZW4uIFZlcmhvb2cgZGUgc2VydmVyIHNvcnQgYnVmZmVyIHNpemUiCi0gICAgICAgIGVu
ZyAiT3V0IG9mIHNvcnQgbWVtb3J5OyBpbmNyZWFzZSBzZXJ2ZXIgc29ydCBidWZmZXIgc2l6ZSIK
KyAgICAgICAgZW5nICJPdXQgb2Ygc29ydCBtZW1vcnksIGNvbnNpZGVyIGluY3JlYXNpbmcgc2Vy
dmVyIHNvcnQgYnVmZmVyIHNpemUiCiAgICAgICAgIGpwcyAiT3V0IG9mIHNvcnQgbWVtb3J5LiBz
b3J0IGJ1ZmZlciBzaXplIOOBjOi2s+OCiuOBquOBhOOCiOOBhuOBp+OBmS4iLAogICAgICAgICBl
c3QgIk3DpGx1IHNhaSBzb3J0ZWVyaW1pc2VsIG90c2EuIFN1dXJlbmRhIE15U1FMLWkgc29ydGVl
cmltaXNwdWh2cml0IgogICAgICAgICBmcmUgIk1hbnF1ZSBkZSBtw6ltb2lyZSBwb3VyIGxlIHRy
aS4gQXVnbWVudGV6LWxhLiIKQEAgLTkwNywxMCArOTA3LDEwIEBAIEVSX09VVF9PRl9TT1JUTUVN
T1JZIEhZMDAxIFMxMDAxCiAgICAgICAgIGl0YSAiTWVtb3JpYSBwZXIgZ2xpIG9yZGluYW1lbnRp
IGVzYXVyaXRhLiBJbmNyZW1lbnRhcmUgaWwgJ3NvcnRfYnVmZmVyJyBhbCBkZW1vbmUiCiAgICAg
ICAgIGpwbiAiT3V0IG9mIHNvcnQgbWVtb3J5LiBzb3J0IGJ1ZmZlciBzaXplIOOBjOi2s+OCiuOB
quOBhOOCiOOBhuOBp+OBmS4iCiAgICAgICAgIGtvciAiT3V0IG9mIHNvcnQgbWVtb3J5LiBkYWVt
b24gc29ydCBidWZmZXLsnZgg7YGs6riw66W8IOymneqwgOyLnO2CpOyEuOyalCIKLSAgICAgICAg
bm9yICJJa2tlIG1lciBzb3J0ZXJpbmdzbWlubmUuIMOYayBzb3J0ZXJpbmdzbWlubmV0IChzb3J0
IGJ1ZmZlciBzaXplKSBmb3IgdGplbmVzdGVuIgotICAgICAgICBub3J3ZWdpYW4tbnkgIklra2pl
IG1laXIgc29ydGVyaW5nc21pbm5lLiBBdWsgc29ydGVyaW5nc21pbm5ldCAoc29ydGVyaW5nc2Jm
ZmVyIHN0b3JsZWlrKSBmb3IgdGVuZXN0ZW4iCisgICAgICAgIG5vciAiSWtrZSBtZXIgc29ydGVy
aW5nc21pbm5lLiBWdXJkZXIgw6Ugw7hrZSBzb3J0ZXJpbmdzbWlubmV0IChzb3J0IGJ1ZmZlciBz
aXplKSBmb3IgdGplbmVzdGVuIgorICAgICAgICBub3J3ZWdpYW4tbnkgIklra2plIG1laXIgc29y
dGVyaW5nc21pbm5lLiBWdXJkZXIgw6UgYXVrZSBzb3J0ZXJpbmdzbWlubmV0IChzb3J0ZXJpbmdz
YnVmZmVyIHN0b3JsZWlrKSBmb3IgdGVuZXN0ZW4iCiAgICAgICAgIHBvbCAiWmJ5dCBtYcWCbyBw
YW1pxJljaSBkbGEgc29ydG93YW5pYS4gWndpxJlrc3ogd2llbGtvP8SHIGJ1Zm9yYSBkZW1vbmEg
ZGxhIHNvcnRvd2FuaWEiCi0gICAgICAgIHBvciAiU2VtIG1lbcOzcmlhIHBhcmEgb3JkZW5hw6fD
o28uIEF1bWVudGUgdGFtYW5obyBkbyAnYnVmZmVyJyBkZSBvcmRlbmHDp8OjbyIKKyAgICAgICAg
cG9yICJOw6NvIGjDoSBtZW3Ds3JpYSBzdWZpY2llbnRlIHBhcmEgb3JkZW5hw6fDo28uIENvbnNp
ZGVyZSBhdW1lbnRhciBvIHRhbWFuaG8gZG8gcmV0ZW50b3IgKGJ1ZmZlcikgZGUgb3JkZW5hw6fD
o28uIgogICAgICAgICBydW0gIk91dCBvZiBtZW1vcnkgcGVudHJ1IHNvcnRhcmUuIExhcmdlc3Rl
IG1hcmltZWEgYnVmZmVyLXVsdWkgcGVudHJ1IHNvcnRhcmUgaW4gZGFlbW9uIChzb3J0IGJ1ZmZl
ciBzaXplKSIKICAgICAgICAgcnVzICLQndC10LTQvtGB0YLQsNGC0L7Rh9C90L4g0L/QsNC80Y/R
gtC4INC00LvRjyDRgdC+0YDRgtC40YDQvtCy0LrQuC4g0KPQstC10LvQuNGH0YzRgtC1INGA0LDQ
t9C80LXRgCDQsdGD0YTQtdGA0LAg0YHQvtGA0YLQuNGA0L7QstC60Lgg0L3QsCDRgdC10YDQstC1
0YDQtSIKICAgICAgICAgc2VyYmlhbiAiTmVtYSBtZW1vcmlqZSB6YSBzb3J0aXJhbmplLiBQb3Zl
xIdhanRlIHZlbGnEjWludSBzb3J0IGJ1ZmZlci1hIE15U1FMIHNlcnZlci11IgoKPT09IG1vZGlm
aWVkIGZpbGUgJ3NxbC91bmlyZWcuaCcKLS0tIGEvc3FsL3VuaXJlZy5oCTIwMTAtMDctMDIgMTk6
Mzg6MDQgKzAwMDAKKysrIGIvc3FsL3VuaXJlZy5oCTIwMTEtMDItMDIgMTE6NTQ6NDkgKzAwMDAK
QEAgLTEsNyArMSw3IEBACiAjaWZuZGVmIFVOSVJFR19JTkNMVURFRAogI2RlZmluZSBVTklSRUdf
SU5DTFVERUQKIAotLyogQ29weXJpZ2h0IChDKSAyMDAwLTIwMDYgTXlTUUwgQUIKKy8qIENvcHly
aWdodCAoYykgMjAwMCwgMjAxMSwgT3JhY2xlIGFuZC9vciBpdHMgYWZmaWxpYXRlcy4gQWxsIHJp
Z2h0cyByZXNlcnZlZC4KIAogICAgVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBj
YW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vciBtb2RpZnkKICAgIGl0IHVuZGVyIHRoZSB0ZXJtcyBv
ZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5CkBAIC01Niw4
ICs1Niw2IEBAIHR5cGVkZWYgc3RydWN0IHN0X2hhX2NyZWF0ZV9pbmZvcm1hdGlvbiAKICNkZWZp
bmUgRVJfVEhEX09SX0RFRkFVTFQodGhkLFgpICgodGhkKSA/IEVSX1RIRCh0aGQsIFgpIDogRVJf
REVGQVVMVChYKSkKIAogCi0jZGVmaW5lIEVSUk1BUFAgMQkJCQkvKiBFcnJvcm1hcCBmfHIgbXlf
ZXJyb3IgKi8KLQogI2RlZmluZSBNRV9JTkZPIChNRV9IT0xEVEFORytNRV9PTERXSU4rTUVfTk9S
RUZSRVNIKQogI2RlZmluZSBNRV9FUlJPUiAoTUVfQkVMTCtNRV9PTERXSU4rTUVfTk9SRUZSRVNI
KQogI2RlZmluZSBNWUZfUlcgTVlGKE1ZX1dNRStNWV9OQUJQKQkJLyogVmlkIG15X3JlYWQgJiBt
eV93cml0ZSAqLwoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=