From: Tor Didriksen Date: February 2 2011 1:25pm Subject: bzr commit into mysql-trunk branch (tor.didriksen:3592) Bug#36022 List-Archive: http://lists.mysql.com/commits/130218 X-Bug: 36022 Message-Id: <20110202132532.1999F3768@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 I0F0IGZpbGU6Ly8vZXhwb3J0L2hvbWUvZGlkcmlrL3JlcG8vdHJ1bmsvIGJhc2VkIG9uIHJldmlk Om1hcmMuYWxmZkBvcmFjbGUuY29tLTIwMTEwMjAyMTE1MjU5LXA1YXppbzlncGpyNW9pZzYKCiAz NTkyIFRvciBEaWRyaWtzZW4JMjAxMS0wMi0wMiBbbWVyZ2VdCiAgICAgIE1lcmdlIEJ1ZyAjMzYw MjIgZnJvbSA1LjUKCiAgICBtb2RpZmllZDoKICAgICAgaW5jbHVkZS9teV9zeXMuaAogICAgICBt eXNxbC10ZXN0L2luY2x1ZGUvbXRyX3dhcm5pbmdzLnNxbAogICAgICBteXNxbC10ZXN0L2luY2x1 ZGUvb3JkZXJfYnkuaW5jCiAgICAgIG15c3FsLXRlc3Qvci9maWxlc29ydF9kZWJ1Zy5yZXN1bHQK ICAgICAgbXlzcWwtdGVzdC9yL29yZGVyX2J5X2FsbC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9y L29yZGVyX2J5X2ljcF9tcnIucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9vcmRlcl9ieV9ub25l LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3QvZmlsZXNvcnRfZGVidWcudGVzdAogICAgICBzcWwv ZmlsZXNvcnQuY2MKICAgICAgc3FsL3Byb3RvY29sLmNjCiAgICAgIHNxbC9zaGFyZS9lcnJtc2ct dXRmOC50eHQKICAgICAgc3FsL3VuaXJlZy5oCj09PSBtb2RpZmllZCBmaWxlICdpbmNsdWRlL215 X3N5cy5oJwotLS0gYS9pbmNsdWRlL215X3N5cy5oCTIwMTEtMDEtMTcgMDk6NTI6NTkgKzAwMDAK KysrIGIvaW5jbHVkZS9teV9zeXMuaAkyMDExLTAyLTAyIDEzOjI1OjA2ICswMDAwCkBAIC0xLDQg KzEsNCBAQAotLyogQ29weXJpZ2h0IChjKSAyMDAwLCAyMDEwLCBPcmFjbGUgYW5kL29yIGl0cyBh ZmZpbGlhdGVzLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorLyogQ29weXJpZ2h0IChjKSAyMDAwLCAy MDExLCBPcmFjbGUgYW5kL29yIGl0cyBhZmZpbGlhdGVzLiBBbGwgcmlnaHRzIHJlc2VydmVkLgog CiAgICBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUg aXQgYW5kL29yIG1vZGlmeQogICAgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJh bCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkKQEAgLTEwNCw3ICsxMDQsNyBAQCB0eXBl ZGVmIHN0cnVjdCBteV9haW9fcmVzdWx0IHsKICNkZWZpbmUgTUVfSE9MRFRBTkcJOAkvKiBEb24n dCBkZWxldGUgbGFzdCBrZXlzICovCiAjZGVmaW5lIE1FX1dBSVRUT1QJMTYJLyogV2FpdCBmb3Ig ZXJydGltZSBzZWNzIG9mIGZvciBhIGFjdGlvbiAqLwogI2RlZmluZSBNRV9XQUlUVEFORwkzMgkv KiBXYWl0IGZvciBhIHVzZXIgYWN0aW9uICAqLwotI2RlZmluZSBNRV9OT1JFRlJFU0gJNjQJLyog RG9udCByZWZyZXNoIHNjcmVlbiAqLworI2RlZmluZSBNRV9OT1JFRlJFU0gJNjQJLyogV3JpdGUg dGhlIGVycm9yIG1lc3NhZ2UgdG8gZXJyb3IgbG9nICovCiAjZGVmaW5lIE1FX05PSU5QVVQJMTI4 CS8qIERvbnQgdXNlIHRoZSBpbnB1dCBsaWJhcnkgKi8KICNkZWZpbmUgTUVfQ09MT1VSMQkoKDEg PDwgTUVfSElHSEJZVEUpKQkvKiBQb3NzaWJseSBlcnJvci1jb2xvdXJzICovCiAjZGVmaW5lIE1F X0NPTE9VUjIJKCgyIDw8IE1FX0hJR0hCWVRFKSkKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10 ZXN0L2luY2x1ZGUvbXRyX3dhcm5pbmdzLnNxbCcKLS0tIGEvbXlzcWwtdGVzdC9pbmNsdWRlL210 cl93YXJuaW5ncy5zcWwJMjAxMC0xMS0yOSAxMToyODo1NSArMDAwMAorKysgYi9teXNxbC10ZXN0 L2luY2x1ZGUvbXRyX3dhcm5pbmdzLnNxbAkyMDExLTAyLTAyIDEzOjI1OjA2ICswMDAwCkBAIC0x ODgsOSArMTg4LDYgQEAgSU5TRVJUIElOVE8gZ2xvYmFsX3N1cHByZXNzaW9ucyBWQUxVRVMKICAv Kkl0IHdpbGwgcHJpbnQgYSB3YXJuaW5nIGlmIGEgbmV3IFVVSUQgb2Ygc2VydmVyIGlzIGdlbmVy YXRlZC4qLwogICgiTm8gZXhpc3RpbmcgVVVJRCBoYXMgYmVlbiBmb3VuZCwgc28gd2UgYXNzdW1l IHRoYXQgdGhpcyBpcyB0aGUgZmlyc3QgdGltZSB0aGF0IHRoaXMgc2VydmVyIGhhcyBiZWVuIHN0 YXJ0ZWQuKiIpLAogCi0gLyogVGVzdCBjYXNlIGZvciBCdWcjMzE1OTAgaW4gb3JkZXJfYnkudGVz dCBwcm9kdWNlcyB0aGUgZm9sbG93aW5nIGVycm9yICovCi0gKCJPdXQgb2Ygc29ydCBtZW1vcnk7 IGluY3JlYXNlIHNlcnZlciBzb3J0IGJ1ZmZlciBzaXplIiksCi0KICAvKiBTcGVjaWFsIGNhc2Ug Zm9yIEJ1ZyAjMjY0MDIgaW4gc2hvd19jaGVjay50ZXN0CiAgICAgLSBRdWVzdGlvbiBtYXJrcyBh cmUgbm90IHZhbGlkIGZpbGUgbmFtZSBwYXJ0cyBvbiBXaW5kb3dzLiBJZ25vcmUKICAgICAgIHRo aXMgZXJyb3IgbWVzc2FnZS4KCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L2luY2x1ZGUv b3JkZXJfYnkuaW5jJwotLS0gYS9teXNxbC10ZXN0L2luY2x1ZGUvb3JkZXJfYnkuaW5jCTIwMTAt MTItMTcgMDk6NDE6MjEgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9pbmNsdWRlL29yZGVyX2J5Lmlu YwkyMDExLTAyLTAyIDEzOjI1OjA2ICswMDAwCkBAIC04NDMsNyArODQzLDggQEAgY3JlYXRlIHRh YmxlIHQxKGEgaW50LCBiIHRpbnl0ZXh0KTsKIGluc2VydCBpbnRvIHQxIHZhbHVlcyAoMSwyKSwo MywyKTsKIHNldCBzZXNzaW9uIHNvcnRfYnVmZmVyX3NpemU9IDMwMDAwOwogc2V0IHNlc3Npb24g bWF4X3NvcnRfbGVuZ3RoPSAyMTgwOwotLS1lcnJvciAxMDM4CitDQUxMIG10ci5hZGRfc3VwcHJl c3Npb24oIk91dCBvZiBzb3J0IG1lbW9yeSIpOworLS1lcnJvciBFUl9PVVRfT0ZfU09SVE1FTU9S WQogc2VsZWN0ICogZnJvbSB0MSBvcmRlciBieSBiOwogZHJvcCB0YWJsZSB0MTsKIAoKPT09IG1v ZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvci9maWxlc29ydF9kZWJ1Zy5yZXN1bHQnCi0tLSBhL215 c3FsLXRlc3Qvci9maWxlc29ydF9kZWJ1Zy5yZXN1bHQJMjAxMS0wMS0xMCAxMzoyMzoxMSArMDAw MAorKysgYi9teXNxbC10ZXN0L3IvZmlsZXNvcnRfZGVidWcucmVzdWx0CTIwMTEtMDItMDIgMTM6 MjU6MDYgKzAwMDAKQEAgLTEsMyArMSw0IEBACitTRVQgQG9sZF9kZWJ1Zz0gQEBzZXNzaW9uLmRl YnVnOwogIwogIyBCdWcjNTkzMzEgZmlsZXNvcnQgd2l0aCBwcmlvcml0eSBxdWV1ZTogaGFuZGxp bmcgb2Ygb3V0LW9mLW1lbW9yeQogIwpAQCAtOCw0ICs5LDIwIEBAIElOU0VSVCBJTlRPIHQxKGYx LCBmMikgVkFMVUVTIAogc2V0IGRlYnVnPSAnK2QsYm91bmRlZF9xdWV1ZV9pbml0X2ZhaWwnOwog U0VMRUNUICogRlJPTSB0MSBPUkRFUiBCWSBmMSBBU0MsIGYwIExJTUlUIDE7CiBFUlJPUiBIWTAw MDogT3V0IG9mIG1lbW9yeSAoTmVlZGVkIE5OIGJ5dGVzKQorU0VUIHNlc3Npb24gZGVidWc9IEBv bGRfZGVidWc7CiBEUk9QIFRBQkxFIHQxOworIworIyBCdWcjMzYwMjIgcGxlYXNlIGxvZyBtb3Jl IGluZm9ybWF0aW9uIGFib3V0ICJTb3J0IGFib3J0ZWQiIHF1ZXJpZXMKKyMKK0NSRUFURSBUQUJM RSB0MShmMCBpbnQgYXV0b19pbmNyZW1lbnQgcHJpbWFyeSBrZXksIGYxIGludCk7CitJTlNFUlQg SU5UTyB0MShmMSkgVkFMVUVTICgwKSwoMSksKDIpLCgzKSwoNCksKDUpOworU0VUIHNlc3Npb24g ZGVidWc9ICcrZCxtYWtlX2NoYXJfYXJyYXlfZmFpbCc7CitDQUxMIG10ci5hZGRfc3VwcHJlc3Np b24oIk91dCBvZiBzb3J0IG1lbW9yeSIpOworU0VMRUNUICogRlJPTSB0MSBPUkRFUiBCWSBmMSBB U0MsIGYwOworRVJST1IgSFkwMDE6IE91dCBvZiBzb3J0IG1lbW9yeSwgY29uc2lkZXIgaW5jcmVh c2luZyBzZXJ2ZXIgc29ydCBidWZmZXIgc2l6ZQorU0VUIHNlc3Npb24gZGVidWc9IEBvbGRfZGVi dWc7CitDUkVBVEUgRlVOQ1RJT04gZjEoKSBSRVRVUk5TIElOVCBSRVRVUk4gMTsKK0RFTEVURSBG Uk9NIHQxIE9SREVSIEJZIChmMSgxMCkpIExJTUlUIDE7CitFUlJPUiA0MjAwMDogSW5jb3JyZWN0 IG51bWJlciBvZiBhcmd1bWVudHMgZm9yIEZVTkNUSU9OIHRlc3QuZjE7IGV4cGVjdGVkIDAsIGdv dCAxCitEUk9QIFRBQkxFIHQxOworRFJPUCBGVU5DVElPTiBmMTsKCj09PSBtb2RpZmllZCBmaWxl ICdteXNxbC10ZXN0L3Ivb3JkZXJfYnlfYWxsLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9yL29y ZGVyX2J5X2FsbC5yZXN1bHQJMjAxMC0xMi0yMCAxNDoyMTo0NCArMDAwMAorKysgYi9teXNxbC10 ZXN0L3Ivb3JkZXJfYnlfYWxsLnJlc3VsdAkyMDExLTAyLTAyIDEzOjI1OjA2ICswMDAwCkBAIC0x NDI2LDggKzE0MjYsOSBAQCBzZXQgc2Vzc2lvbiBzb3J0X2J1ZmZlcl9zaXplPSAzMDAwMDsKIFdh cm5pbmdzOgogV2FybmluZwkxMjkyCVRydW5jYXRlZCBpbmNvcnJlY3Qgc29ydF9idWZmZXJfc2l6 ZSB2YWx1ZTogJzMwMDAwJwogc2V0IHNlc3Npb24gbWF4X3NvcnRfbGVuZ3RoPSAyMTgwOworQ0FM TCBtdHIuYWRkX3N1cHByZXNzaW9uKCJPdXQgb2Ygc29ydCBtZW1vcnkiKTsKIHNlbGVjdCAqIGZy b20gdDEgb3JkZXIgYnkgYjsKLUVSUk9SIEhZMDAxOiBPdXQgb2Ygc29ydCBtZW1vcnk7IGluY3Jl YXNlIHNlcnZlciBzb3J0IGJ1ZmZlciBzaXplCitFUlJPUiBIWTAwMTogT3V0IG9mIHNvcnQgbWVt b3J5LCBjb25zaWRlciBpbmNyZWFzaW5nIHNlcnZlciBzb3J0IGJ1ZmZlciBzaXplCiBkcm9wIHRh YmxlIHQxOwogIwogIyBCdWcgIzM5ODQ0OiBRdWVyeSBDcmFzaCBNeXNxbCBTZXJ2ZXIgNS4wLjY3 Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL29yZGVyX2J5X2ljcF9tcnIucmVzdWx0 JwotLS0gYS9teXNxbC10ZXN0L3Ivb3JkZXJfYnlfaWNwX21yci5yZXN1bHQJMjAxMC0xMi0xNyAw OTo0MToyMSArMDAwMAorKysgYi9teXNxbC10ZXN0L3Ivb3JkZXJfYnlfaWNwX21yci5yZXN1bHQJ MjAxMS0wMi0wMiAxMzoyNTowNiArMDAwMApAQCAtMTQyNiw4ICsxNDI2LDkgQEAgc2V0IHNlc3Np b24gc29ydF9idWZmZXJfc2l6ZT0gMzAwMDA7CiBXYXJuaW5nczoKIFdhcm5pbmcJMTI5MglUcnVu Y2F0ZWQgaW5jb3JyZWN0IHNvcnRfYnVmZmVyX3NpemUgdmFsdWU6ICczMDAwMCcKIHNldCBzZXNz aW9uIG1heF9zb3J0X2xlbmd0aD0gMjE4MDsKK0NBTEwgbXRyLmFkZF9zdXBwcmVzc2lvbigiT3V0 IG9mIHNvcnQgbWVtb3J5Iik7CiBzZWxlY3QgKiBmcm9tIHQxIG9yZGVyIGJ5IGI7Ci1FUlJPUiBI WTAwMTogT3V0IG9mIHNvcnQgbWVtb3J5OyBpbmNyZWFzZSBzZXJ2ZXIgc29ydCBidWZmZXIgc2l6 ZQorRVJST1IgSFkwMDE6IE91dCBvZiBzb3J0IG1lbW9yeSwgY29uc2lkZXIgaW5jcmVhc2luZyBz ZXJ2ZXIgc29ydCBidWZmZXIgc2l6ZQogZHJvcCB0YWJsZSB0MTsKICMKICMgQnVnICMzOTg0NDog UXVlcnkgQ3Jhc2ggTXlzcWwgU2VydmVyIDUuMC42NwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3Fs LXRlc3Qvci9vcmRlcl9ieV9ub25lLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9yL29yZGVyX2J5 X25vbmUucmVzdWx0CTIwMTAtMTItMTcgMDk6NDE6MjEgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9y L29yZGVyX2J5X25vbmUucmVzdWx0CTIwMTEtMDItMDIgMTM6MjU6MDYgKzAwMDAKQEAgLTE0MjUs OCArMTQyNSw5IEBAIHNldCBzZXNzaW9uIHNvcnRfYnVmZmVyX3NpemU9IDMwMDAwOwogV2Fybmlu Z3M6CiBXYXJuaW5nCTEyOTIJVHJ1bmNhdGVkIGluY29ycmVjdCBzb3J0X2J1ZmZlcl9zaXplIHZh bHVlOiAnMzAwMDAnCiBzZXQgc2Vzc2lvbiBtYXhfc29ydF9sZW5ndGg9IDIxODA7CitDQUxMIG10 ci5hZGRfc3VwcHJlc3Npb24oIk91dCBvZiBzb3J0IG1lbW9yeSIpOwogc2VsZWN0ICogZnJvbSB0 MSBvcmRlciBieSBiOwotRVJST1IgSFkwMDE6IE91dCBvZiBzb3J0IG1lbW9yeTsgaW5jcmVhc2Ug c2VydmVyIHNvcnQgYnVmZmVyIHNpemUKK0VSUk9SIEhZMDAxOiBPdXQgb2Ygc29ydCBtZW1vcnks IGNvbnNpZGVyIGluY3JlYXNpbmcgc2VydmVyIHNvcnQgYnVmZmVyIHNpemUKIGRyb3AgdGFibGUg dDE7CiAjCiAjIEJ1ZyAjMzk4NDQ6IFF1ZXJ5IENyYXNoIE15c3FsIFNlcnZlciA1LjAuNjcKCj09 PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3QvZmlsZXNvcnRfZGVidWcudGVzdCcKLS0tIGEv bXlzcWwtdGVzdC90L2ZpbGVzb3J0X2RlYnVnLnRlc3QJMjAxMS0wMS0xMCAxMzoyMzoxMSArMDAw MAorKysgYi9teXNxbC10ZXN0L3QvZmlsZXNvcnRfZGVidWcudGVzdAkyMDExLTAyLTAyIDEzOjI1 OjA2ICswMDAwCkBAIC0xLDUgKzEsNyBAQAogLS1zb3VyY2UgaW5jbHVkZS9oYXZlX2RlYnVnLmlu YwogCitTRVQgQG9sZF9kZWJ1Zz0gQEBzZXNzaW9uLmRlYnVnOworCiAtLWVjaG8gIwogLS1lY2hv ICMgQnVnIzU5MzMxIGZpbGVzb3J0IHdpdGggcHJpb3JpdHkgcXVldWU6IGhhbmRsaW5nIG9mIG91 dC1vZi1tZW1vcnkKIC0tZWNobyAjCkBAIC0xMyw1ICsxNSwyNiBAQCBzZXQgZGVidWc9ICcrZCxi b3VuZGVkX3F1ZXVlX2luaXRfZmFpbCc7CiAtLXJlcGxhY2VfcmVnZXggL05lZWRlZCBbMC05XSog Ynl0ZXMvTmVlZGVkIE5OIGJ5dGVzLwogLS1lcnJvciA1CiBTRUxFQ1QgKiBGUk9NIHQxIE9SREVS IEJZIGYxIEFTQywgZjAgTElNSVQgMTsKK1NFVCBzZXNzaW9uIGRlYnVnPSBAb2xkX2RlYnVnOwor CitEUk9QIFRBQkxFIHQxOworCistLWVjaG8gIworLS1lY2hvICMgQnVnIzM2MDIyIHBsZWFzZSBs b2cgbW9yZSBpbmZvcm1hdGlvbiBhYm91dCAiU29ydCBhYm9ydGVkIiBxdWVyaWVzCistLWVjaG8g IworCitDUkVBVEUgVEFCTEUgdDEoZjAgaW50IGF1dG9faW5jcmVtZW50IHByaW1hcnkga2V5LCBm MSBpbnQpOworSU5TRVJUIElOVE8gdDEoZjEpIFZBTFVFUyAoMCksKDEpLCgyKSwoMyksKDQpLCg1 KTsKKworU0VUIHNlc3Npb24gZGVidWc9ICcrZCxtYWtlX2NoYXJfYXJyYXlfZmFpbCc7CitDQUxM IG10ci5hZGRfc3VwcHJlc3Npb24oIk91dCBvZiBzb3J0IG1lbW9yeSIpOworLS1lcnJvciBFUl9P VVRfT0ZfU09SVE1FTU9SWQorU0VMRUNUICogRlJPTSB0MSBPUkRFUiBCWSBmMSBBU0MsIGYwOwor U0VUIHNlc3Npb24gZGVidWc9IEBvbGRfZGVidWc7CisKK0NSRUFURSBGVU5DVElPTiBmMSgpIFJF VFVSTlMgSU5UIFJFVFVSTiAxOworLS1lcnJvciBFUl9TUF9XUk9OR19OT19PRl9BUkdTCitERUxF VEUgRlJPTSB0MSBPUkRFUiBCWSAoZjEoMTApKSBMSU1JVCAxOwogCiBEUk9QIFRBQkxFIHQxOwor RFJPUCBGVU5DVElPTiBmMTsKCj09PSBtb2RpZmllZCBmaWxlICdzcWwvZmlsZXNvcnQuY2MnCi0t LSBhL3NxbC9maWxlc29ydC5jYwkyMDExLTAxLTExIDA5OjA5OjIxICswMDAwCisrKyBiL3NxbC9m aWxlc29ydC5jYwkyMDExLTAyLTAyIDEzOjI1OjA2ICswMDAwCkBAIC0zNTYsOCArMzU2LDI0IEBA IGhhX3Jvd3MgZmlsZXNvcnQoVEhEICp0aGQsIFRBQkxFICp0YWJsZSwKICAgICB9CiAgIH0KICAg aWYgKGVycm9yKQotICAgIG15X21lc3NhZ2UoRVJfRklMU09SVF9BQk9SVCwgRVIoRVJfRklMU09S VF9BQk9SVCksCi0gICAgICAgICAgICAgICBNWUYoTUVfRVJST1IrTUVfV0FJVFRBTkcpKTsKKyAg eworICAgIERCVUdfQVNTRVJUKHRoZC0+aXNfZXJyb3IoKSk7CisgICAgbXlfcHJpbnRmX2Vycm9y KEVSX0ZJTFNPUlRfQUJPUlQsCisgICAgICAgICAgICAgICAgICAgICIlczogJXMiLAorICAgICAg ICAgICAgICAgICAgICBNWUYoTUVfRVJST1IgKyBNRV9XQUlUVEFORyksCisgICAgICAgICAgICAg ICAgICAgIEVSX1RIRCh0aGQsIEVSX0ZJTFNPUlRfQUJPUlQpLAorICAgICAgICAgICAgICAgICAg ICB0aGQtPnN0bXRfZGEtPm1lc3NhZ2UoKSk7CisgICAgICAgICAgICAgICAgICAgIAorICAgIGlm IChnbG9iYWxfc3lzdGVtX3ZhcmlhYmxlcy5sb2dfd2FybmluZ3MgPiAxKQorICAgIHsKKyAgICAg IHNxbF9wcmludF93YXJuaW5nKCIlcywgaG9zdDogJXMsIHVzZXI6ICVzLCB0aHJlYWQ6ICVsdSwg cXVlcnk6ICUtLjQwOTZzIiwKKyAgICAgICAgICAgICAgICAgICAgICAgIEVSX1RIRCh0aGQsIEVS X0ZJTFNPUlRfQUJPUlQpLAorICAgICAgICAgICAgICAgICAgICAgICAgdGhkLT5zZWN1cml0eV9j dHgtPmhvc3Rfb3JfaXAsCisgICAgICAgICAgICAgICAgICAgICAgICAmdGhkLT5zZWN1cml0eV9j dHgtPnByaXZfdXNlclswXSwKKyAgICAgICAgICAgICAgICAgICAgICAgICh1bG9uZykgdGhkLT50 aHJlYWRfaWQsCisgICAgICAgICAgICAgICAgICAgICAgICB0aGQtPnF1ZXJ5KCkpOworICAgIH0K KyAgfQogICBlbHNlCiAgICAgc3RhdGlzdGljX2FkZCh0aGQtPnN0YXR1c192YXIuZmlsZXNvcnRf cm93cywKICAgICAgICAgICAgICAgICAgICh1bG9uZykgbnVtX3Jvd3MsICZMT0NLX3N0YXR1cyk7 CkBAIC00MDgsNiArNDI0LDkgQEAgc3RhdGljIHZvaWQgbWFrZV9jaGFyX2FycmF5KEZJTEVTT1JU X0lORgogCiAgIERCVUdfUFJJTlQoImluZm8iLCAoIm51bV9yZWNvcmRzICV1IGxlbmd0aCAldSIs IG51bV9yZWNvcmRzLCBsZW5ndGgpKTsKIAorICBEQlVHX0VYRUNVVEVfSUYoIm1ha2VfY2hhcl9h cnJheV9mYWlsIiwKKyAgICAgICAgICAgICAgICAgIERCVUdfU0VUKCIrZCxzaW11bGF0ZV9vdXRf b2ZfbWVtb3J5Iik7KTsKKwogICBpZiAoIWluZm8tPnNvcnRfa2V5cykKICAgICBpbmZvLT5zb3J0 X2tleXM9IAogICAgICAgKHVjaGFyKiopIG15X21hbGxvYyhudW1fcmVjb3JkcyAqIChsZW5ndGgg KyBzaXplb2YodWNoYXIqKSksIE1ZRigwKSk7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3FsL3Byb3Rv Y29sLmNjJwotLS0gYS9zcWwvcHJvdG9jb2wuY2MJMjAxMC0xMi0yMSAxMjoyMzo0OSArMDAwMAor KysgYi9zcWwvcHJvdG9jb2wuY2MJMjAxMS0wMi0wMiAxMzoyNTowNiArMDAwMApAQCAtMSw0ICsx LDQgQEAKLS8qIENvcHlyaWdodCAoYykgMjAwMCwgMjAxMCBPcmFjbGUgYW5kL29yIGl0cyBhZmZp bGlhdGVzLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorLyogQ29weXJpZ2h0IChjKSAyMDAwLCAyMDEx IE9yYWNsZSBhbmQvb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAKICAg IFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBh bmQvb3IgbW9kaWZ5CiAgICBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1 YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQpAQCAtNTQzLDkgKzU0MywxMCBAQCBib29sIFBy b3RvY29sOjpzZW5kX29rKHVpbnQgc2VydmVyX3N0YXR1CiAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IGNoYXIgKm1lc3NhZ2UpCiB7CiAgIERCVUdfRU5URVIoIlByb3RvY29sOjpzZW5kX29r Iik7Ci0KLSAgREJVR19SRVRVUk4obmV0X3NlbmRfb2sodGhkLCBzZXJ2ZXJfc3RhdHVzLCBzdGF0 ZW1lbnRfd2Fybl9jb3VudCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgYWZmZWN0ZWRfcm93 cywgbGFzdF9pbnNlcnRfaWQsIG1lc3NhZ2UpKTsKKyAgY29uc3QgYm9vbCByZXR2YWw9IAorICAg IG5ldF9zZW5kX29rKHRoZCwgc2VydmVyX3N0YXR1cywgc3RhdGVtZW50X3dhcm5fY291bnQsCisg ICAgICAgICAgICAgICAgYWZmZWN0ZWRfcm93cywgbGFzdF9pbnNlcnRfaWQsIG1lc3NhZ2UpOwor ICBEQlVHX1JFVFVSTihyZXR2YWwpOwogfQogCiAKQEAgLTU1OCw4ICs1NTksOCBAQCBib29sIFBy b3RvY29sOjpzZW5kX29rKHVpbnQgc2VydmVyX3N0YXR1CiBib29sIFByb3RvY29sOjpzZW5kX2Vv Zih1aW50IHNlcnZlcl9zdGF0dXMsIHVpbnQgc3RhdGVtZW50X3dhcm5fY291bnQpCiB7CiAgIERC VUdfRU5URVIoIlByb3RvY29sOjpzZW5kX2VvZiIpOwotCi0gIERCVUdfUkVUVVJOKG5ldF9zZW5k X2VvZih0aGQsIHNlcnZlcl9zdGF0dXMsIHN0YXRlbWVudF93YXJuX2NvdW50KSk7CisgIGNvbnN0 IGJvb2wgcmV0dmFsPSBuZXRfc2VuZF9lb2YodGhkLCBzZXJ2ZXJfc3RhdHVzLCBzdGF0ZW1lbnRf d2Fybl9jb3VudCk7CisgIERCVUdfUkVUVVJOKHJldHZhbCk7CiB9CiAKIApAQCAtNTczLDggKzU3 NCw4IEBAIGJvb2wgUHJvdG9jb2w6OnNlbmRfZXJyb3IodWludCBzcWxfZXJybm8KICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29uc3QgY2hhciAqc3FsX3N0YXRlKQogewogICBEQlVHX0VOVEVS KCJQcm90b2NvbDo6c2VuZF9lcnJvciIpOwotCi0gIERCVUdfUkVUVVJOKG5ldF9zZW5kX2Vycm9y X3BhY2tldCh0aGQsIHNxbF9lcnJubywgZXJyX21zZywgc3FsX3N0YXRlKSk7CisgIGNvbnN0IGJv b2wgcmV0dmFsPSBuZXRfc2VuZF9lcnJvcl9wYWNrZXQodGhkLCBzcWxfZXJybm8sIGVycl9tc2cs IHNxbF9zdGF0ZSk7CisgIERCVUdfUkVUVVJOKHJldHZhbCk7CiB9CiAKIAoKPT09IG1vZGlmaWVk IGZpbGUgJ3NxbC9zaGFyZS9lcnJtc2ctdXRmOC50eHQnCi0tLSBhL3NxbC9zaGFyZS9lcnJtc2ct dXRmOC50eHQJMjAxMC0xMi0wNSAyMjo1MTo0OSArMDAwMAorKysgYi9zcWwvc2hhcmUvZXJybXNn LXV0ZjgudHh0CTIwMTEtMDItMDIgMTM6MjU6MDYgKzAwMDAKQEAgLTg5Nyw3ICs4OTcsNyBAQCBF Ul9PVVRfT0ZfU09SVE1FTU9SWSBIWTAwMSBTMTAwMQogICAgICAgICBjemUgIk0bLULDoWxvIHBh bcSbdGkgcHJvIHTFmcOtZMSbbsOtLiBadnnFoXRlIHZlbGlrb3N0IHTFmcOtZMOtY8OtaG8gYnVm ZmVydSIKICAgICAgICAgZGFuICJJa2tlIG1lcmUgc29ydGVyaW5nc2h1a29tbWVsc2UuIMOYZyBz b3J0ZXJpbmdzaHVrb21tZWxzZSAoc29ydCBidWZmZXIgc2l6ZSkgZm9yIHNlcnZlcmVuIgogICAg ICAgICBubGEgIkdlZW4gZ2VoZXVnZW4gb20gdGUgc29ydGVyZW4uIFZlcmhvb2cgZGUgc2VydmVy IHNvcnQgYnVmZmVyIHNpemUiCi0gICAgICAgIGVuZyAiT3V0IG9mIHNvcnQgbWVtb3J5OyBpbmNy ZWFzZSBzZXJ2ZXIgc29ydCBidWZmZXIgc2l6ZSIKKyAgICAgICAgZW5nICJPdXQgb2Ygc29ydCBt ZW1vcnksIGNvbnNpZGVyIGluY3JlYXNpbmcgc2VydmVyIHNvcnQgYnVmZmVyIHNpemUiCiAgICAg ICAgIGpwcyAiT3V0IG9mIHNvcnQgbWVtb3J5LiBzb3J0IGJ1ZmZlciBzaXplIOOBjOi2s+OCiuOB quOBhOOCiOOBhuOBp+OBmS4iLAogICAgICAgICBlc3QgIk3DpGx1IHNhaSBzb3J0ZWVyaW1pc2Vs IG90c2EuIFN1dXJlbmRhIE15U1FMLWkgc29ydGVlcmltaXNwdWh2cml0IgogICAgICAgICBmcmUg Ik1hbnF1ZSBkZSBtw6ltb2lyZSBwb3VyIGxlIHRyaS4gQXVnbWVudGV6LWxhLiIKQEAgLTkwNywx MCArOTA3LDEwIEBAIEVSX09VVF9PRl9TT1JUTUVNT1JZIEhZMDAxIFMxMDAxCiAgICAgICAgIGl0 YSAiTWVtb3JpYSBwZXIgZ2xpIG9yZGluYW1lbnRpIGVzYXVyaXRhLiBJbmNyZW1lbnRhcmUgaWwg J3NvcnRfYnVmZmVyJyBhbCBkZW1vbmUiCiAgICAgICAgIGpwbiAiT3V0IG9mIHNvcnQgbWVtb3J5 LiBzb3J0IGJ1ZmZlciBzaXplIOOBjOi2s+OCiuOBquOBhOOCiOOBhuOBp+OBmS4iCiAgICAgICAg IGtvciAiT3V0IG9mIHNvcnQgbWVtb3J5LiBkYWVtb24gc29ydCBidWZmZXLsnZgg7YGs6riw66W8 IOymneqwgOyLnO2CpOyEuOyalCIKLSAgICAgICAgbm9yICJJa2tlIG1lciBzb3J0ZXJpbmdzbWlu bmUuIMOYayBzb3J0ZXJpbmdzbWlubmV0IChzb3J0IGJ1ZmZlciBzaXplKSBmb3IgdGplbmVzdGVu IgotICAgICAgICBub3J3ZWdpYW4tbnkgIklra2plIG1laXIgc29ydGVyaW5nc21pbm5lLiBBdWsg c29ydGVyaW5nc21pbm5ldCAoc29ydGVyaW5nc2JmZmVyIHN0b3JsZWlrKSBmb3IgdGVuZXN0ZW4i CisgICAgICAgIG5vciAiSWtrZSBtZXIgc29ydGVyaW5nc21pbm5lLiBWdXJkZXIgw6Ugw7hrZSBz b3J0ZXJpbmdzbWlubmV0IChzb3J0IGJ1ZmZlciBzaXplKSBmb3IgdGplbmVzdGVuIgorICAgICAg ICBub3J3ZWdpYW4tbnkgIklra2plIG1laXIgc29ydGVyaW5nc21pbm5lLiBWdXJkZXIgw6UgYXVr ZSBzb3J0ZXJpbmdzbWlubmV0IChzb3J0ZXJpbmdzYnVmZmVyIHN0b3JsZWlrKSBmb3IgdGVuZXN0 ZW4iCiAgICAgICAgIHBvbCAiWmJ5dCBtYcWCbyBwYW1pxJljaSBkbGEgc29ydG93YW5pYS4gWndp xJlrc3ogd2llbGtvP8SHIGJ1Zm9yYSBkZW1vbmEgZGxhIHNvcnRvd2FuaWEiCi0gICAgICAgIHBv ciAiU2VtIG1lbcOzcmlhIHBhcmEgb3JkZW5hw6fDo28uIEF1bWVudGUgdGFtYW5obyBkbyAnYnVm ZmVyJyBkZSBvcmRlbmHDp8OjbyIKKyAgICAgICAgcG9yICJOw6NvIGjDoSBtZW3Ds3JpYSBzdWZp Y2llbnRlIHBhcmEgb3JkZW5hw6fDo28uIENvbnNpZGVyZSBhdW1lbnRhciBvIHRhbWFuaG8gZG8g cmV0ZW50b3IgKGJ1ZmZlcikgZGUgb3JkZW5hw6fDo28uIgogICAgICAgICBydW0gIk91dCBvZiBt ZW1vcnkgcGVudHJ1IHNvcnRhcmUuIExhcmdlc3RlIG1hcmltZWEgYnVmZmVyLXVsdWkgcGVudHJ1 IHNvcnRhcmUgaW4gZGFlbW9uIChzb3J0IGJ1ZmZlciBzaXplKSIKICAgICAgICAgcnVzICLQndC1 0LTQvtGB0YLQsNGC0L7Rh9C90L4g0L/QsNC80Y/RgtC4INC00LvRjyDRgdC+0YDRgtC40YDQvtCy 0LrQuC4g0KPQstC10LvQuNGH0YzRgtC1INGA0LDQt9C80LXRgCDQsdGD0YTQtdGA0LAg0YHQvtGA 0YLQuNGA0L7QstC60Lgg0L3QsCDRgdC10YDQstC10YDQtSIKICAgICAgICAgc2VyYmlhbiAiTmVt YSBtZW1vcmlqZSB6YSBzb3J0aXJhbmplLiBQb3ZlxIdhanRlIHZlbGnEjWludSBzb3J0IGJ1ZmZl ci1hIE15U1FMIHNlcnZlci11IgoKPT09IG1vZGlmaWVkIGZpbGUgJ3NxbC91bmlyZWcuaCcKLS0t IGEvc3FsL3VuaXJlZy5oCTIwMTAtMDctMTYgMjE6MDA6NTAgKzAwMDAKKysrIGIvc3FsL3VuaXJl Zy5oCTIwMTEtMDItMDIgMTM6MjU6MDYgKzAwMDAKQEAgLTEsNyArMSw3IEBACiAjaWZuZGVmIFVO SVJFR19JTkNMVURFRAogI2RlZmluZSBVTklSRUdfSU5DTFVERUQKIAotLyogQ29weXJpZ2h0IChj KSAyMDAwLCAyMDEwLCBPcmFjbGUgYW5kL29yIGl0cyBhZmZpbGlhdGVzLiBBbGwgcmlnaHRzIHJl c2VydmVkLgorLyogQ29weXJpZ2h0IChjKSAyMDAwLCAyMDExLCBPcmFjbGUgYW5kL29yIGl0cyBh ZmZpbGlhdGVzLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogCiAgICBUaGlzIHByb2dyYW0gaXMgZnJl ZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeQogICAgaXQg dW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJs aXNoZWQgYnkKQEAgLTU2LDggKzU2LDYgQEAgdHlwZWRlZiBzdHJ1Y3Qgc3RfaGFfY3JlYXRlX2lu Zm9ybWF0aW9uIAogI2RlZmluZSBFUl9USERfT1JfREVGQVVMVCh0aGQsWCkgKCh0aGQpID8gRVJf VEhEKHRoZCwgWCkgOiBFUl9ERUZBVUxUKFgpKQogCiAKLSNkZWZpbmUgRVJSTUFQUCAxCQkJCS8q IEVycm9ybWFwIGZ8ciBteV9lcnJvciAqLwotCiAjZGVmaW5lIE1FX0lORk8gKE1FX0hPTERUQU5H K01FX09MRFdJTitNRV9OT1JFRlJFU0gpCiAjZGVmaW5lIE1FX0VSUk9SIChNRV9CRUxMK01FX09M RFdJTitNRV9OT1JFRlJFU0gpCiAjZGVmaW5lIE1ZRl9SVyBNWUYoTVlfV01FK01ZX05BQlApCQkv KiBWaWQgbXlfcmVhZCAmIG15X3dyaXRlICovCgpObyBidW5kbGUgKHJlYXNvbjogcmV2aXNpb24g aXMgYSBtZXJnZSAoeW91IGNhbiBmb3JjZSBnZW5lcmF0aW9uIG9mIGEgYnVuZGxlIHdpdGggZW52 IHZhciBCWlJfRk9SQ0VfQlVORExFPTEpKS4=