From: marko.makela Date: April 17 2012 8:06pm Subject: bzr push into mysql-trunk-wl5545 branch (marko.makela:3894 to 3895) Bug#13972248 List-Archive: http://lists.mysql.com/commits/143563 X-Bug: 13972248 Message-Id: <201204172007.q3HK752H013224@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDM4OTUgTWFya28gTcOka2Vsw6QJMjAxMi0wNC0xNwogICAgICBCdWcjMTM5NzIyNDggT1JQSEFO IEhJRERFTiBGVFNfRE9DX0lEX0lOREVYIExFRlQgQUZURVIgRFJPUFBJTkcgRlVMTFRFWFQgSU5E RVgKICAgICAgCiAgICAgIGhhX2lubm9iYXNlOjpwcmVwYXJlX2lucGxhY2VfYWx0ZXJfdGFibGUo KTogV2hlbiB0aGUgdGFibGUgd291bGQKICAgICAgY29udGFpbiBmdWxsdGV4dCBpbmRleGVzIGJl Zm9yZSBkcm9wcGluZyBpbmRleGVzLCBhbmQgbm8gZnVsbHRleHQKICAgICAgaW5kZXhlcyB0aGVy ZWFmdGVyLCBkcm9wIHRoZSBGVFNfRE9DX0lEX0lOREVYIGlmIGl0IGRvZXMgbm90IGV4aXN0CiAg ICAgIGluIHRoZSBNeVNRTCB0YWJsZSBkZWZpbml0aW9uIChpdCBoYWQgYmVlbiBjcmVhdGVkIGlu dGVybmFsbHkgaW4gSW5ub0RCKS4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0 ZS9pbm5vZGIvci9pbm5vZGItYWx0ZXIucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5u b2RiL3QvaW5ub2RiLWFsdGVyLnRlc3QKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hh bmRsZXIwYWx0ZXIuY2MKIDM4OTQgTWFya28gTcOka2Vsw6QJMjAxMi0wNC0xNwogICAgICByZWN2 X3JlY292ZXJ5X2Zyb21fY2hlY2twb2ludF9zdGFydF9mdW5jKCk6IFJlbW92ZSBhIGNvbXBpbGVy IHdhcm5pbmcuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvbG9nL2xvZzBy ZWN2LmNjCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9k Yi1hbHRlci5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWFs dGVyLnJlc3VsdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDQxNzE0MDYwMS1x NHh5dTg5a2tzN2tyaDIxCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWFs dGVyLnJlc3VsdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDQxNzIwMDUzOS1v eThkZjd6Z3F0MXhiM29jCkBAIC01MjAsNyArNTIwLDYgQEAgdDFvCUNSRUFURSBUQUJMRSBgdDFv YCAoCiApIEVOR0lORT1Jbm5vREIgREVGQVVMVCBDSEFSU0VUPWxhdGluMQogQUxURVIgVEFCTEUg dDFvIENIQU5HRSBGVFNfRE9DX0lEIGZvb19pZCBCSUdJTlQgVU5TSUdORUQgTk9UIE5VTEwsCiBE Uk9QIElOREVYIGN0LCBBTEdPUklUSE09SU5QTEFDRTsKLWNhbGwgbXRyLmFkZF9zdXBwcmVzc2lv bigiSW5ub0RCOiBUYWJsZSB0ZXN0L3QxbyBjb250YWlucyAyIGluZGV4ZXMgaW5zaWRlIElubm9E Qiwgd2hpY2ggaXMgZGlmZmVyZW50IGZyb20gdGhlIG51bWJlciBvZiBpbmRleGVzIDEgZGVmaW5l ZCBpbiB0aGUgTXlTUUwiKTsKIFNIT1cgQ1JFQVRFIFRBQkxFIHQxbzsKIFRhYmxlCUNyZWF0ZSBU YWJsZQogdDFvCUNSRUFURSBUQUJMRSBgdDFvYCAoCkBAIC01NDcsMjAgKzU0NiwzOCBAQCBTRUxF Q1Qgc2kuTkFNRSxpLlBPUyxpLk5BTUUgRlJPTSBJTkZPUk1BCiBJTk5FUiBKT0lOIHN5c19pbmRl eGVzIHNpIE9OIGkuSU5ERVhfSUQ9c2kuSU5ERVhfSUQ7CiBOQU1FCVBPUwlOQU1FCiBQUklNQVJZ CTAJZm9vX2lkCi1GVFNfRE9DX0lEX0lOREVYCTAJZm9vX2lkCiBTRUxFQ1QgaS4qIEZST00gSU5G T1JNQVRJT05fU0NIRU1BLklOTk9EQl9TWVNfRk9SRUlHTl9DT0xTIGkKIElOTkVSIEpPSU4gc3lz X2ZvcmVpZ24gc2YgT04gaS5JRCA9IHNmLklEOwogSUQJRk9SX0NPTF9OQU1FCVJFRl9DT0xfTkFN RQlQT1MKLUFMVEVSIFRBQkxFIHQxbyBBREQgRlVMTFRFWFQgSU5ERVgoY3QpOwotRVJST1IgSFkw MDA6IEluZGV4ICdGVFNfRE9DX0lEX0lOREVYJyBpcyBvZiB3cm9uZyB0eXBlIGZvciBhbiBJbm5v REIgRlVMTFRFWFQgaW5kZXgKLUFMVEVSIFRBQkxFIHQxbyBBREQgRlVMTFRFWFQgSU5ERVgoY3Qp LAorQUxURVIgVEFCTEUgdDFvIEFERCBVTklRVUUgSU5ERVggRlRTX0RPQ19JRF9JTkRFWChGVFNf RE9DX0lEKSwKK0FERCBGVUxMVEVYVCBJTkRFWChjdCksCiBDSEFOR0UgZm9vX2lkIEZUU19ET0Nf SUQgQklHSU5UIFVOU0lHTkVEIE5PVCBOVUxMOwogRVJST1IgSFkwMDA6IEluZGV4ICdGVFNfRE9D X0lEX0lOREVYJyBpcyBvZiB3cm9uZyB0eXBlIGZvciBhbiBJbm5vREIgRlVMTFRFWFQgaW5kZXgK K0FMVEVSIFRBQkxFIHQxbyBBREQgVU5JUVVFIElOREVYIEZUU19ET0NfSURfSU5ERVgoZm9vX2lk KTsKK0FMVEVSIFRBQkxFIHQxbyBDSEFOR0UgZm9vX2lkIEZUU19ET0NfSUQgQklHSU5UIFVOU0lH TkVEIE5PVCBOVUxMLAorQUREIEZVTExURVhUIElOREVYKGN0KTsKK0VSUk9SIEhZMDAwOiBJbmRl eCAnRlRTX0RPQ19JRF9JTkRFWCcgaXMgb2Ygd3JvbmcgdHlwZSBmb3IgYW4gSW5ub0RCIEZVTExU RVhUIGluZGV4CiBBTFRFUiBUQUJMRSB0MW8gQ0hBTkdFIGZvb19pZCBGVFNfRE9DX0lEIEJJR0lO VCBVTlNJR05FRCBOT1QgTlVMTDsKLUFMVEVSIFRBQkxFIHQxbyBBREQgVU5JUVVFIElOREVYIEZU U19ET0NfSURfSU5ERVgoRlRTX0RPQ19JRCk7Ci1FUlJPUiA0MjAwMDogSW5jb3JyZWN0IGluZGV4 IG5hbWUgJ0ZUU19ET0NfSURfSU5ERVgnCi1BTFRFUiBUQUJMRSB0MW8gQUREIFVOSVFVRSBJTkRF WCBGVFNfRE9DX0lEX0lOREVYKEZUU19ET0NfSUQpLAotQUxHT1JJVEhNPUNPUFk7Ci1BTFRFUiBU QUJMRSB0MW8gQUREIFVOSVFVRSBJTkRFWCBGVFNfRE9DX0lEX0lOREVYKEZUU19ET0NfSUQpOwot RVJST1IgNDIwMDA6IER1cGxpY2F0ZSBrZXkgbmFtZSAnRlRTX0RPQ19JRF9JTkRFWCcKK0NSRUFU RSBGVUxMVEVYVCBJTkRFWCBjdCBPTiB0MW8gKGN0KTsKK0FMVEVSIFRBQkxFIHQxbyBDSEFOR0Ug RlRTX0RPQ19JRCBmb29faWQgQklHSU5UIFVOU0lHTkVEIE5PVCBOVUxMOworRVJST1IgSFkwMDA6 IENvbHVtbiAnZm9vX2lkJyBpcyBvZiB3cm9uZyB0eXBlIGZvciBhbiBJbm5vREIgRlVMTFRFWFQg aW5kZXgKK0RST1AgVEFCTEUgc3lzX2luZGV4ZXM7CitDUkVBVEUgVEFCTEUgc3lzX2luZGV4ZXMg U0VMRUNUIGkuKiBGUk9NIElORk9STUFUSU9OX1NDSEVNQS5JTk5PREJfU1lTX0lOREVYRVMgaQor SU5ORVIgSk9JTiBzeXNfdGFibGVzIHN0IE9OIGkuVEFCTEVfSUQ9c3QuVEFCTEVfSUQ7CitTRUxF Q1QgaS5OQU1FLGkuUE9TLGkuTVRZUEUsaS5QUlRZUEUsaS5MRU4KK0ZST00gSU5GT1JNQVRJT05f U0NIRU1BLklOTk9EQl9TWVNfQ09MVU1OUyBpCitJTk5FUiBKT0lOIHN5c190YWJsZXMgc3QgT04g aS5UQUJMRV9JRD1zdC5UQUJMRV9JRDsKK05BTUUJUE9TCU1UWVBFCVBSVFlQRQlMRU4KK0ZUU19E T0NfSUQJMAk2CTE4MDAJOAorYzIJMQk2CTEwMjcJNAorY3QJMgk1CTUyNDU0MAkxMAorU0VMRUNU IHNpLk5BTUUsaS5QT1MsaS5OQU1FIEZST00gSU5GT1JNQVRJT05fU0NIRU1BLklOTk9EQl9TWVNf RklFTERTIGkKK0lOTkVSIEpPSU4gc3lzX2luZGV4ZXMgc2kgT04gaS5JTkRFWF9JRD1zaS5JTkRF WF9JRDsKK05BTUUJUE9TCU5BTUUKK1BSSU1BUlkJMAlGVFNfRE9DX0lECitGVFNfRE9DX0lEX0lO REVYCTAJRlRTX0RPQ19JRAorY3QJMAljdAorU0VMRUNUIGkuKiBGUk9NIElORk9STUFUSU9OX1ND SEVNQS5JTk5PREJfU1lTX0ZPUkVJR05fQ09MUyBpCitJTk5FUiBKT0lOIHN5c19mb3JlaWduIHNm IE9OIGkuSUQgPSBzZi5JRDsKK0lECUZPUl9DT0xfTkFNRQlSRUZfQ09MX05BTUUJUE9TCiBEUk9Q IFRBQkxFIHR0LCB0MW8sIHN5c190YWJsZXMsIHN5c19pbmRleGVzLCBzeXNfZm9yZWlnbjsKCj09 PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1hbHRlci50 ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1hbHRlci50ZXN0CXJl dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNDE3MTQwNjAxLXE0eHl1ODlra3M3a3Jo MjEKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItYWx0ZXIudGVzdAlyZXZp ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDQxNzIwMDUzOS1veThkZjd6Z3F0MXhiM29j CkBAIC0yNDEsMTAgKzI0MSw4IEBAIFdIRVJFIHN0Lk5BTUU9J3Rlc3QvdDFvJyBBTkQgc2MuTkFN RT0nRlQKIAogU0hPVyBDUkVBVEUgVEFCTEUgdDFvOwogCi0jIFRoaXMgd2lsbCBsZWF2ZSBhbiBv cnBoYW4gRlRTX0RPQ19JRF9JTkRFWCBpbnNpZGUgSW5ub0RCLgogQUxURVIgVEFCTEUgdDFvIENI QU5HRSBGVFNfRE9DX0lEIGZvb19pZCBCSUdJTlQgVU5TSUdORUQgTk9UIE5VTEwsCiBEUk9QIElO REVYIGN0LCBBTEdPUklUSE09SU5QTEFDRTsKLWNhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiSW5u b0RCOiBUYWJsZSB0ZXN0L3QxbyBjb250YWlucyAyIGluZGV4ZXMgaW5zaWRlIElubm9EQiwgd2hp Y2ggaXMgZGlmZmVyZW50IGZyb20gdGhlIG51bWJlciBvZiBpbmRleGVzIDEgZGVmaW5lZCBpbiB0 aGUgTXlTUUwiKTsKIAogU0hPVyBDUkVBVEUgVEFCTEUgdDFvOwogCkBAIC0yNjEsMzAgKzI1OSwz MSBAQCBGUk9NIElORk9STUFUSU9OX1NDSEVNQS5JTk5PREJfU1lTX0ZPUkVJCiAKIC0tIHNvdXJj ZSBzdWl0ZS9pbm5vZGIvaW5jbHVkZS9pbm5vZGJfZGljdC5pbmMKIAotIyBOb3csIHRoZXJlIGV4 aXN0cyBhIGhpZGRlbiBGVFNfRE9DX0lEX0lOREVYIG9uIGZvb19pZCwgbm90IEZUU19ET0NfSUQu Ci0jIFdlIG11c3QgcmVuYW1lIHRoZSBmb29faWQgdG8gRlRTX0RPQ19JRCBmaXJzdC4KKyMgRW5z dXJlIHRoYXQgdGhlcmUgZXhpc3RzIG5vIGhpZGRlbiBGVFNfRE9DX0lEX0lOREVYIG9uIGZvb19p ZC4KIAotLS0gZXJyb3IgRVJfSU5OT0RCX0ZUX1dST05HX0RPQ0lEX0lOREVYCi1BTFRFUiBUQUJM RSB0MW8gQUREIEZVTExURVhUIElOREVYKGN0KTsKLQotIyBJZGVhbGx5LCB0aGUgcmVuYW1pbmcg c2hvdWxkIHdvcmsgaW4gdGhlIHNhbWUgc3RhdGVtZW50IHdpdGgKLSMgdGhlIEFERCBGVUxMVEVY VCBJTkRFWC4gVGhpcyBpcyB3aGF0IHdlIGdldCBieSBkZWZpbmluZyBGVFNfRE9DX0lECi0jIGFz IGEgaGFsZi1oaWRkZW4gY29sdW1uLgotLS0gZXJyb3IgRVJfSU5OT0RCX0ZUX1dST05HX0RPQ0lE X0lOREVYCi1BTFRFUiBUQUJMRSB0MW8gQUREIEZVTExURVhUIElOREVYKGN0KSwKKyMgUmVuYW1p bmcgdGhlIEZUU19ET0NfSUQgY29sdW1uIGFuZCBjcmVhdGluZyBhIEZVTExURVhUIGluZGV4Cisj IGRvZXMgbm90IHdvcmsgaW4gb25lIGdvLgorLS1lcnJvciBFUl9JTk5PREJfRlRfV1JPTkdfRE9D SURfSU5ERVgKK0FMVEVSIFRBQkxFIHQxbyBBREQgVU5JUVVFIElOREVYIEZUU19ET0NfSURfSU5E RVgoRlRTX0RPQ19JRCksCitBREQgRlVMTFRFWFQgSU5ERVgoY3QpLAogQ0hBTkdFIGZvb19pZCBG VFNfRE9DX0lEIEJJR0lOVCBVTlNJR05FRCBOT1QgTlVMTDsKIAorQUxURVIgVEFCTEUgdDFvIEFE RCBVTklRVUUgSU5ERVggRlRTX0RPQ19JRF9JTkRFWChmb29faWQpOworCistLWVycm9yIEVSX0lO Tk9EQl9GVF9XUk9OR19ET0NJRF9JTkRFWAorQUxURVIgVEFCTEUgdDFvIENIQU5HRSBmb29faWQg RlRTX0RPQ19JRCBCSUdJTlQgVU5TSUdORUQgTk9UIE5VTEwsCitBREQgRlVMTFRFWFQgSU5ERVgo Y3QpOworCiBBTFRFUiBUQUJMRSB0MW8gQ0hBTkdFIGZvb19pZCBGVFNfRE9DX0lEIEJJR0lOVCBV TlNJR05FRCBOT1QgTlVMTDsKK0NSRUFURSBGVUxMVEVYVCBJTkRFWCBjdCBPTiB0MW8gKGN0KTsK IAotIyBJbm5vREIgY3JlYXRlZCBGVFNfRE9DX0lEX0lOREVYIGludGVybmFsbHkgYWxyZWFkeS4K LS0tIGVycm9yIEVSX1dST05HX05BTUVfRk9SX0lOREVYCi1BTFRFUiBUQUJMRSB0MW8gQUREIFVO SVFVRSBJTkRFWCBGVFNfRE9DX0lEX0lOREVYKEZUU19ET0NfSUQpOworLS1lcnJvciBFUl9JTk5P REJfRlRfV1JPTkdfRE9DSURfQ09MVU1OCitBTFRFUiBUQUJMRSB0MW8gQ0hBTkdFIEZUU19ET0Nf SUQgZm9vX2lkIEJJR0lOVCBVTlNJR05FRCBOT1QgTlVMTDsKIAotIyBUaGUgQUxHT1JJVEhNPUNP UFkgaWdub3JlcyB0aGUgaW50ZXJuYWxseSBjcmVhdGVkIGluZGV4LiAqLwotQUxURVIgVEFCTEUg dDFvIEFERCBVTklRVUUgSU5ERVggRlRTX0RPQ19JRF9JTkRFWChGVFNfRE9DX0lEKSwKLUFMR09S SVRITT1DT1BZOworRFJPUCBUQUJMRSBzeXNfaW5kZXhlczsKK0NSRUFURSBUQUJMRSBzeXNfaW5k ZXhlcyBTRUxFQ1QgaS4qIEZST00gSU5GT1JNQVRJT05fU0NIRU1BLklOTk9EQl9TWVNfSU5ERVhF UyBpCitJTk5FUiBKT0lOIHN5c190YWJsZXMgc3QgT04gaS5UQUJMRV9JRD1zdC5UQUJMRV9JRDsK IAotLS0gZXJyb3IgRVJfRFVQX0tFWU5BTUUKLUFMVEVSIFRBQkxFIHQxbyBBREQgVU5JUVVFIElO REVYIEZUU19ET0NfSURfSU5ERVgoRlRTX0RPQ19JRCk7CistLSBzb3VyY2Ugc3VpdGUvaW5ub2Ri L2luY2x1ZGUvaW5ub2RiX2RpY3QuaW5jCiAKIERST1AgVEFCTEUgdHQsIHQxbywgc3lzX3RhYmxl cywgc3lzX2luZGV4ZXMsIHN5c19mb3JlaWduOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv aW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl L2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y MDEyMDQxNzE0MDYwMS1xNHh5dTg5a2tzN2tyaDIxCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaGFu ZGxlci9oYW5kbGVyMGFsdGVyLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIw NDE3MjAwNTM5LW95OGRmN3pncXQxeGIzb2MKQEAgLTIwODMsOSArMjA4MywxMCBAQCBmb3VuZF9m azoKIAkJaWYgKCFoZWFwKSB7CiAJCQloZWFwID0gbWVtX2hlYXBfY3JlYXRlKDEwMjQpOwogCQl9 Ci0JCWRyb3BfaW5kZXggPSAoZGljdF9pbmRleF90KiopIG1lbV9oZWFwX2FsbG9jKAotCQkJaGVh cCwgaGFfYWx0ZXJfaW5mby0+aW5kZXhfZHJvcF9jb3VudAotCQkJKiBzaXplb2YgKmRyb3BfaW5k ZXgpOworCQlkcm9wX2luZGV4ID0gc3RhdGljX2Nhc3Q8ZGljdF9pbmRleF90Kio+KAorCQkJbWVt X2hlYXBfYWxsb2MoCisJCQkJaGVhcCwgKGhhX2FsdGVyX2luZm8tPmluZGV4X2Ryb3BfY291bnQg KyAxKQorCQkJCSogc2l6ZW9mICpkcm9wX2luZGV4KSk7CiAJCWZvciAodWludCBpID0gMDsgaSA8 IGhhX2FsdGVyX2luZm8tPmluZGV4X2Ryb3BfY291bnQ7IGkrKykgewogCQkJY29uc3QgS0VZKglr ZXkKIAkJCQk9IGhhX2FsdGVyX2luZm8tPmluZGV4X2Ryb3BfYnVmZmVyW2ldOwpAQCAtMjEwOCw2 ICsyMTA5LDQzIEBAIGZvdW5kX2ZrOgogCQkJfQogCQl9CiAKKwkJLyogSWYgYWxsIEZVTExURVhU IGluZGV4ZXMgd2VyZSByZW1vdmVkLCBkcm9wIGFuCisJCWludGVybmFsIEZUU19ET0NfSURfSU5E RVggYXMgd2VsbCwgdW5sZXNzIGl0IGV4aXN0cyBpbgorCQl0aGUgdGFibGUuICovCisKKwkJaWYg KGlubm9iYXNlX2Z1bGx0ZXh0X2V4aXN0KHRhYmxlLT5zKQorCQkgICAgJiYgIWlubm9iYXNlX2Z1 bGx0ZXh0X2V4aXN0KGFsdGVyZWRfdGFibGUtPnMpKSB7CisJCQlkaWN0X2luZGV4X3QqCWZ0c19k b2NfaW5kZXgKKwkJCQk9IGRpY3RfdGFibGVfZ2V0X2luZGV4X29uX25hbWUoCisJCQkJCWluZGV4 ZWRfdGFibGUsIEZUU19ET0NfSURfSU5ERVhfTkFNRSk7CisKKwkJCS8qIFRoZSBGVFNfRE9DX0lE X0lOREVYIHNob3VsZCBhbHdheXMgZXhpc3QKKwkJCWlmIGZ1bGx0ZXh0IGluZGV4ZXMgZXhpc3Qs IHVubGVzcyB0aGUgTXlTUUwKKwkJCWFuZCBJbm5vREIgZGF0YSBkaWN0aW9uYXJpZXMgYXJlIG91 dCBvZiBzeW5jLiAqLworCQkJREJVR19BU1NFUlQoZnRzX2RvY19pbmRleCAhPSBOVUxMKTsKKwor CQkJLy8gQWRkIHNvbWUgZmF1bHQgdG9sZXJhbmNlIGZvciBub24tZGVidWcgYnVpbGRzLgorCQkJ aWYgKGZ0c19kb2NfaW5kZXggPT0gTlVMTCkgeworCQkJCWdvdG8gY2hlY2tfaWZfY2FuX2Ryb3Bf aW5kZXhlczsKKwkJCX0KKworCQkJZm9yICh1aW50IGkgPSAwOyBpIDwgdGFibGUtPnMtPmtleXM7 IGkrKykgeworCQkJCWlmICghbXlfc3RyY2FzZWNtcCgKKwkJCQkJICAgIHN5c3RlbV9jaGFyc2V0 X2luZm8sCisJCQkJCSAgICBGVFNfRE9DX0lEX0lOREVYX05BTUUsCisJCQkJCSAgICB0YWJsZS0+ cy0+a2V5X2luZm9baV0ubmFtZSkpIHsKKwkJCQkJLyogVGhlIGluZGV4IGV4aXN0cyBpbiB0aGUg TXlTUUwKKwkJCQkJZGF0YSBkaWN0aW9uYXJ5LiBEbyBub3QgZHJvcCBpdCwKKwkJCQkJZXZlbiB0 aG91Z2ggaXQgaXMgbm8gbG9uZ2VyIG5lZWRlZAorCQkJCQlieSBJbm5vREIgZnVsbHRleHQgc2Vh cmNoLiAqLworCQkJCQlnb3RvIGNoZWNrX2lmX2Nhbl9kcm9wX2luZGV4ZXM7CisJCQkJfQorCQkJ fQorCisJCQlkcm9wX2luZGV4W25fZHJvcF9pbmRleCsrXSA9IGZ0c19kb2NfaW5kZXg7CisJCX0K KworY2hlY2tfaWZfY2FuX2Ryb3BfaW5kZXhlczoKIAkJLyogQ2hlY2sgaWYgdGhlIGluZGV4ZXMg Y2FuIGJlIGRyb3BwZWQgKi8KIAogCQlpZiAocHJlYnVpbHQtPnRyeC0+Y2hlY2tfZm9yZWlnbnMp IHsKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku