From: Dmitry Lenev Date: February 2 2011 1:58pm Subject: bzr commit into mysql-5.5 branch (Dmitry.Lenev:3297) Bug#58650 List-Archive: http://lists.mysql.com/commits/130227 X-Bug: 58650 Message-Id: <20110202135818.542CB74047A@bandersnatch> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 I0F0IGZpbGU6Ly8vaG9tZS9kbGVuZXYvc3JjL2J6ci9teXNxbC01LjUtbXJnLyBiYXNlZCBvbiBy ZXZpZDpkbWl0cnkubGVuZXZAb3JhY2xlLmNvbS0yMDExMDIwMjEzNTM1Ni1rbDgxd3l3a3p1ZTA4 ZXF0CgogMzI5NyBEbWl0cnkgTGVuZXYJMjAxMS0wMi0wMiBbbWVyZ2VdCiAgICAgIE1lcmdlZCBm aXggZm9yIGJ1ZyAjNTg2NTAgIkZhaWxpbmcgYXNzZXJ0aW9uOgogICAgICBwcmltYXJ5X2tleV9u byA9PSAtMSB8fCBwcmltYXJ5X2tleV9ubyA9PSAwIgogICAgICB3aXRoIHJlY2VudCBjaGFuZ2Vz IGZyb20gbXlzcWwtNS41IHRyZWUuCgogICAgYWRkZWQ6CiAgICAgIG15c3FsLXRlc3Qvci9maWxl c29ydF9kZWJ1Zy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC90L2ZpbGVzb3J0X2RlYnVnLnRlc3QK ICAgIG1vZGlmaWVkOgogICAgICBpbmNsdWRlL215X3N5cy5oCiAgICAgIG15c3FsLXRlc3QvaW5j bHVkZS9tdHJfd2FybmluZ3Muc3FsCiAgICAgIG15c3FsLXRlc3Qvci9vcmRlcl9ieS5yZXN1bHQK ICAgICAgbXlzcWwtdGVzdC90L29yZGVyX2J5LnRlc3QKICAgICAgc3FsL2ZpbGVzb3J0LmNjCiAg ICAgIHNxbC9wcm90b2NvbC5jYwogICAgICBzcWwvc2hhcmUvZXJybXNnLXV0ZjgudHh0CiAgICAg IHNxbC91bmlyZWcuaAo9PT0gbW9kaWZpZWQgZmlsZSAnaW5jbHVkZS9teV9zeXMuaCcKLS0tIGEv aW5jbHVkZS9teV9zeXMuaAkyMDExLTAxLTE3IDA3OjQ0OjM3ICswMDAwCisrKyBiL2luY2x1ZGUv bXlfc3lzLmgJMjAxMS0wMi0wMiAxMTo1NDo0OSArMDAwMApAQCAtMSw0ICsxLDQgQEAKLS8qIENv cHlyaWdodCAoYykgMjAwMCwgMjAxMCwgT3JhY2xlIGFuZC9vciBpdHMgYWZmaWxpYXRlcy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKy8qIENvcHlyaWdodCAoYykgMjAwMCwgMjAxMSwgT3JhY2xlIGFu ZC9vciBpdHMgYWZmaWxpYXRlcy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KIAogICAgVGhpcyBwcm9n cmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vciBtb2Rp ZnkKICAgIGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vu c2UgYXMgcHVibGlzaGVkIGJ5CkBAIC0xMDQsNyArMTA0LDcgQEAgdHlwZWRlZiBzdHJ1Y3QgbXlf YWlvX3Jlc3VsdCB7CiAjZGVmaW5lIE1FX0hPTERUQU5HCTgJLyogRG9uJ3QgZGVsZXRlIGxhc3Qg a2V5cyAqLwogI2RlZmluZSBNRV9XQUlUVE9UCTE2CS8qIFdhaXQgZm9yIGVycnRpbWUgc2VjcyBv ZiBmb3IgYSBhY3Rpb24gKi8KICNkZWZpbmUgTUVfV0FJVFRBTkcJMzIJLyogV2FpdCBmb3IgYSB1 c2VyIGFjdGlvbiAgKi8KLSNkZWZpbmUgTUVfTk9SRUZSRVNICTY0CS8qIERvbnQgcmVmcmVzaCBz Y3JlZW4gKi8KKyNkZWZpbmUgTUVfTk9SRUZSRVNICTY0CS8qIFdyaXRlIHRoZSBlcnJvciBtZXNz YWdlIHRvIGVycm9yIGxvZyAqLwogI2RlZmluZSBNRV9OT0lOUFVUCTEyOAkvKiBEb250IHVzZSB0 aGUgaW5wdXQgbGliYXJ5ICovCiAjZGVmaW5lIE1FX0NPTE9VUjEJKCgxIDw8IE1FX0hJR0hCWVRF KSkJLyogUG9zc2libHkgZXJyb3ItY29sb3VycyAqLwogI2RlZmluZSBNRV9DT0xPVVIyCSgoMiA8 PCBNRV9ISUdIQllURSkpCgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9pbmNsdWRlL210 cl93YXJuaW5ncy5zcWwnCi0tLSBhL215c3FsLXRlc3QvaW5jbHVkZS9tdHJfd2FybmluZ3Muc3Fs CTIwMTAtMTAtMTQgMTA6MDU6NTkgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9pbmNsdWRlL210cl93 YXJuaW5ncy5zcWwJMjAxMS0wMi0wMiAxMTo1NDo0OSArMDAwMApAQCAtMTgzLDkgKzE4Myw2IEBA IElOU0VSVCBJTlRPIGdsb2JhbF9zdXBwcmVzc2lvbnMgVkFMVUVTCiAgKCJUaGUgc2xhdmUgSS5P IHRocmVhZCBzdG9wcyBiZWNhdXNlIGEgZmF0YWwgZXJyb3IgaXMgZW5jb3VudGVyZWQgd2hlbiBp dCB0cnkgdG8gZ2V0IHRoZSB2YWx1ZSBvZiBTRVJWRVJfSUQgdmFyaWFibGUgZnJvbSBtYXN0ZXIu IiksCiAgKCIuU0VMRUNUIFVOSVhfVElNRVNUQU1QLi4uIGZhaWxlZCBvbiBtYXN0ZXIsIGRvIG5v dCB0cnVzdCBjb2x1bW4gU2Vjb25kc19CZWhpbmRfTWFzdGVyIG9mIFNIT1cgU0xBVkUgU1RBVFVT IiksCiAKLSAvKiBUZXN0IGNhc2UgZm9yIEJ1ZyMzMTU5MCBpbiBvcmRlcl9ieS50ZXN0IHByb2R1 Y2VzIHRoZSBmb2xsb3dpbmcgZXJyb3IgKi8KLSAoIk91dCBvZiBzb3J0IG1lbW9yeTsgaW5jcmVh c2Ugc2VydmVyIHNvcnQgYnVmZmVyIHNpemUiKSwKLQogIC8qIFNwZWNpYWwgY2FzZSBmb3IgQnVn ICMyNjQwMiBpbiBzaG93X2NoZWNrLnRlc3QKICAgICAtIFF1ZXN0aW9uIG1hcmtzIGFyZSBub3Qg dmFsaWQgZmlsZSBuYW1lIHBhcnRzIG9uIFdpbmRvd3MuIElnbm9yZQogICAgICAgdGhpcyBlcnJv ciBtZXNzYWdlLgoKPT09IGFkZGVkIGZpbGUgJ215c3FsLXRlc3Qvci9maWxlc29ydF9kZWJ1Zy5y ZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvci9maWxlc29ydF9kZWJ1Zy5yZXN1bHQJMTk3MC0wMS0w MSAwMDowMDowMCArMDAwMAorKysgYi9teXNxbC10ZXN0L3IvZmlsZXNvcnRfZGVidWcucmVzdWx0 CTIwMTEtMDItMDIgMTE6NTQ6NDkgKzAwMDAKQEAgLTAsMCArMSwxNiBAQAorU0VUIEBvbGRfZGVi dWc9IEBAc2Vzc2lvbi5kZWJ1ZzsKKyMKKyMgQnVnIzM2MDIyIHBsZWFzZSBsb2cgbW9yZSBpbmZv cm1hdGlvbiBhYm91dCAiU29ydCBhYm9ydGVkIiBxdWVyaWVzCisjCitDUkVBVEUgVEFCTEUgdDEo ZjAgaW50IGF1dG9faW5jcmVtZW50IHByaW1hcnkga2V5LCBmMSBpbnQpOworSU5TRVJUIElOVE8g dDEoZjEpIFZBTFVFUyAoMCksKDEpLCgyKSwoMyksKDQpLCg1KTsKK1NFVCBzZXNzaW9uIGRlYnVn PSAnK2QsbWFrZV9jaGFyX2FycmF5X2ZhaWwnOworQ0FMTCBtdHIuYWRkX3N1cHByZXNzaW9uKCJP dXQgb2Ygc29ydCBtZW1vcnkiKTsKK1NFTEVDVCAqIEZST00gdDEgT1JERVIgQlkgZjEgQVNDLCBm MDsKK0VSUk9SIEhZMDAxOiBPdXQgb2Ygc29ydCBtZW1vcnksIGNvbnNpZGVyIGluY3JlYXNpbmcg c2VydmVyIHNvcnQgYnVmZmVyIHNpemUKK1NFVCBzZXNzaW9uIGRlYnVnPSBAb2xkX2RlYnVnOwor Q1JFQVRFIEZVTkNUSU9OIGYxKCkgUkVUVVJOUyBJTlQgUkVUVVJOIDE7CitERUxFVEUgRlJPTSB0 MSBPUkRFUiBCWSAoZjEoMTApKSBMSU1JVCAxOworRVJST1IgNDIwMDA6IEluY29ycmVjdCBudW1i ZXIgb2YgYXJndW1lbnRzIGZvciBGVU5DVElPTiB0ZXN0LmYxOyBleHBlY3RlZCAwLCBnb3QgMQor RFJPUCBUQUJMRSB0MTsKK0RST1AgRlVOQ1RJT04gZjE7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlz cWwtdGVzdC9yL29yZGVyX2J5LnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9yL29yZGVyX2J5LnJl c3VsdAkyMDEwLTA5LTEzIDEyOjQ2OjU1ICswMDAwCisrKyBiL215c3FsLXRlc3Qvci9vcmRlcl9i eS5yZXN1bHQJMjAxMS0wMi0wMiAxMTo1NDo0OSArMDAwMApAQCAtMTQyNSw4ICsxNDI1LDkgQEAg c2V0IHNlc3Npb24gc29ydF9idWZmZXJfc2l6ZT0gMzAwMDA7CiBXYXJuaW5nczoKIFdhcm5pbmcJ MTI5MglUcnVuY2F0ZWQgaW5jb3JyZWN0IHNvcnRfYnVmZmVyX3NpemUgdmFsdWU6ICczMDAwMCcK IHNldCBzZXNzaW9uIG1heF9zb3J0X2xlbmd0aD0gMjE4MDsKK0NBTEwgbXRyLmFkZF9zdXBwcmVz c2lvbigiT3V0IG9mIHNvcnQgbWVtb3J5Iik7CiBzZWxlY3QgKiBmcm9tIHQxIG9yZGVyIGJ5IGI7 Ci1FUlJPUiBIWTAwMTogT3V0IG9mIHNvcnQgbWVtb3J5OyBpbmNyZWFzZSBzZXJ2ZXIgc29ydCBi dWZmZXIgc2l6ZQorRVJST1IgSFkwMDE6IE91dCBvZiBzb3J0IG1lbW9yeSwgY29uc2lkZXIgaW5j cmVhc2luZyBzZXJ2ZXIgc29ydCBidWZmZXIgc2l6ZQogZHJvcCB0YWJsZSB0MTsKICMKICMgQnVn ICMzOTg0NDogUXVlcnkgQ3Jhc2ggTXlzcWwgU2VydmVyIDUuMC42NwoKPT09IGFkZGVkIGZpbGUg J215c3FsLXRlc3QvdC9maWxlc29ydF9kZWJ1Zy50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3QvZmls ZXNvcnRfZGVidWcudGVzdAkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBiL215c3FsLXRl c3QvdC9maWxlc29ydF9kZWJ1Zy50ZXN0CTIwMTEtMDItMDIgMTE6NTQ6NDkgKzAwMDAKQEAgLTAs MCArMSwyMyBAQAorLS1zb3VyY2UgaW5jbHVkZS9oYXZlX2RlYnVnLmluYworCitTRVQgQG9sZF9k ZWJ1Zz0gQEBzZXNzaW9uLmRlYnVnOworCistLWVjaG8gIworLS1lY2hvICMgQnVnIzM2MDIyIHBs ZWFzZSBsb2cgbW9yZSBpbmZvcm1hdGlvbiBhYm91dCAiU29ydCBhYm9ydGVkIiBxdWVyaWVzCist LWVjaG8gIworCitDUkVBVEUgVEFCTEUgdDEoZjAgaW50IGF1dG9faW5jcmVtZW50IHByaW1hcnkg a2V5LCBmMSBpbnQpOworSU5TRVJUIElOVE8gdDEoZjEpIFZBTFVFUyAoMCksKDEpLCgyKSwoMyks KDQpLCg1KTsKKworU0VUIHNlc3Npb24gZGVidWc9ICcrZCxtYWtlX2NoYXJfYXJyYXlfZmFpbCc7 CitDQUxMIG10ci5hZGRfc3VwcHJlc3Npb24oIk91dCBvZiBzb3J0IG1lbW9yeSIpOworLS1lcnJv ciBFUl9PVVRfT0ZfU09SVE1FTU9SWQorU0VMRUNUICogRlJPTSB0MSBPUkRFUiBCWSBmMSBBU0Ms IGYwOworU0VUIHNlc3Npb24gZGVidWc9IEBvbGRfZGVidWc7CisKK0NSRUFURSBGVU5DVElPTiBm MSgpIFJFVFVSTlMgSU5UIFJFVFVSTiAxOworLS1lcnJvciBFUl9TUF9XUk9OR19OT19PRl9BUkdT CitERUxFVEUgRlJPTSB0MSBPUkRFUiBCWSAoZjEoMTApKSBMSU1JVCAxOworCitEUk9QIFRBQkxF IHQxOworRFJPUCBGVU5DVElPTiBmMTsKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3Qv b3JkZXJfYnkudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC90L29yZGVyX2J5LnRlc3QJMjAxMC0wOS0x MyAxMjo0Njo1NSArMDAwMAorKysgYi9teXNxbC10ZXN0L3Qvb3JkZXJfYnkudGVzdAkyMDExLTAy LTAyIDExOjU0OjQ5ICswMDAwCkBAIC04NDMsNyArODQzLDggQEAgY3JlYXRlIHRhYmxlIHQxKGEg aW50LCBiIHRpbnl0ZXh0KTsKIGluc2VydCBpbnRvIHQxIHZhbHVlcyAoMSwyKSwoMywyKTsKIHNl dCBzZXNzaW9uIHNvcnRfYnVmZmVyX3NpemU9IDMwMDAwOwogc2V0IHNlc3Npb24gbWF4X3NvcnRf bGVuZ3RoPSAyMTgwOwotLS1lcnJvciAxMDM4CitDQUxMIG10ci5hZGRfc3VwcHJlc3Npb24oIk91 dCBvZiBzb3J0IG1lbW9yeSIpOworLS1lcnJvciBFUl9PVVRfT0ZfU09SVE1FTU9SWQogc2VsZWN0 ICogZnJvbSB0MSBvcmRlciBieSBiOwogZHJvcCB0YWJsZSB0MTsKIAoKPT09IG1vZGlmaWVkIGZp bGUgJ3NxbC9maWxlc29ydC5jYycKLS0tIGEvc3FsL2ZpbGVzb3J0LmNjCTIwMTEtMDEtMTEgMDk6 MDc6MzcgKzAwMDAKKysrIGIvc3FsL2ZpbGVzb3J0LmNjCTIwMTEtMDItMDIgMTE6NTQ6NDkgKzAw MDAKQEAgLTMyNCw4ICszMjQsMjQgQEAgaGFfcm93cyBmaWxlc29ydChUSEQgKnRoZCwgVEFCTEUg KnRhYmxlLAogICAgIH0KICAgfQogICBpZiAoZXJyb3IpCi0gICAgbXlfbWVzc2FnZShFUl9GSUxT T1JUX0FCT1JULCBFUihFUl9GSUxTT1JUX0FCT1JUKSwKLSAgICAgICAgICAgICAgIE1ZRihNRV9F UlJPUitNRV9XQUlUVEFORykpOworICB7CisgICAgREJVR19BU1NFUlQodGhkLT5pc19lcnJvcigp KTsKKyAgICBteV9wcmludGZfZXJyb3IoRVJfRklMU09SVF9BQk9SVCwKKyAgICAgICAgICAgICAg ICAgICAgIiVzOiAlcyIsCisgICAgICAgICAgICAgICAgICAgIE1ZRihNRV9FUlJPUiArIE1FX1dB SVRUQU5HKSwKKyAgICAgICAgICAgICAgICAgICAgRVJfVEhEKHRoZCwgRVJfRklMU09SVF9BQk9S VCksCisgICAgICAgICAgICAgICAgICAgIHRoZC0+c3RtdF9kYS0+bWVzc2FnZSgpKTsKKyAgICAg ICAgICAgICAgICAgICAgCisgICAgaWYgKGdsb2JhbF9zeXN0ZW1fdmFyaWFibGVzLmxvZ193YXJu aW5ncyA+IDEpCisgICAgeworICAgICAgc3FsX3ByaW50X3dhcm5pbmcoIiVzLCBob3N0OiAlcywg dXNlcjogJXMsIHRocmVhZDogJWx1LCBxdWVyeTogJS0uNDA5NnMiLAorICAgICAgICAgICAgICAg ICAgICAgICAgRVJfVEhEKHRoZCwgRVJfRklMU09SVF9BQk9SVCksCisgICAgICAgICAgICAgICAg ICAgICAgICB0aGQtPnNlY3VyaXR5X2N0eC0+aG9zdF9vcl9pcCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICZ0aGQtPnNlY3VyaXR5X2N0eC0+cHJpdl91c2VyWzBdLAorICAgICAgICAgICAgICAg ICAgICAgICAgKHVsb25nKSB0aGQtPnRocmVhZF9pZCwKKyAgICAgICAgICAgICAgICAgICAgICAg IHRoZC0+cXVlcnkoKSk7CisgICAgfQorICB9CiAgIGVsc2UKICAgICBzdGF0aXN0aWNfYWRkKHRo ZC0+c3RhdHVzX3Zhci5maWxlc29ydF9yb3dzLAogCQkgICh1bG9uZykgcmVjb3JkcywgJkxPQ0tf c3RhdHVzKTsKQEAgLTM2OSw2ICszODUsOSBAQCBzdGF0aWMgY2hhciAqKm1ha2VfY2hhcl9hcnJh eShjaGFyICoqb2xkCiAgIGNoYXIgKmNoYXJfcG9zOwogICBEQlVHX0VOVEVSKCJtYWtlX2NoYXJf YXJyYXkiKTsKIAorICBEQlVHX0VYRUNVVEVfSUYoIm1ha2VfY2hhcl9hcnJheV9mYWlsIiwKKyAg ICAgICAgICAgICAgICAgIERCVUdfU0VUKCIrZCxzaW11bGF0ZV9vdXRfb2ZfbWVtb3J5Iik7KTsK KwogICBpZiAob2xkX3BvcyB8fAogICAgICAgKG9sZF9wb3M9IChjaGFyKiopIG15X21hbGxvYygo dWludCkgZmllbGRzKihsZW5ndGgrc2l6ZW9mKGNoYXIqKSksCiAJCQkJICAgbXlfZmxhZykpKQoK PT09IG1vZGlmaWVkIGZpbGUgJ3NxbC9wcm90b2NvbC5jYycKLS0tIGEvc3FsL3Byb3RvY29sLmNj CTIwMTAtMTEtMTIgMTI6NTY6MjEgKzAwMDAKKysrIGIvc3FsL3Byb3RvY29sLmNjCTIwMTEtMDIt MDIgMTE6NTQ6NDkgKzAwMDAKQEAgLTEsNCArMSw0IEBACi0vKiBDb3B5cmlnaHQgKGMpIDIwMDAs IDIwMTAgT3JhY2xlIGFuZC9vciBpdHMgYWZmaWxpYXRlcy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K Ky8qIENvcHlyaWdodCAoYykgMjAwMCwgMjAxMSBPcmFjbGUgYW5kL29yIGl0cyBhZmZpbGlhdGVz LiBBbGwgcmlnaHRzIHJlc2VydmVkLgogCiAgICBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2Fy ZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeQogICAgaXQgdW5kZXIgdGhl IHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkK QEAgLTU0Myw5ICs1NDMsMTAgQEAgYm9vbCBQcm90b2NvbDo6c2VuZF9vayh1aW50IHNlcnZlcl9z dGF0dQogICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICptZXNzYWdlKQogewogICBE QlVHX0VOVEVSKCJQcm90b2NvbDo6c2VuZF9vayIpOwotCi0gIERCVUdfUkVUVVJOKG5ldF9zZW5k X29rKHRoZCwgc2VydmVyX3N0YXR1cywgc3RhdGVtZW50X3dhcm5fY291bnQsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgIGFmZmVjdGVkX3Jvd3MsIGxhc3RfaW5zZXJ0X2lkLCBtZXNzYWdlKSk7 CisgIGNvbnN0IGJvb2wgcmV0dmFsPSAKKyAgICBuZXRfc2VuZF9vayh0aGQsIHNlcnZlcl9zdGF0 dXMsIHN0YXRlbWVudF93YXJuX2NvdW50LAorICAgICAgICAgICAgICAgIGFmZmVjdGVkX3Jvd3Ms IGxhc3RfaW5zZXJ0X2lkLCBtZXNzYWdlKTsKKyAgREJVR19SRVRVUk4ocmV0dmFsKTsKIH0KIAog CkBAIC01NTgsOCArNTU5LDggQEAgYm9vbCBQcm90b2NvbDo6c2VuZF9vayh1aW50IHNlcnZlcl9z dGF0dQogYm9vbCBQcm90b2NvbDo6c2VuZF9lb2YodWludCBzZXJ2ZXJfc3RhdHVzLCB1aW50IHN0 YXRlbWVudF93YXJuX2NvdW50KQogewogICBEQlVHX0VOVEVSKCJQcm90b2NvbDo6c2VuZF9lb2Yi KTsKLQotICBEQlVHX1JFVFVSTihuZXRfc2VuZF9lb2YodGhkLCBzZXJ2ZXJfc3RhdHVzLCBzdGF0 ZW1lbnRfd2Fybl9jb3VudCkpOworICBjb25zdCBib29sIHJldHZhbD0gbmV0X3NlbmRfZW9mKHRo ZCwgc2VydmVyX3N0YXR1cywgc3RhdGVtZW50X3dhcm5fY291bnQpOworICBEQlVHX1JFVFVSTihy ZXR2YWwpOwogfQogCiAKQEAgLTU3Myw4ICs1NzQsOCBAQCBib29sIFByb3RvY29sOjpzZW5kX2Vy cm9yKHVpbnQgc3FsX2Vycm5vCiAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIg KnNxbF9zdGF0ZSkKIHsKICAgREJVR19FTlRFUigiUHJvdG9jb2w6OnNlbmRfZXJyb3IiKTsKLQot ICBEQlVHX1JFVFVSTihuZXRfc2VuZF9lcnJvcl9wYWNrZXQodGhkLCBzcWxfZXJybm8sIGVycl9t c2csIHNxbF9zdGF0ZSkpOworICBjb25zdCBib29sIHJldHZhbD0gbmV0X3NlbmRfZXJyb3JfcGFj a2V0KHRoZCwgc3FsX2Vycm5vLCBlcnJfbXNnLCBzcWxfc3RhdGUpOworICBEQlVHX1JFVFVSTihy ZXR2YWwpOwogfQogCiAKCj09PSBtb2RpZmllZCBmaWxlICdzcWwvc2hhcmUvZXJybXNnLXV0Zjgu dHh0JwotLS0gYS9zcWwvc2hhcmUvZXJybXNnLXV0ZjgudHh0CTIwMTAtMTEtMDUgMTc6NDI6Mzcg KzAwMDAKKysrIGIvc3FsL3NoYXJlL2Vycm1zZy11dGY4LnR4dAkyMDExLTAyLTAyIDExOjU0OjQ5 ICswMDAwCkBAIC04OTcsNyArODk3LDcgQEAgRVJfT1VUX09GX1NPUlRNRU1PUlkgSFkwMDEgUzEw MDEKICAgICAgICAgY3plICJNGy1Cw6FsbyBwYW3Em3RpIHBybyB0xZnDrWTEm27DrS4gWnZ5xaF0 ZSB2ZWxpa29zdCB0xZnDrWTDrWPDrWhvIGJ1ZmZlcnUiCiAgICAgICAgIGRhbiAiSWtrZSBtZXJl IHNvcnRlcmluZ3NodWtvbW1lbHNlLiDDmGcgc29ydGVyaW5nc2h1a29tbWVsc2UgKHNvcnQgYnVm ZmVyIHNpemUpIGZvciBzZXJ2ZXJlbiIKICAgICAgICAgbmxhICJHZWVuIGdlaGV1Z2VuIG9tIHRl IHNvcnRlcmVuLiBWZXJob29nIGRlIHNlcnZlciBzb3J0IGJ1ZmZlciBzaXplIgotICAgICAgICBl bmcgIk91dCBvZiBzb3J0IG1lbW9yeTsgaW5jcmVhc2Ugc2VydmVyIHNvcnQgYnVmZmVyIHNpemUi CisgICAgICAgIGVuZyAiT3V0IG9mIHNvcnQgbWVtb3J5LCBjb25zaWRlciBpbmNyZWFzaW5nIHNl cnZlciBzb3J0IGJ1ZmZlciBzaXplIgogICAgICAgICBqcHMgIk91dCBvZiBzb3J0IG1lbW9yeS4g c29ydCBidWZmZXIgc2l6ZSDjgYzotrPjgorjgarjgYTjgojjgYbjgafjgZkuIiwKICAgICAgICAg ZXN0ICJNw6RsdSBzYWkgc29ydGVlcmltaXNlbCBvdHNhLiBTdXVyZW5kYSBNeVNRTC1pIHNvcnRl ZXJpbWlzcHVodnJpdCIKICAgICAgICAgZnJlICJNYW5xdWUgZGUgbcOpbW9pcmUgcG91ciBsZSB0 cmkuIEF1Z21lbnRlei1sYS4iCkBAIC05MDcsMTAgKzkwNywxMCBAQCBFUl9PVVRfT0ZfU09SVE1F TU9SWSBIWTAwMSBTMTAwMQogICAgICAgICBpdGEgIk1lbW9yaWEgcGVyIGdsaSBvcmRpbmFtZW50 aSBlc2F1cml0YS4gSW5jcmVtZW50YXJlIGlsICdzb3J0X2J1ZmZlcicgYWwgZGVtb25lIgogICAg ICAgICBqcG4gIk91dCBvZiBzb3J0IG1lbW9yeS4gc29ydCBidWZmZXIgc2l6ZSDjgYzotrPjgorj garjgYTjgojjgYbjgafjgZkuIgogICAgICAgICBrb3IgIk91dCBvZiBzb3J0IG1lbW9yeS4gZGFl bW9uIHNvcnQgYnVmZmVy7J2YIO2BrOq4sOulvCDspp3qsIDsi5ztgqTshLjsmpQiCi0gICAgICAg IG5vciAiSWtrZSBtZXIgc29ydGVyaW5nc21pbm5lLiDDmGsgc29ydGVyaW5nc21pbm5ldCAoc29y dCBidWZmZXIgc2l6ZSkgZm9yIHRqZW5lc3RlbiIKLSAgICAgICAgbm9yd2VnaWFuLW55ICJJa2tq ZSBtZWlyIHNvcnRlcmluZ3NtaW5uZS4gQXVrIHNvcnRlcmluZ3NtaW5uZXQgKHNvcnRlcmluZ3Ni ZmZlciBzdG9ybGVpaykgZm9yIHRlbmVzdGVuIgorICAgICAgICBub3IgIklra2UgbWVyIHNvcnRl cmluZ3NtaW5uZS4gVnVyZGVyIMOlIMO4a2Ugc29ydGVyaW5nc21pbm5ldCAoc29ydCBidWZmZXIg c2l6ZSkgZm9yIHRqZW5lc3RlbiIKKyAgICAgICAgbm9yd2VnaWFuLW55ICJJa2tqZSBtZWlyIHNv cnRlcmluZ3NtaW5uZS4gVnVyZGVyIMOlIGF1a2Ugc29ydGVyaW5nc21pbm5ldCAoc29ydGVyaW5n c2J1ZmZlciBzdG9ybGVpaykgZm9yIHRlbmVzdGVuIgogICAgICAgICBwb2wgIlpieXQgbWHFgm8g cGFtacSZY2kgZGxhIHNvcnRvd2FuaWEuIFp3acSZa3N6IHdpZWxrbz/EhyBidWZvcmEgZGVtb25h IGRsYSBzb3J0b3dhbmlhIgotICAgICAgICBwb3IgIlNlbSBtZW3Ds3JpYSBwYXJhIG9yZGVuYcOn w6NvLiBBdW1lbnRlIHRhbWFuaG8gZG8gJ2J1ZmZlcicgZGUgb3JkZW5hw6fDo28iCisgICAgICAg IHBvciAiTsOjbyBow6EgbWVtw7NyaWEgc3VmaWNpZW50ZSBwYXJhIG9yZGVuYcOnw6NvLiBDb25z aWRlcmUgYXVtZW50YXIgbyB0YW1hbmhvIGRvIHJldGVudG9yIChidWZmZXIpIGRlIG9yZGVuYcOn w6NvLiIKICAgICAgICAgcnVtICJPdXQgb2YgbWVtb3J5IHBlbnRydSBzb3J0YXJlLiBMYXJnZXN0 ZSBtYXJpbWVhIGJ1ZmZlci11bHVpIHBlbnRydSBzb3J0YXJlIGluIGRhZW1vbiAoc29ydCBidWZm ZXIgc2l6ZSkiCiAgICAgICAgIHJ1cyAi0J3QtdC00L7RgdGC0LDRgtC+0YfQvdC+INC/0LDQvNGP 0YLQuCDQtNC70Y8g0YHQvtGA0YLQuNGA0L7QstC60LguINCj0LLQtdC70LjRh9GM0YLQtSDRgNCw 0LfQvNC10YAg0LHRg9GE0LXRgNCwINGB0L7RgNGC0LjRgNC+0LLQutC4INC90LAg0YHQtdGA0LLQ tdGA0LUiCiAgICAgICAgIHNlcmJpYW4gIk5lbWEgbWVtb3JpamUgemEgc29ydGlyYW5qZS4gUG92 ZcSHYWp0ZSB2ZWxpxI1pbnUgc29ydCBidWZmZXItYSBNeVNRTCBzZXJ2ZXItdSIKCj09PSBtb2Rp ZmllZCBmaWxlICdzcWwvdW5pcmVnLmgnCi0tLSBhL3NxbC91bmlyZWcuaAkyMDEwLTA3LTAyIDE5 OjM4OjA0ICswMDAwCisrKyBiL3NxbC91bmlyZWcuaAkyMDExLTAyLTAyIDExOjU0OjQ5ICswMDAw CkBAIC0xLDcgKzEsNyBAQAogI2lmbmRlZiBVTklSRUdfSU5DTFVERUQKICNkZWZpbmUgVU5JUkVH X0lOQ0xVREVECiAKLS8qIENvcHlyaWdodCAoQykgMjAwMC0yMDA2IE15U1FMIEFCCisvKiBDb3B5 cmlnaHQgKGMpIDIwMDAsIDIwMTEsIE9yYWNsZSBhbmQvb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCiAKICAgIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3Ug Y2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5CiAgICBpdCB1bmRlciB0aGUgdGVybXMg b2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQpAQCAtNTYs OCArNTYsNiBAQCB0eXBlZGVmIHN0cnVjdCBzdF9oYV9jcmVhdGVfaW5mb3JtYXRpb24gCiAjZGVm aW5lIEVSX1RIRF9PUl9ERUZBVUxUKHRoZCxYKSAoKHRoZCkgPyBFUl9USEQodGhkLCBYKSA6IEVS X0RFRkFVTFQoWCkpCiAKIAotI2RlZmluZSBFUlJNQVBQIDEJCQkJLyogRXJyb3JtYXAgZnxyIG15 X2Vycm9yICovCi0KICNkZWZpbmUgTUVfSU5GTyAoTUVfSE9MRFRBTkcrTUVfT0xEV0lOK01FX05P UkVGUkVTSCkKICNkZWZpbmUgTUVfRVJST1IgKE1FX0JFTEwrTUVfT0xEV0lOK01FX05PUkVGUkVT SCkKICNkZWZpbmUgTVlGX1JXIE1ZRihNWV9XTUUrTVlfTkFCUCkJCS8qIFZpZCBteV9yZWFkICYg bXlfd3JpdGUgKi8KCk5vIGJ1bmRsZSAocmVhc29uOiByZXZpc2lvbiBpcyBhIG1lcmdlKS4=