From: Mattias Jonsson Date: August 30 2010 3:34pm Subject: bzr commit into mysql-5.5-bugfixing branch (mattias.jonsson:3193) Bug#50036 List-Archive: http://lists.mysql.com/commits/117150 X-Bug: 50036 Message-Id: <201008301534.o7TMxxqA004787@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1431125444480771753==" --===============1431125444480771753== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vVXNlcnMvbWF0dGlhc2ovbXlzcWwtYnpyL2I1MDAzNi01NS1iZi8gYmFzZWQg b24gcmV2aWQ6YmFyQG15c3FsLmNvbS0yMDEwMDgyMzA5NTYyMS0ydzIyNHA0MGpkbGYxczZpCgog MzE5MyBNYXR0aWFzIEpvbnNzb24JMjAxMC0wOC0zMAogICAgICBCdWcjNTAwMzY6IEluY29uc2lz dGVudCBlcnJvcnMgd2hlbiB1c2luZyBUSU1FU1RBTVAgY29sdW1ucy9leHByZXNzaW9ucwogICAg ICAKICAgICAgSXQgd2FzIGhhcmQgdG8gdW5kZXJzdGFuZCB3aGF0IHRoZSBlcnJvciByZWFsbHkg bWVhbnQuCiAgICAgIAogICAgICBUaGUgZXJyb3IgY2hlY2tpbmcgaW4gcGFydGl0aW9uaW5nIGlz IGRvbmUgaW4gc2V2ZXJhbCBkaWZmZXJlbnQKICAgICAgcGFydHMgZHVyaW5nIHRoZSBleGVjdXRp b24gb2YgYSBxdWVyeSB3aGljaCBjYW4gbWFrZSBpdAogICAgICBoYXJkIHRvIHJldHVybiB1c2Vm dWwgZXJyb3JzLgogICAgICAKICAgICAgQWRkZWQgYSBuZXcgZXJyb3IgZm9yIGJhZCBWQUxVRVMg cGFydCBpbiB0aGUgcGVyIFBBUlRJVElPTiBjbGF1c2UuCiAgICAgIFVzaW5nIHRoZSBtb3JlIHZl cmJvc2UgZXJyb3IgdGhhdCBhIGNvbHVtbiBpcyBub3QgYWxsb3dlZCBpbgogICAgICB0aGUgcGFy dGl0aW9uaW5nIGZ1bmN0aW9uIGluc3RlYWQgb2YganVzdCB0aGF0IHRoZSBmdW5jdGlvbiBpcwog ICAgICBub3QgYWxsb3dlZC4KICAgICBAIG15c3FsLXRlc3Qvci9wYXJ0aXRpb24ucmVzdWx0CiAg ICAgICAgY2hhbmdlZCBlcnJvciB0byBiZSBtb3JlIHNwZWNpZmljCiAgICAgQCBteXNxbC10ZXN0 L3IvcGFydGl0aW9uX2Vycm9yLnJlc3VsdAogICAgICAgIHVwZGF0ZWQgcmVzdWx0CiAgICAgQCBt eXNxbC10ZXN0L3N0ZF9kYXRhL3BhcnRzL3QxVElNRVNUQU1QLmZybQogICAgICAgIC5mcm0gZmls ZSBvZiBDUkVBVEUgVEFCTEUgdDEgKGEgVElNRVNUQU1QKSBQQVJUSVRJT04gQlkgSEFTSChUT19E QVlTKGEpKTsKICAgICBAIG15c3FsLXRlc3QvdC9wYXJ0aXRpb24udGVzdAogICAgICAgIGNoYW5n ZWQgZXJyb3IgdG8gYmUgbW9yZSBzcGVjaWZpYwogICAgIEAgbXlzcWwtdGVzdC90L3BhcnRpdGlv bl9lcnJvci50ZXN0CiAgICAgICAgQWRkZWQgdGVzdCAoYWxzbyBmb3IgdmVyaWZ5aW5nIGJlaGF2 aW91ciBvZiBwcmV2aW91c2x5CiAgICAgICAgY3JlYXRlZCB0YWJsZXMgd2hpY2ggaXMgbm8gbG9u Z2VyIGFsbG93ZWQpLgogICAgICAgIAogICAgICAgIFVwZGF0ZWQgZXhwZWN0ZWQgZXJyb3JzIGlu IG90aGVyIHBsYWNlcwogICAgIEAgc3FsL3BhcnRpdGlvbl9pbmZvLmNjCiAgICAgICAgQWRkZWQg ZnVuY3Rpb24gcmVwb3J0X3BhcnRfZXhwcl9lcnJvciB0bwogICAgICAgIGJlIGFibGUgdG8gcmV0 dXJuIGEgbW9yZSBzcGVjaWZpYyBlcnJvci4KICAgICAgICAKICAgICAgICBSZW5hbWVkIGZpeF9m dW5jX3BhcnRpdGlvbiB0byBmaXhfcGFydGl0aW9uX3ZhbHVlcwogICAgICAgIHNpbmNlIHRoZSBm dW5jdGlvbiByZWFsbHkgZml4ZXMvY2hlY2tzIHRoZSBWQUxVRVMgY2xhdXNlLgogICAgIEAgc3Fs L3BhcnRpdGlvbl9pbmZvLmgKICAgICAgICByZW1vdmVkIHBhcnRfcmVzdWx0X3R5cGUsIHNpbmNl IGl0IHdhcyB1bnVzZWQuCiAgICAgICAgcmVuYW1lZCBmaXhfZnVua19wYXJ0aXRpb24tPmZpeF9w YXJ0aXRpb25fdmFsdWVzCiAgICAgICAgYWRkZWQgcmVwb3J0X3BhcnRfZXhwcl9lcnJvcgogICAg IEAgc3FsL3NoYXJlL2Vycm1zZy11dGY4LnR4dAogICAgICAgIEFkZGVkIGEgbW9yZSBzcGVjaWZp YyBlcnJvci4KICAgICBAIHNxbC9zcWxfcGFydGl0aW9uLmNjCiAgICAgICAgbWFkZSB1c2Ugb2Yg cmVwb3J0X3BhcnRfZXhwcl9lcnJvciB0byBnZXQgYSBtb3JlIHNwZWNpZmljIGVycm9yLgogICAg IEAgc3FsL3NxbF95YWNjLnl5CiAgICAgICAgQ2hhbmdlZCBlcnJvciBtZXNzYWdlIHRvIGJlIG1v cmUgc3BlY2lmaWMuIEFuZCByZXR1cm4gYW4gb3RoZXIgZXJyb3IgY29kZS4KCiAgICBhZGRlZDoK ICAgICAgbXlzcWwtdGVzdC9zdGRfZGF0YS9wYXJ0cy90MVRJTUVTVEFNUC5mcm0KICAgIG1vZGlm aWVkOgogICAgICBteXNxbC10ZXN0L3IvcGFydGl0aW9uLnJlc3VsdAogICAgICBteXNxbC10ZXN0 L3IvcGFydGl0aW9uX2Vycm9yLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3QvcGFydGl0aW9uLnRl c3QKICAgICAgbXlzcWwtdGVzdC90L3BhcnRpdGlvbl9lcnJvci50ZXN0CiAgICAgIHNxbC9wYXJ0 aXRpb25faW5mby5jYwogICAgICBzcWwvcGFydGl0aW9uX2luZm8uaAogICAgICBzcWwvc2hhcmUv ZXJybXNnLXV0ZjgudHh0CiAgICAgIHNxbC9zcWxfcGFydGl0aW9uLmNjCiAgICAgIHNxbC9zcWxf eWFjYy55eQo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL3BhcnRpdGlvbi5yZXN1bHQn Ci0tLSBhL215c3FsLXRlc3Qvci9wYXJ0aXRpb24ucmVzdWx0CTIwMTAtMDUtMjggMDU6NDc6NTgg KzAwMDAKKysrIGIvbXlzcWwtdGVzdC9yL3BhcnRpdGlvbi5yZXN1bHQJMjAxMC0wOC0zMCAxNToz Mzo1NSArMDAwMApAQCAtNTIwLDEyICs1MjAsMTIgQEAgY3JlYXRlIHRhYmxlIHQxIChhIGJpZ2lu dCkKIHBhcnRpdGlvbiBieSByYW5nZSAoYSkKIChwYXJ0aXRpb24gcDAgdmFsdWVzIGxlc3MgdGhh biAoMHhGRkZGRkZGRkZGRkZGRkZGKSwKIHBhcnRpdGlvbiBwMSB2YWx1ZXMgbGVzcyB0aGFuICgx MCkpOwotRVJST1IgSFkwMDA6IFZBTFVFUyB2YWx1ZSBtdXN0IGJlIG9mIHNhbWUgdHlwZSBhcyBw YXJ0aXRpb24gZnVuY3Rpb24KK0VSUk9SIEhZMDAwOiBWQUxVRVMgdmFsdWUgZm9yIHBhcnRpdGlv biAncDAnIG11c3QgaGF2ZSB0eXBlIElOVAogY3JlYXRlIHRhYmxlIHQxIChhIGJpZ2ludCkKIHBh cnRpdGlvbiBieSBsaXN0IChhKQogKHBhcnRpdGlvbiBwMCB2YWx1ZXMgaW4gKDB4RkZGRkZGRkZG RkZGRkZGRiksCiBwYXJ0aXRpb24gcDEgdmFsdWVzIGluICgxMCkpOwotRVJST1IgSFkwMDA6IFZB TFVFUyB2YWx1ZSBtdXN0IGJlIG9mIHNhbWUgdHlwZSBhcyBwYXJ0aXRpb24gZnVuY3Rpb24KK0VS Uk9SIEhZMDAwOiBWQUxVRVMgdmFsdWUgZm9yIHBhcnRpdGlvbiAncDAnIG11c3QgaGF2ZSB0eXBl IElOVAogY3JlYXRlIHRhYmxlIHQxIChhIGJpZ2ludCB1bnNpZ25lZCkKIHBhcnRpdGlvbiBieSBy YW5nZSAoYSkKIChwYXJ0aXRpb24gcDAgdmFsdWVzIGxlc3MgdGhhbiAoMTAwKSwKCj09PSBtb2Rp ZmllZCBmaWxlICdteXNxbC10ZXN0L3IvcGFydGl0aW9uX2Vycm9yLnJlc3VsdCcKLS0tIGEvbXlz cWwtdGVzdC9yL3BhcnRpdGlvbl9lcnJvci5yZXN1bHQJMjAxMC0wNi0wNyAwODo0NzowNCArMDAw MAorKysgYi9teXNxbC10ZXN0L3IvcGFydGl0aW9uX2Vycm9yLnJlc3VsdAkyMDEwLTA4LTMwIDE1 OjMzOjU1ICswMDAwCkBAIC0xLDQgKzEsMTI0IEBACi1kcm9wIHRhYmxlIGlmIGV4aXN0cyB0MTsK K2Ryb3AgdGFibGUgaWYgZXhpc3RzIHQxLCB0MjsKKyMKKyMgQnVnIzUwMDM2OiBJbmNvbnNpc3Rl bnQgZXJyb3JzIHdoZW4gdXNpbmcgVElNRVNUQU1QCisjICAgICAgICAgICAgY29sdW1ucy9leHBy ZXNzaW9ucworIyAxLiBjb3JyZWN0IGFuZCBhcHByb3ByaWF0ZSBlcnJvcnMgaW4gbGlnaHQgb2YK KyMgICAgdGhlIGZpeCBmb3IgQlVHIzQyODQ5OgorQ1JFQVRFIFRBQkxFIHQxIChjIFRJTUVTVEFN UCkKK1BBUlRJVElPTiBCWSBSQU5HRSAoVE9fREFZUyhjKSkKKyhQQVJUSVRJT04gcDAgVkFMVUVT IExFU1MgVEhBTiAoMTAwMDApLAorUEFSVElUSU9OIHAxIFZBTFVFUyBMRVNTIFRIQU4gKE1BWFZB TFVFKSk7CitFUlJPUiBIWTAwMDogQ29uc3RhbnQsIHJhbmRvbSBvciB0aW1lem9uZS1kZXBlbmRl bnQgZXhwcmVzc2lvbnMgaW4gKHN1YilwYXJ0aXRpb25pbmcgZnVuY3Rpb24gYXJlIG5vdCBhbGxv d2VkCitDUkVBVEUgVEFCTEUgdDIgKGMgVElNRVNUQU1QKTsKK0FMVEVSIFRBQkxFIHQyCitQQVJU SVRJT04gQlkgUkFOR0UgKFRPX0RBWVMoYykpCisoUEFSVElUSU9OIHAwIFZBTFVFUyBMRVNTIFRI QU4gKDEwMDAwKSwKK1BBUlRJVElPTiBwMSBWQUxVRVMgTEVTUyBUSEFOIChNQVhWQUxVRSkpOwor RVJST1IgSFkwMDA6IENvbnN0YW50LCByYW5kb20gb3IgdGltZXpvbmUtZGVwZW5kZW50IGV4cHJl c3Npb25zIGluIChzdWIpcGFydGl0aW9uaW5nIGZ1bmN0aW9uIGFyZSBub3QgYWxsb3dlZAorQ1JF QVRFIFRBQkxFIHQxIChjIFRJTUVTVEFNUCkKK1BBUlRJVElPTiBCWSBSQU5HRSBDT0xVTU5TKGMp CisoUEFSVElUSU9OIHAwIFZBTFVFUyBMRVNTIFRIQU4gKCcyMDAwLTAxLTAxIDAwOjAwOjAwJyks CitQQVJUSVRJT04gcDEgVkFMVUVTIExFU1MgVEhBTiAoTUFYVkFMVUUpKTsKK0VSUk9SIEhZMDAw OiBGaWVsZCAnYycgaXMgb2YgYSBub3QgYWxsb3dlZCB0eXBlIGZvciB0aGlzIHR5cGUgb2YgcGFy dGl0aW9uaW5nCitBTFRFUiBUQUJMRSB0MiBQQVJUSVRJT04gQlkgUkFOR0UgQ09MVU1OUyhjKQor KFBBUlRJVElPTiBwMCBWQUxVRVMgTEVTUyBUSEFOICgnMjAwMC0wMS0wMSAwMDowMDowMCcpLAor UEFSVElUSU9OIHAxIFZBTFVFUyBMRVNTIFRIQU4gKE1BWFZBTFVFKSk7CitFUlJPUiBIWTAwMDog RmllbGQgJ2MnIGlzIG9mIGEgbm90IGFsbG93ZWQgdHlwZSBmb3IgdGhpcyB0eXBlIG9mIHBhcnRp dGlvbmluZworRFJPUCBUQUJMRSB0MjsKKyMgMi4gVGhlc2UgZXJyb3JzIHdoZXJlIHF1ZXN0aW9u YWJsZSBiZWZvcmUgdGhlIGZpeDoKKyMgVkFMVUVTIGNsYXVzZSBhcmUgY2hlY2tlZCBmaXJzdCwg Y2xlYXJpZmllZCB0aGUgZXJyb3IgbWVzc2FnZS4KK0NSRUFURSBUQUJMRSB0MSAoYyBUSU1FU1RB TVApCitQQVJUSVRJT04gQlkgUkFOR0UgKGMpCisoUEFSVElUSU9OIHAwIFZBTFVFUyBMRVNTIFRI QU4gKCcyMDAwLTAxLTAxIDAwOjAwOjAwJyksCitQQVJUSVRJT04gcDEgVkFMVUVTIExFU1MgVEhB TiAoTUFYVkFMVUUpKTsKK0VSUk9SIEhZMDAwOiBWQUxVRVMgdmFsdWUgZm9yIHBhcnRpdGlvbiAn cDAnIG11c3QgaGF2ZSB0eXBlIElOVAorIyBUSU1FU1RBTVAgaXMgbm90IElOVCAoZS5nLiBVTklY X1RJTUVTVEFNUCkuCitDUkVBVEUgVEFCTEUgdDEgKGMgVElNRVNUQU1QKQorUEFSVElUSU9OIEJZ IFJBTkdFIChVTklYX1RJTUVTVEFNUChjKSkKKyhQQVJUSVRJT04gcDAgVkFMVUVTIExFU1MgVEhB TiAoJzIwMDAtMDEtMDEgMDA6MDA6MDAnKSwKK1BBUlRJVElPTiBwMSBWQUxVRVMgTEVTUyBUSEFO IChNQVhWQUxVRSkpOworRVJST1IgSFkwMDA6IFZBTFVFUyB2YWx1ZSBmb3IgcGFydGl0aW9uICdw MCcgbXVzdCBoYXZlIHR5cGUgSU5UCitDUkVBVEUgVEFCTEUgdDEgKGMgVElNRVNUQU1QKQorUEFS VElUSU9OIEJZIFJBTkdFIChVTklYX1RJTUVTVEFNUChjKSkKKyhQQVJUSVRJT04gcDAgVkFMVUVT IExFU1MgVEhBTiAoVU5JWF9USU1FU1RBTVAoJzIwMDAtMDEtMDEgMDA6MDA6MDAnKSksCitQQVJU SVRJT04gcDEgVkFMVUVTIExFU1MgVEhBTiAoTUFYVkFMVUUpKTsKK0RST1AgVEFCTEUgdDE7Cisj IENoYW5nZWQgZXJyb3IgZnJvbSBFUl9JTkNPTlNJU1RFTlRfVFlQRV9PRl9GVU5DVElPTlNfRVJS T1IKK0NSRUFURSBUQUJMRSB0MSAoYyBUSU1FU1RBTVApCitQQVJUSVRJT04gQlkgSEFTSCAoYykg UEFSVElUSU9OUyA0OworRVJST1IgSFkwMDA6IEZpZWxkICdjJyBpcyBvZiBhIG5vdCBhbGxvd2Vk IHR5cGUgZm9yIHRoaXMgdHlwZSBvZiBwYXJ0aXRpb25pbmcKKyMgQWRkZWQgdGVzdCB3aXRoIGV4 aXN0aW5nIFRJTUVTVEFNUCBwYXJ0aXRpb25pbmcgKHdoZW4gaXQgd2FzIGFsbG93ZWQpLgorQ1JF QVRFIFRBQkxFIHQxIChhIFRJTUVTVEFNUCkKK1BBUlRJVElPTiBCWSBIQVNIIChVTklYX1RJTUVT VEFNUChhKSk7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKCcyMDAwLTAxLTAyIDAzOjA0OjA1Jyk7 CitTRUxFQ1QgKiBGUk9NIHQxOworYQorMjAwMC0wMS0wMiAwMzowNDowNQorRkxVU0ggVEFCTEVT OworU0VMRUNUICogRlJPTSB0MTsKK2EKKzIwMDAtMDEtMDIgMDM6MDQ6MDUKK1dhcm5pbmcJMTQ4 NglDb25zdGFudCwgcmFuZG9tIG9yIHRpbWV6b25lLWRlcGVuZGVudCBleHByZXNzaW9ucyBpbiAo c3ViKXBhcnRpdGlvbmluZyBmdW5jdGlvbiBhcmUgbm90IGFsbG93ZWQKK1dhcm5pbmdzOgorU0hP VyBDUkVBVEUgVEFCTEUgdDE7CitUYWJsZQlDcmVhdGUgVGFibGUKK3QxCUNSRUFURSBUQUJMRSBg dDFgICgKKyAgYGFgIHRpbWVzdGFtcCBOT1QgTlVMTCBERUZBVUxUIENVUlJFTlRfVElNRVNUQU1Q IE9OIFVQREFURSBDVVJSRU5UX1RJTUVTVEFNUAorKSBFTkdJTkU9TXlJU0FNIERFRkFVTFQgQ0hB UlNFVD1sYXRpbjEKKy8qITUwMTAwIFBBUlRJVElPTiBCWSBIQVNIIChUT19EQVlTKGEpKSAqLwor SU5TRVJUIElOVE8gdDEgVkFMVUVTICgnMjAwMS0wMi0wMyAwNDowNTowNicpOworU0VMRUNUICog RlJPTSB0MTsKK2EKKzIwMDAtMDEtMDIgMDM6MDQ6MDUKKzIwMDEtMDItMDMgMDQ6MDU6MDYKK0FM VEVSIFRBQkxFIHQxIEFERCBQQVJUSVRJT04gUEFSVElUSU9OUyAyOworQUxURVIgVEFCTEUgdDEK K1BBUlRJVElPTiBCWSBSQU5HRSAoVE9fREFZUyhhKSkKKyhQQVJUSVRJT04gcDAgVkFMVUVTIExF U1MgVEhBTiAoMTAwMDApLAorUEFSVElUSU9OIHAxIFZBTFVFUyBMRVNTIFRIQU4gKE1BWFZBTFVF KSk7CitFUlJPUiBIWTAwMDogQ29uc3RhbnQsIHJhbmRvbSBvciB0aW1lem9uZS1kZXBlbmRlbnQg ZXhwcmVzc2lvbnMgaW4gKHN1YilwYXJ0aXRpb25pbmcgZnVuY3Rpb24gYXJlIG5vdCBhbGxvd2Vk CitTSE9XIENSRUFURSBUQUJMRSB0MTsKK1RhYmxlCUNyZWF0ZSBUYWJsZQordDEJQ1JFQVRFIFRB QkxFIGB0MWAgKAorICBgYWAgdGltZXN0YW1wIE5PVCBOVUxMIERFRkFVTFQgQ1VSUkVOVF9USU1F U1RBTVAgT04gVVBEQVRFIENVUlJFTlRfVElNRVNUQU1QCispIEVOR0lORT1NeUlTQU0gREVGQVVM VCBDSEFSU0VUPWxhdGluMQorLyohNTAxMDAgUEFSVElUSU9OIEJZIEhBU0ggKFRPX0RBWVMoYSkp CitQQVJUSVRJT05TIDMgKi8KK1dhcm5pbmdzOgorV2FybmluZwkxNDg2CUNvbnN0YW50LCByYW5k b20gb3IgdGltZXpvbmUtZGVwZW5kZW50IGV4cHJlc3Npb25zIGluIChzdWIpcGFydGl0aW9uaW5n IGZ1bmN0aW9uIGFyZSBub3QgYWxsb3dlZAorQ1JFQVRFIFRBQkxFIHQyIExJS0UgdDE7CitTSE9X IENSRUFURSBUQUJMRSB0MjsKK1RhYmxlCUNyZWF0ZSBUYWJsZQordDIJQ1JFQVRFIFRBQkxFIGB0 MmAgKAorICBgYWAgdGltZXN0YW1wIE5PVCBOVUxMIERFRkFVTFQgQ1VSUkVOVF9USU1FU1RBTVAg T04gVVBEQVRFIENVUlJFTlRfVElNRVNUQU1QCispIEVOR0lORT1NeUlTQU0gREVGQVVMVCBDSEFS U0VUPWxhdGluMQorLyohNTAxMDAgUEFSVElUSU9OIEJZIEhBU0ggKFRPX0RBWVMoYSkpCitQQVJU SVRJT05TIDMgKi8KK1dhcm5pbmdzOgorV2FybmluZwkxNDg2CUNvbnN0YW50LCByYW5kb20gb3Ig dGltZXpvbmUtZGVwZW5kZW50IGV4cHJlc3Npb25zIGluIChzdWIpcGFydGl0aW9uaW5nIGZ1bmN0 aW9uIGFyZSBub3QgYWxsb3dlZAorRFJPUCBUQUJMRSB0MjsKK0NSRUFURSBUQUJMRSB0MiBTRUxF Q1QgKiBGUk9NIHQxOworRFJPUCBUQUJMRSB0MjsKK0FMVEVSIFRBQkxFIHQxIFBBUlRJVElPTiBC WSBIQVNIIChVTklYX1RJTUVTVEFNUChhKSk7CitTSE9XIENSRUFURSBUQUJMRSB0MTsKK1RhYmxl CUNyZWF0ZSBUYWJsZQordDEJQ1JFQVRFIFRBQkxFIGB0MWAgKAorICBgYWAgdGltZXN0YW1wIE5P VCBOVUxMIERFRkFVTFQgQ1VSUkVOVF9USU1FU1RBTVAgT04gVVBEQVRFIENVUlJFTlRfVElNRVNU QU1QCispIEVOR0lORT1NeUlTQU0gREVGQVVMVCBDSEFSU0VUPWxhdGluMQorLyohNTAxMDAgUEFS VElUSU9OIEJZIEhBU0ggKFVOSVhfVElNRVNUQU1QKGEpKSAqLworQUxURVIgVEFCTEUgdDEgQURE IFBBUlRJVElPTiBQQVJUSVRJT05TIDI7CitTSE9XIENSRUFURSBUQUJMRSB0MTsKK1RhYmxlCUNy ZWF0ZSBUYWJsZQordDEJQ1JFQVRFIFRBQkxFIGB0MWAgKAorICBgYWAgdGltZXN0YW1wIE5PVCBO VUxMIERFRkFVTFQgQ1VSUkVOVF9USU1FU1RBTVAgT04gVVBEQVRFIENVUlJFTlRfVElNRVNUQU1Q CispIEVOR0lORT1NeUlTQU0gREVGQVVMVCBDSEFSU0VUPWxhdGluMQorLyohNTAxMDAgUEFSVElU SU9OIEJZIEhBU0ggKFVOSVhfVElNRVNUQU1QKGEpKQorUEFSVElUSU9OUyAzICovCitTRUxFQ1Qg KiBGUk9NIHQxOworYQorMjAwMC0wMS0wMiAwMzowNDowNQorMjAwMS0wMi0wMyAwNDowNTowNgor RFJPUCBUQUJMRSB0MTsKICMKICMgQnVnIzQ5MTYxOiBPdXQgb2YgbWVtb3J5OyByZXN0YXJ0IHNl cnZlciBhbmQgdHJ5IGFnYWluIChuZWVkZWQgMiBieXRlcykKICMKQEAgLTQ5Nyw3ICs2MTcsNyBA QCBwYXJ0aXRpb24gYnkgcmFuZ2UgKGEpCiBwYXJ0aXRpb25zIDIKIChwYXJ0aXRpb24geDEgdmFs dWVzIGxlc3MgdGhhbiAoNC4wKSB0YWJsZXNwYWNlIHRzMSwKIHBhcnRpdGlvbiB4MiB2YWx1ZXMg bGVzcyB0aGFuICg4KSB0YWJsZXNwYWNlIHRzMik7Ci1FUlJPUiBIWTAwMDogVkFMVUVTIHZhbHVl IG11c3QgYmUgb2Ygc2FtZSB0eXBlIGFzIHBhcnRpdGlvbiBmdW5jdGlvbgorRVJST1IgSFkwMDA6 IFZBTFVFUyB2YWx1ZSBmb3IgcGFydGl0aW9uICd4MScgbXVzdCBoYXZlIHR5cGUgSU5UCiBDUkVB VEUgVEFCTEUgdDEgKAogYSBpbnQgbm90IG51bGwsCiBiIGludCBub3QgbnVsbCwKQEAgLTczNiw3 ICs4NTYsNyBAQCBwYXJ0aXRpb24gYnkgbGlzdCAoYSkKIHBhcnRpdGlvbnMgMgogKHBhcnRpdGlv biB4MSB2YWx1ZXMgaW4gKDQuMCwgMTIrOCksCiBwYXJ0aXRpb24geDIgdmFsdWVzIGluICgzLCAy MSkpOwotRVJST1IgSFkwMDA6IFZBTFVFUyB2YWx1ZSBtdXN0IGJlIG9mIHNhbWUgdHlwZSBhcyBw YXJ0aXRpb24gZnVuY3Rpb24KK0VSUk9SIEhZMDAwOiBWQUxVRVMgdmFsdWUgZm9yIHBhcnRpdGlv biAneDEnIG11c3QgaGF2ZSB0eXBlIElOVAogQ1JFQVRFIFRBQkxFIHQxICgKIGEgaW50IG5vdCBu dWxsLAogYiBpbnQgbm90IG51bGwsCkBAIC03OTYsMTIgKzkxNiwxMiBAQCBDUkVBVEUgVEFCTEUg bmV3IChhIFRJTUVTVEFNUCBOT1QgTlVMTCBQCiBQQVJUSVRJT04gQlkgUkFOR0UgKGEpICgKIFBB UlRJVElPTiBwIFZBTFVFUyBMRVNTIFRIQU4gKDIwMDgwODE5KSwKIFBBUlRJVElPTiBwbWF4IFZB TFVFUyBMRVNTIFRIQU4gTUFYVkFMVUUpOwotRVJST1IgSFkwMDA6IFRoZSBQQVJUSVRJT04gZnVu Y3Rpb24gcmV0dXJucyB0aGUgd3JvbmcgdHlwZQorRVJST1IgSFkwMDA6IEZpZWxkICdhJyBpcyBv ZiBhIG5vdCBhbGxvd2VkIHR5cGUgZm9yIHRoaXMgdHlwZSBvZiBwYXJ0aXRpb25pbmcKIEFMVEVS IFRBQkxFIG9sZAogUEFSVElUSU9OIEJZIFJBTkdFIChhKSAoCiBQQVJUSVRJT04gcCBWQUxVRVMg TEVTUyBUSEFOICgyMDA4MDgxOSksCiBQQVJUSVRJT04gcG1heCBWQUxVRVMgTEVTUyBUSEFOIE1B WFZBTFVFKTsKLUVSUk9SIEhZMDAwOiBUaGUgUEFSVElUSU9OIGZ1bmN0aW9uIHJldHVybnMgdGhl IHdyb25nIHR5cGUKK0VSUk9SIEhZMDAwOiBGaWVsZCAnYScgaXMgb2YgYSBub3QgYWxsb3dlZCB0 eXBlIGZvciB0aGlzIHR5cGUgb2YgcGFydGl0aW9uaW5nCiBDUkVBVEUgVEFCTEUgbmV3IChhIFRJ TUVTVEFNUCBOT1QgTlVMTCBQUklNQVJZIEtFWSkKIFBBUlRJVElPTiBCWSBSQU5HRSAoYSswKSAo CiBQQVJUSVRJT04gcCBWQUxVRVMgTEVTUyBUSEFOICgyMDA4MDgxOSksCgo9PT0gYWRkZWQgZmls ZSAnbXlzcWwtdGVzdC9zdGRfZGF0YS9wYXJ0cy90MVRJTUVTVEFNUC5mcm0nCkJpbmFyeSBmaWxl cyBhL215c3FsLXRlc3Qvc3RkX2RhdGEvcGFydHMvdDFUSU1FU1RBTVAuZnJtCTE5NzAtMDEtMDEg MDA6MDA6MDAgKzAwMDAgYW5kIGIvbXlzcWwtdGVzdC9zdGRfZGF0YS9wYXJ0cy90MVRJTUVTVEFN UC5mcm0JMjAxMC0wOC0zMCAxNTozMzo1NSArMDAwMCBkaWZmZXIKCj09PSBtb2RpZmllZCBmaWxl ICdteXNxbC10ZXN0L3QvcGFydGl0aW9uLnRlc3QnCi0tLSBhL215c3FsLXRlc3QvdC9wYXJ0aXRp b24udGVzdAkyMDEwLTA1LTI4IDA1OjQ3OjU4ICswMDAwCisrKyBiL215c3FsLXRlc3QvdC9wYXJ0 aXRpb24udGVzdAkyMDEwLTA4LTMwIDE1OjMzOjU1ICswMDAwCkBAIC00MzAsMTIgKzQzMCwxMiBA QCBkcm9wIHRhYmxlIHQxOwogIwogIyBCVUcgMTYwMDI6IEhhbmRsZSB1bnNpZ25lZCBpbnRlZ2Vy IGZ1bmN0aW9ucyBwcm9wZXJseQogIwotLS1lcnJvciBFUl9JTkNPTlNJU1RFTlRfVFlQRV9PRl9G VU5DVElPTlNfRVJST1IKKy0tZXJyb3IgRVJfVkFMVUVTX0lTX05PVF9JTlRfVFlQRV9FUlJPUgog Y3JlYXRlIHRhYmxlIHQxIChhIGJpZ2ludCkKIHBhcnRpdGlvbiBieSByYW5nZSAoYSkKIChwYXJ0 aXRpb24gcDAgdmFsdWVzIGxlc3MgdGhhbiAoMHhGRkZGRkZGRkZGRkZGRkZGKSwKICBwYXJ0aXRp b24gcDEgdmFsdWVzIGxlc3MgdGhhbiAoMTApKTsKLS0tZXJyb3IgRVJfSU5DT05TSVNURU5UX1RZ UEVfT0ZfRlVOQ1RJT05TX0VSUk9SCistLWVycm9yIEVSX1ZBTFVFU19JU19OT1RfSU5UX1RZUEVf RVJST1IKIGNyZWF0ZSB0YWJsZSB0MSAoYSBiaWdpbnQpCiBwYXJ0aXRpb24gYnkgbGlzdCAoYSkK IChwYXJ0aXRpb24gcDAgdmFsdWVzIGluICgweEZGRkZGRkZGRkZGRkZGRkYpLAoKPT09IG1vZGlm aWVkIGZpbGUgJ215c3FsLXRlc3QvdC9wYXJ0aXRpb25fZXJyb3IudGVzdCcKLS0tIGEvbXlzcWwt dGVzdC90L3BhcnRpdGlvbl9lcnJvci50ZXN0CTIwMTAtMDYtMDcgMDg6NDc6MDQgKzAwMDAKKysr IGIvbXlzcWwtdGVzdC90L3BhcnRpdGlvbl9lcnJvci50ZXN0CTIwMTAtMDgtMzAgMTU6MzM6NTUg KzAwMDAKQEAgLTUsMTIgKzUsMTA0IEBACiAtLSBzb3VyY2UgaW5jbHVkZS9oYXZlX3BhcnRpdGlv bi5pbmMKIAogLS1kaXNhYmxlX3dhcm5pbmdzCi1kcm9wIHRhYmxlIGlmIGV4aXN0cyB0MTsKK2Ry b3AgdGFibGUgaWYgZXhpc3RzIHQxLCB0MjsKIC0tZW5hYmxlX3dhcm5pbmdzCiAKIGxldCAkTVlT UUxEX0RBVEFESVI9IGBTRUxFQ1QgQEBkYXRhZGlyYDsKIAogLS1lY2hvICMKKy0tZWNobyAjIEJ1 ZyM1MDAzNjogSW5jb25zaXN0ZW50IGVycm9ycyB3aGVuIHVzaW5nIFRJTUVTVEFNUAorLS1lY2hv ICMgICAgICAgICAgICBjb2x1bW5zL2V4cHJlc3Npb25zCisKKy0tZWNobyAjIDEuIGNvcnJlY3Qg YW5kIGFwcHJvcHJpYXRlIGVycm9ycyBpbiBsaWdodCBvZgorLS1lY2hvICMgICAgdGhlIGZpeCBm b3IgQlVHIzQyODQ5OgorLS1lcnJvciBFUl9XUk9OR19FWFBSX0lOX1BBUlRJVElPTl9GVU5DX0VS Uk9SCitDUkVBVEUgVEFCTEUgdDEgKGMgVElNRVNUQU1QKQorUEFSVElUSU9OIEJZIFJBTkdFIChU T19EQVlTKGMpKQorKFBBUlRJVElPTiBwMCBWQUxVRVMgTEVTUyBUSEFOICgxMDAwMCksCisgUEFS VElUSU9OIHAxIFZBTFVFUyBMRVNTIFRIQU4gKE1BWFZBTFVFKSk7CitDUkVBVEUgVEFCTEUgdDIg KGMgVElNRVNUQU1QKTsKKy0tZXJyb3IgRVJfV1JPTkdfRVhQUl9JTl9QQVJUSVRJT05fRlVOQ19F UlJPUgorQUxURVIgVEFCTEUgdDIKK1BBUlRJVElPTiBCWSBSQU5HRSAoVE9fREFZUyhjKSkKKyhQ QVJUSVRJT04gcDAgVkFMVUVTIExFU1MgVEhBTiAoMTAwMDApLAorIFBBUlRJVElPTiBwMSBWQUxV RVMgTEVTUyBUSEFOIChNQVhWQUxVRSkpOworCistLWVycm9yIEVSX0ZJRUxEX1RZUEVfTk9UX0FM TE9XRURfQVNfUEFSVElUSU9OX0ZJRUxECitDUkVBVEUgVEFCTEUgdDEgKGMgVElNRVNUQU1QKQor UEFSVElUSU9OIEJZIFJBTkdFIENPTFVNTlMoYykKKyhQQVJUSVRJT04gcDAgVkFMVUVTIExFU1Mg VEhBTiAoJzIwMDAtMDEtMDEgMDA6MDA6MDAnKSwKKyBQQVJUSVRJT04gcDEgVkFMVUVTIExFU1Mg VEhBTiAoTUFYVkFMVUUpKTsKKy0tZXJyb3IgRVJfRklFTERfVFlQRV9OT1RfQUxMT1dFRF9BU19Q QVJUSVRJT05fRklFTEQKK0FMVEVSIFRBQkxFIHQyIFBBUlRJVElPTiBCWSBSQU5HRSBDT0xVTU5T KGMpCisoUEFSVElUSU9OIHAwIFZBTFVFUyBMRVNTIFRIQU4gKCcyMDAwLTAxLTAxIDAwOjAwOjAw JyksCisgUEFSVElUSU9OIHAxIFZBTFVFUyBMRVNTIFRIQU4gKE1BWFZBTFVFKSk7CitEUk9QIFRB QkxFIHQyOworCistLWVjaG8gIyAyLiBUaGVzZSBlcnJvcnMgd2hlcmUgcXVlc3Rpb25hYmxlIGJl Zm9yZSB0aGUgZml4OgorCistLWVjaG8gIyBWQUxVRVMgY2xhdXNlIGFyZSBjaGVja2VkIGZpcnN0 LCBjbGVhcmlmaWVkIHRoZSBlcnJvciBtZXNzYWdlLgorLS1lcnJvciBFUl9WQUxVRVNfSVNfTk9U X0lOVF9UWVBFX0VSUk9SCitDUkVBVEUgVEFCTEUgdDEgKGMgVElNRVNUQU1QKQorUEFSVElUSU9O IEJZIFJBTkdFIChjKQorKFBBUlRJVElPTiBwMCBWQUxVRVMgTEVTUyBUSEFOICgnMjAwMC0wMS0w MSAwMDowMDowMCcpLAorIFBBUlRJVElPTiBwMSBWQUxVRVMgTEVTUyBUSEFOIChNQVhWQUxVRSkp OworCistLWVjaG8gIyBUSU1FU1RBTVAgaXMgbm90IElOVCAoZS5nLiBVTklYX1RJTUVTVEFNUCku CistLWVycm9yIEVSX1ZBTFVFU19JU19OT1RfSU5UX1RZUEVfRVJST1IKK0NSRUFURSBUQUJMRSB0 MSAoYyBUSU1FU1RBTVApCitQQVJUSVRJT04gQlkgUkFOR0UgKFVOSVhfVElNRVNUQU1QKGMpKQor KFBBUlRJVElPTiBwMCBWQUxVRVMgTEVTUyBUSEFOICgnMjAwMC0wMS0wMSAwMDowMDowMCcpLAor IFBBUlRJVElPTiBwMSBWQUxVRVMgTEVTUyBUSEFOIChNQVhWQUxVRSkpOworCitDUkVBVEUgVEFC TEUgdDEgKGMgVElNRVNUQU1QKQorUEFSVElUSU9OIEJZIFJBTkdFIChVTklYX1RJTUVTVEFNUChj KSkKKyhQQVJUSVRJT04gcDAgVkFMVUVTIExFU1MgVEhBTiAoVU5JWF9USU1FU1RBTVAoJzIwMDAt MDEtMDEgMDA6MDA6MDAnKSksCisgUEFSVElUSU9OIHAxIFZBTFVFUyBMRVNTIFRIQU4gKE1BWFZB TFVFKSk7CitEUk9QIFRBQkxFIHQxOworCistLWVjaG8gIyBDaGFuZ2VkIGVycm9yIGZyb20gRVJf SU5DT05TSVNURU5UX1RZUEVfT0ZfRlVOQ1RJT05TX0VSUk9SCistLWVycm9yIEVSX0ZJRUxEX1RZ UEVfTk9UX0FMTE9XRURfQVNfUEFSVElUSU9OX0ZJRUxECitDUkVBVEUgVEFCTEUgdDEgKGMgVElN RVNUQU1QKQorUEFSVElUSU9OIEJZIEhBU0ggKGMpIFBBUlRJVElPTlMgNDsKKworLS1lY2hvICMg QWRkZWQgdGVzdCB3aXRoIGV4aXN0aW5nIFRJTUVTVEFNUCBwYXJ0aXRpb25pbmcgKHdoZW4gaXQg d2FzIGFsbG93ZWQpLgorCitDUkVBVEUgVEFCTEUgdDEgKGEgVElNRVNUQU1QKQorUEFSVElUSU9O IEJZIEhBU0ggKFVOSVhfVElNRVNUQU1QKGEpKTsKK0lOU0VSVCBJTlRPIHQxIFZBTFVFUyAoJzIw MDAtMDEtMDIgMDM6MDQ6MDUnKTsKKy0tc29ydGVkX3Jlc3VsdAorU0VMRUNUICogRlJPTSB0MTsK K0ZMVVNIIFRBQkxFUzsKKy0tcmVtb3ZlX2ZpbGUgJE1ZU1FMRF9EQVRBRElSL3Rlc3QvdDEuZnJt CistLWNvcHlfZmlsZSBzdGRfZGF0YS9wYXJ0cy90MVRJTUVTVEFNUC5mcm0gJE1ZU1FMRF9EQVRB RElSL3Rlc3QvdDEuZnJtCistLXNvcnRlZF9yZXN1bHQKK1NFTEVDVCAqIEZST00gdDE7CitTSE9X IENSRUFURSBUQUJMRSB0MTsKK0lOU0VSVCBJTlRPIHQxIFZBTFVFUyAoJzIwMDEtMDItMDMgMDQ6 MDU6MDYnKTsKKy0tc29ydGVkX3Jlc3VsdAorU0VMRUNUICogRlJPTSB0MTsKK0FMVEVSIFRBQkxF IHQxIEFERCBQQVJUSVRJT04gUEFSVElUSU9OUyAyOworLS1lcnJvciBFUl9XUk9OR19FWFBSX0lO X1BBUlRJVElPTl9GVU5DX0VSUk9SCitBTFRFUiBUQUJMRSB0MQorUEFSVElUSU9OIEJZIFJBTkdF IChUT19EQVlTKGEpKQorKFBBUlRJVElPTiBwMCBWQUxVRVMgTEVTUyBUSEFOICgxMDAwMCksCisg UEFSVElUSU9OIHAxIFZBTFVFUyBMRVNTIFRIQU4gKE1BWFZBTFVFKSk7CitTSE9XIENSRUFURSBU QUJMRSB0MTsKK0NSRUFURSBUQUJMRSB0MiBMSUtFIHQxOworU0hPVyBDUkVBVEUgVEFCTEUgdDI7 CitEUk9QIFRBQkxFIHQyOworQ1JFQVRFIFRBQkxFIHQyIFNFTEVDVCAqIEZST00gdDE7CitEUk9Q IFRBQkxFIHQyOworQUxURVIgVEFCTEUgdDEgUEFSVElUSU9OIEJZIEhBU0ggKFVOSVhfVElNRVNU QU1QKGEpKTsKK1NIT1cgQ1JFQVRFIFRBQkxFIHQxOworQUxURVIgVEFCTEUgdDEgQUREIFBBUlRJ VElPTiBQQVJUSVRJT05TIDI7CitTSE9XIENSRUFURSBUQUJMRSB0MTsKKy0tc29ydGVkX3Jlc3Vs dAorU0VMRUNUICogRlJPTSB0MTsKK0RST1AgVEFCTEUgdDE7CisKKy0tZWNobyAjCiAtLWVjaG8g IyBCdWcjNDkxNjE6IE91dCBvZiBtZW1vcnk7IHJlc3RhcnQgc2VydmVyIGFuZCB0cnkgYWdhaW4g KG5lZWRlZCAyIGJ5dGVzKQogLS1lY2hvICMKIENSRUFURSBUQUJMRSB0MSAoYSBJTlQpIFBBUlRJ VElPTiBCWSBIQVNIIChhKTsKQEAgLTUzNiw3ICs2MjgsNyBAQCBwYXJ0aXRpb25zIDIKICMKICMg UGFydGl0aW9uIGJ5IHJhbmdlLCBpbmNvbnNpc3RlbnQgcGFydGl0aW9uIGZ1bmN0aW9uIGFuZCBj b25zdGFudHMKICMKLS0tZXJyb3IgRVJfSU5DT05TSVNURU5UX1RZUEVfT0ZfRlVOQ1RJT05TX0VS Uk9SCistLWVycm9yIEVSX1ZBTFVFU19JU19OT1RfSU5UX1RZUEVfRVJST1IKIENSRUFURSBUQUJM RSB0MSAoCiBhIGludCBub3QgbnVsbCwKIGIgaW50IG5vdCBudWxsLApAQCAtODQ5LDcgKzk0MSw3 IEBAIHBhcnRpdGlvbnMgMgogIwogIyBQYXJ0aXRpb24gYnkgbGlzdCwgd3JvbmcgY29uc3RhbnQg cmVzdWx0IHR5cGUgKG5vdCBJTlQpCiAjCi0tLWVycm9yIEVSX0lOQ09OU0lTVEVOVF9UWVBFX09G X0ZVTkNUSU9OU19FUlJPUgorLS1lcnJvciBFUl9WQUxVRVNfSVNfTk9UX0lOVF9UWVBFX0VSUk9S CiBDUkVBVEUgVEFCTEUgdDEgKAogYSBpbnQgbm90IG51bGwsCiBiIGludCBub3QgbnVsbCwKQEAg LTkzOSwxMyArMTAzMSwxMyBAQCBQQVJUSVRJT04gcG1heCBWQUxVRVMgTEVTUyBUSEFOIE1BWFZB TFVFCiAjIENoZWNrIHRoYXQgYWxsb3dlZCBhcml0aG1ldGljL21hdGggZnVuY3Rpb25zIGludm9s dmluZyBUSU1FU1RBTVAgdmFsdWVzIHJlc3VsdAogIyBpbiBFUl9QQVJUSVRJT05fRlVOQ19OT1Rf QUxMT1dFRF9FUlJPUiB3aGVuIHVzZWQgYXMgYSBwYXJ0aXRpb25pbmcgZnVuY3Rpb24KIAotLS1l cnJvciBFUl9QQVJUSVRJT05fRlVOQ19OT1RfQUxMT1dFRF9FUlJPUgorLS1lcnJvciBFUl9GSUVM RF9UWVBFX05PVF9BTExPV0VEX0FTX1BBUlRJVElPTl9GSUVMRAogQ1JFQVRFIFRBQkxFIG5ldyAo YSBUSU1FU1RBTVAgTk9UIE5VTEwgUFJJTUFSWSBLRVkpCiBQQVJUSVRJT04gQlkgUkFOR0UgKGEp ICgKIFBBUlRJVElPTiBwIFZBTFVFUyBMRVNTIFRIQU4gKDIwMDgwODE5KSwKIFBBUlRJVElPTiBw bWF4IFZBTFVFUyBMRVNTIFRIQU4gTUFYVkFMVUUpOwogCi0tLWVycm9yIEVSX1BBUlRJVElPTl9G VU5DX05PVF9BTExPV0VEX0VSUk9SCistLWVycm9yIEVSX0ZJRUxEX1RZUEVfTk9UX0FMTE9XRURf QVNfUEFSVElUSU9OX0ZJRUxECiBBTFRFUiBUQUJMRSBvbGQKIFBBUlRJVElPTiBCWSBSQU5HRSAo YSkgKAogUEFSVElUSU9OIHAgVkFMVUVTIExFU1MgVEhBTiAoMjAwODA4MTkpLAoKPT09IG1vZGlm aWVkIGZpbGUgJ3NxbC9wYXJ0aXRpb25faW5mby5jYycKLS0tIGEvc3FsL3BhcnRpdGlvbl9pbmZv LmNjCTIwMTAtMDgtMDUgMTI6NTM6MDkgKzAwMDAKKysrIGIvc3FsL3BhcnRpdGlvbl9pbmZvLmNj CTIwMTAtMDgtMzAgMTU6MzM6NTUgKzAwMDAKQEAgLTc0Miw3ICs3NDIsNiBAQCBib29sIHBhcnRp dGlvbl9pbmZvOjpjaGVja19yYW5nZV9jb25zdGFuCiAgICAgbG9uZ2xvbmcgcGFydF9yYW5nZV92 YWx1ZTsKICAgICBib29sIHNpZ25lZF9mbGFnPSAhcGFydF9leHByLT51bnNpZ25lZF9mbGFnOwog Ci0gICAgcGFydF9yZXN1bHRfdHlwZT0gSU5UX1JFU1VMVDsKICAgICByYW5nZV9pbnRfYXJyYXk9 IChsb25nbG9uZyopc3FsX2FsbG9jKG51bV9wYXJ0cyAqIHNpemVvZihsb25nbG9uZykpOwogICAg IGlmICh1bmxpa2VseShyYW5nZV9pbnRfYXJyYXkgPT0gTlVMTCkpCiAgICAgewpAQCAtOTE3LDcg KzkxNiw2IEBAIGJvb2wgcGFydGl0aW9uX2luZm86OmNoZWNrX2xpc3RfY29uc3RhbnQKICAgTGlz dF9pdGVyYXRvcjxwYXJ0aXRpb25fZWxlbWVudD4gbGlzdF9mdW5jX2l0KHBhcnRpdGlvbnMpOwog ICBEQlVHX0VOVEVSKCJwYXJ0aXRpb25faW5mbzo6Y2hlY2tfbGlzdF9jb25zdGFudHMiKTsKIAot ICBwYXJ0X3Jlc3VsdF90eXBlPSBJTlRfUkVTVUxUOwogICBudW1fbGlzdF92YWx1ZXM9IDA7CiAg IC8qCiAgICAgV2UgYmVnaW4gYnkgY2FsY3VsYXRpbmcgdGhlIG51bWJlciBvZiBsaXN0IHZhbHVl cyB0aGF0IGhhdmUgYmVlbgpAQCAtMTYwOCw2ICsxNjA2LDUyIEBAIGlkX2VycjoKICAgcmV0dXJu IDE7CiB9CiAKKworLyoqCisgIENoZWNrIHdoYXQga2luZCBvZiBlcnJvciB0byByZXBvcnQKKwor ICBAcGFyYW0gdXNlX3N1YnBhcnRfZXhwciBVc2UgdGhlIHN1YnBhcnRfZXhwciBpbnN0ZWFkIG9m IHBhcnRfZXhwcgorICBAcGFyYW0gcGFydF9zdHIgICAgICAgICBOYW1lIG9mIHBhcnRpdGlvbiB0 byByZXBvcnQgZXJyb3IgKG9yIE5VTEwpCisqLwordm9pZCBwYXJ0aXRpb25faW5mbzo6cmVwb3J0 X3BhcnRfZXhwcl9lcnJvcihib29sIHVzZV9zdWJwYXJ0X2V4cHIpCit7CisgIEl0ZW0gKmV4cHI9 IHBhcnRfZXhwcjsKKyAgREJVR19FTlRFUigicGFydGl0aW9uX2luZm86OnJlcG9ydF9wYXJ0X2V4 cHJfZXJyb3IiKTsKKyAgaWYgKHVzZV9zdWJwYXJ0X2V4cHIpCisgICAgZXhwcj0gc3VicGFydF9l eHByOworCisgIGlmIChleHByLT50eXBlKCkgPT0gSXRlbTo6RklFTERfSVRFTSkKKyAgeworICAg IHBhcnRpdGlvbl90eXBlIHR5cGU9IHBhcnRfdHlwZTsKKyAgICBib29sIGxpc3Rfb2ZfZmllbGRz PSBsaXN0X29mX3BhcnRfZmllbGRzOworICAgIEl0ZW1fZmllbGQgKml0ZW1fZmllbGQ9IChJdGVt X2ZpZWxkKikgZXhwcjsKKyAgICAvKgorICAgICAgVGhlIGV4cHJlc3Npb24gY29uc2lzdHMgb2Yg YSBzaW5nbGUgZmllbGQuCisgICAgICBJdCBtdXN0IGJlIG9mIGludGVnZXIgdHlwZSB1bmxlc3Mg S0VZIG9yIENPTFVNTlMgcGFydGl0aW9uaW5nLgorICAgICovCisgICAgaWYgKHVzZV9zdWJwYXJ0 X2V4cHIpCisgICAgeworICAgICAgdHlwZT0gc3VicGFydF90eXBlOworICAgICAgbGlzdF9vZl9m aWVsZHM9IGxpc3Rfb2Zfc3VicGFydF9maWVsZHM7CisgICAgfQorICAgIGlmICghY29sdW1uX2xp c3QgJiYKKyAgICAgICAgaXRlbV9maWVsZC0+ZmllbGQgJiYKKyAgICAgICAgaXRlbV9maWVsZC0+ ZmllbGQtPnJlc3VsdF90eXBlKCkgIT0gSU5UX1JFU1VMVCAmJgorICAgICAgICAhKHR5cGUgPT0g SEFTSF9QQVJUSVRJT04gJiYgbGlzdF9vZl9maWVsZHMpKQorICAgIHsKKyAgICAgIG15X2Vycm9y KEVSX0ZJRUxEX1RZUEVfTk9UX0FMTE9XRURfQVNfUEFSVElUSU9OX0ZJRUxELCBNWUYoMCksCisg ICAgICAgICAgICAgICBpdGVtX2ZpZWxkLT5uYW1lKTsKKyAgICAgIERCVUdfVk9JRF9SRVRVUk47 CisgICAgfQorICB9CisgIGlmICh1c2Vfc3VicGFydF9leHByKQorICAgIG15X2Vycm9yKEVSX1BB UlRJVElPTl9GVU5DX05PVF9BTExPV0VEX0VSUk9SLCBNWUYoMCksICJTVUJQQVJUSVRJT04iKTsK KyAgZWxzZQorICAgIG15X2Vycm9yKEVSX1BBUlRJVElPTl9GVU5DX05PVF9BTExPV0VEX0VSUk9S LCBNWUYoMCksICJQQVJUSVRJT04iKTsKKyAgREJVR19WT0lEX1JFVFVSTjsKK30KKyAKKwogLyoK ICAgQ3JlYXRlIGEgbmV3IGNvbHVtbiB2YWx1ZSBpbiBjdXJyZW50IGxpc3Qgd2l0aCBtYXh2YWx1 ZQogICBDYWxsZWQgZnJvbSBwYXJzZXIKQEAgLTE4OTEsNyArMTkzNSw3IEBAIGludCBwYXJ0aXRp b25faW5mbzo6cmVvcmdhbml6ZV9pbnRvX3NpbmcKICAgY29kZS4KIAogICBTWU5PUFNJUwotICBm aXhfZnVuY19wYXJ0aXRpb24oKQorICBmaXhfcGFydGl0aW9uX3ZhbHVlcygpCiAgIHRoZCAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgVGhyZWFkIG9iamVjdAogICBjb2xfdmFsICAgICAgICAg ICAgICAgICAgICAgICAgIEFycmF5IG9mIG9uZSB2YWx1ZQogICBwYXJ0X2VsZW0gICAgICAgICAg ICAgICAgICAgICAgIFRoZSBwYXJ0aXRpb24gaW5zdGFuY2UKQEAgLTE5MDEsMTMgKzE5NDUsMTMg QEAgaW50IHBhcnRpdGlvbl9pbmZvOjpyZW9yZ2FuaXplX2ludG9fc2luZwogICAgIFRSVUUgICAg ICAgICAgICAgICAgICAgICBGYWlsdXJlCiAgICAgRkFMU0UgICAgICAgICAgICAgICAgICAgIFN1 Y2Nlc3MKICovCi1pbnQgcGFydGl0aW9uX2luZm86OmZpeF9mdW5jX3BhcnRpdGlvbihUSEQgKnRo ZCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcnRfZWxlbV92YWx1 ZSAqdmFsLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFydGl0aW9u X2VsZW1lbnQgKnBhcnRfZWxlbSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHVpbnQgcGFydF9pZCkKK2ludCBwYXJ0aXRpb25faW5mbzo6Zml4X3BhcnRpdGlvbl92YWx1 ZXMoVEhEICp0aGQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBh cnRfZWxlbV92YWx1ZSAqdmFsLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBwYXJ0aXRpb25fZWxlbWVudCAqcGFydF9lbGVtLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB1aW50IHBhcnRfaWQpCiB7CiAgIHBhcnRfY29sdW1uX2xpc3Rf dmFsICpjb2xfdmFsPSB2YWwtPmNvbF92YWxfYXJyYXk7Ci0gIERCVUdfRU5URVIoInBhcnRpdGlv bl9pbmZvOjpmaXhfZnVuY19wYXJ0aXRpb24iKTsKKyAgREJVR19FTlRFUigicGFydGl0aW9uX2lu Zm86OmZpeF9wYXJ0aXRpb25fdmFsdWVzIik7CiAKICAgaWYgKGNvbF92YWwtPmZpeGVkKQogICB7 CkBAIC0xOTUzLDcgKzE5OTcsOSBAQCBpbnQgcGFydGl0aW9uX2luZm86OmZpeF9mdW5jX3BhcnRp dGlvbihUCiAgICAgfQogICAgIGVsc2UgaWYgKGl0ZW1fZXhwci0+cmVzdWx0X3R5cGUoKSAhPSBJ TlRfUkVTVUxUKQogICAgIHsKLSAgICAgIG15X2Vycm9yKEVSX0lOQ09OU0lTVEVOVF9UWVBFX09G X0ZVTkNUSU9OU19FUlJPUiwgTVlGKDApKTsKKyAgICAgIC8qIFZBTFVFUyBjbGF1c2Ugb25seSBh bGxvd2VkIG9uIHBhcnRpdGlvbnMsIG5vdCBzdWJwYXJ0aXRpb25zICovCisgICAgICBteV9lcnJv cihFUl9WQUxVRVNfSVNfTk9UX0lOVF9UWVBFX0VSUk9SLCBNWUYoMCksCisgICAgICAgICAgICAg ICBwYXJ0X2VsZW0tPnBhcnRpdGlvbl9uYW1lKTsKICAgICAgIERCVUdfUkVUVVJOKFRSVUUpOwog ICAgIH0KICAgICBpZiAocGFydF90eXBlID09IFJBTkdFX1BBUlRJVElPTikKQEAgLTIxNjgsNyAr MjIxNCw3IEBAIGludCBwYXJ0aXRpb25faW5mbzo6Zml4X3BhcnNlcl9kYXRhKFRIRCAKICAgICAg IH0KICAgICAgIGVsc2UKICAgICAgIHsKLSAgICAgICAgaWYgKGZpeF9mdW5jX3BhcnRpdGlvbih0 aGQsIHZhbCwgcGFydF9lbGVtLCBpKSkKKyAgICAgICAgaWYgKGZpeF9wYXJ0aXRpb25fdmFsdWVz KHRoZCwgdmFsLCBwYXJ0X2VsZW0sIGkpKQogICAgICAgICB7CiAgICAgICAgICAgREJVR19SRVRV Uk4oVFJVRSk7CiAgICAgICAgIH0KCj09PSBtb2RpZmllZCBmaWxlICdzcWwvcGFydGl0aW9uX2lu Zm8uaCcKLS0tIGEvc3FsL3BhcnRpdGlvbl9pbmZvLmgJMjAxMC0wMy0zMCAyMDo1Mjo0NSArMDAw MAorKysgYi9zcWwvcGFydGl0aW9uX2luZm8uaAkyMDEwLTA4LTMwIDE1OjMzOjU1ICswMDAwCkBA IC0xNjYsNyArMTY2LDYgQEAgcHVibGljOgogICBrZXlfbWFwIHNvbWVfZmllbGRzX2luX1BGOwog CiAgIGhhbmRsZXJ0b24gKmRlZmF1bHRfZW5naW5lX3R5cGU7Ci0gIEl0ZW1fcmVzdWx0IHBhcnRf cmVzdWx0X3R5cGU7CiAgIHBhcnRpdGlvbl90eXBlIHBhcnRfdHlwZTsKICAgcGFydGl0aW9uX3R5 cGUgc3VicGFydF90eXBlOwogCkBAIC0yMjYsNyArMjI1LDYgQEAgcHVibGljOgogICAgIGN1cnJf cGFydF9lbGVtKE5VTEwpLCBjdXJyZW50X3BhcnRpdGlvbihOVUxMKSwKICAgICBjdXJyX2xpc3Rf b2JqZWN0KDApLCBudW1fY29sdW1ucygwKSwKICAgICBkZWZhdWx0X2VuZ2luZV90eXBlKE5VTEwp LAotICAgIHBhcnRfcmVzdWx0X3R5cGUoSU5UX1JFU1VMVCksCiAgICAgcGFydF90eXBlKE5PVF9B X1BBUlRJVElPTiksIHN1YnBhcnRfdHlwZShOT1RfQV9QQVJUSVRJT04pLAogICAgIHBhcnRfaW5m b19sZW4oMCksCiAgICAgcGFydF9mdW5jX2xlbigwKSwgc3VicGFydF9mdW5jX2xlbigwKSwKQEAg LTI3OSwxMCArMjc3LDEwIEBAIHB1YmxpYzoKICAgdm9pZCBwcmludF9ub19wYXJ0aXRpb25fZm91 bmQoVEFCTEUgKnRhYmxlKTsKICAgdm9pZCBwcmludF9kZWJ1Zyhjb25zdCBjaGFyICpzdHIsIHVp bnQqKTsKICAgSXRlbSogZ2V0X2NvbHVtbl9pdGVtKEl0ZW0gKml0ZW0sIEZpZWxkICpmaWVsZCk7 Ci0gIGludCBmaXhfZnVuY19wYXJ0aXRpb24oVEhEICp0aGQsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgcGFydF9lbGVtX3ZhbHVlICp2YWwsCi0gICAgICAgICAgICAgICAgICAgICAgICAgcGFy dGl0aW9uX2VsZW1lbnQgKnBhcnRfZWxlbSwKLSAgICAgICAgICAgICAgICAgICAgICAgICB1aW50 IHBhcnRfaWQpOworICBpbnQgZml4X3BhcnRpdGlvbl92YWx1ZXMoVEhEICp0aGQsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICBwYXJ0X2VsZW1fdmFsdWUgKnZhbCwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgIHBhcnRpdGlvbl9lbGVtZW50ICpwYXJ0X2VsZW0sCisgICAgICAgICAgICAg ICAgICAgICAgICAgICB1aW50IHBhcnRfaWQpOwogICBib29sIGZpeF9jb2x1bW5fdmFsdWVfZnVu Y3Rpb25zKFRIRCAqdGhkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcnRf ZWxlbV92YWx1ZSAqdmFsLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQg cGFydF9pZCk7CkBAIC0yOTksNiArMjk3LDcgQEAgcHVibGljOgogICBib29sIGluaXRfY29sdW1u X3BhcnQoKTsKICAgYm9vbCBhZGRfY29sdW1uX2xpc3RfdmFsdWUoVEhEICp0aGQsIEl0ZW0gKml0 ZW0pOwogICB2b2lkIHNldF9zaG93X3ZlcnNpb25fc3RyaW5nKFN0cmluZyAqcGFja2V0KTsKKyAg dm9pZCByZXBvcnRfcGFydF9leHByX2Vycm9yKGJvb2wgdXNlX3N1YnBhcnRfZXhwcik7CiBwcml2 YXRlOgogICBzdGF0aWMgaW50IGxpc3RfcGFydF9jbXAoY29uc3Qgdm9pZCogYSwgY29uc3Qgdm9p ZCogYik7CiAgIGJvb2wgc2V0X3VwX2RlZmF1bHRfcGFydGl0aW9ucyhoYW5kbGVyICpmaWxlLCBI QV9DUkVBVEVfSU5GTyAqaW5mbywKCj09PSBtb2RpZmllZCBmaWxlICdzcWwvc2hhcmUvZXJybXNn LXV0ZjgudHh0JwotLS0gYS9zcWwvc2hhcmUvZXJybXNnLXV0ZjgudHh0CTIwMTAtMDYtMDcgMDg6 NDc6MDQgKzAwMDAKKysrIGIvc3FsL3NoYXJlL2Vycm1zZy11dGY4LnR4dAkyMDEwLTA4LTMwIDE1 OjMzOjU1ICswMDAwCkBAIC02MzQ2LDMgKzYzNDYsNyBAQCBFUl9TVE9SRURfRlVOQ1RJT05fUFJF VkVOVFNfU1dJVENIX1NRTF9MCiBFUl9GQUlMRURfUkVBRF9GUk9NX1BBUl9GSUxFCiAgIGVuZyAi RmFpbGVkIHRvIHJlYWQgZnJvbSB0aGUgLnBhciBmaWxlIgogICBzd2UgIk1pc3NseWNrYWRlcyBs w6RzYSBmcsOlbiAucGFyIGZpbGVuIgorCitFUl9WQUxVRVNfSVNfTk9UX0lOVF9UWVBFX0VSUk9S CisgIGVuZyAiVkFMVUVTIHZhbHVlIGZvciBwYXJ0aXRpb24gJyUtLjY0cycgbXVzdCBoYXZlIHR5 cGUgSU5UIgorICBzd2UgIlbDpHJkZW4gaSBWQUxVRVMgZsO2ciBwYXJ0aXRpb24gJyUtLjY0cycg bcOlc3RlIGhhIHR5cGVuIElOVCIKCj09PSBtb2RpZmllZCBmaWxlICdzcWwvc3FsX3BhcnRpdGlv bi5jYycKLS0tIGEvc3FsL3NxbF9wYXJ0aXRpb24uY2MJMjAxMC0wOC0yMCAxNzoxNTo0OCArMDAw MAorKysgYi9zcWwvc3FsX3BhcnRpdGlvbi5jYwkyMDEwLTA4LTMwIDE1OjMzOjU1ICswMDAwCkBA IC0xNzYyLDggKzE3NjIsNyBAQCBib29sIGZpeF9wYXJ0aXRpb25fZnVuYyhUSEQgKnRoZCwgVEFC TEUgCiAgICAgICAgIGdvdG8gZW5kOwogICAgICAgaWYgKHVubGlrZWx5KHBhcnRfaW5mby0+c3Vi cGFydF9leHByLT5yZXN1bHRfdHlwZSgpICE9IElOVF9SRVNVTFQpKQogICAgICAgewotICAgICAg ICBteV9lcnJvcihFUl9QQVJUSVRJT05fRlVOQ1RJT05fSVNfTk9UX0FMTE9XRUQsIE1ZRigwKSwK LSAgICAgICAgICAgICAgICAgc3VicGFydF9zdHIpOworICAgICAgICBwYXJ0X2luZm8tPnJlcG9y dF9wYXJ0X2V4cHJfZXJyb3IoVFJVRSk7CiAgICAgICAgIGdvdG8gZW5kOwogICAgICAgfQogICAg IH0KQEAgLTE3OTAsMTAgKzE3ODksOSBAQCBib29sIGZpeF9wYXJ0aXRpb25fZnVuYyhUSEQgKnRo ZCwgVEFCTEUgCiAgICAgICAgIGdvdG8gZW5kOwogICAgICAgaWYgKHVubGlrZWx5KHBhcnRfaW5m by0+cGFydF9leHByLT5yZXN1bHRfdHlwZSgpICE9IElOVF9SRVNVTFQpKQogICAgICAgewotICAg ICAgICBteV9lcnJvcihFUl9QQVJUSVRJT05fRlVOQ1RJT05fSVNfTk9UX0FMTE9XRUQsIE1ZRigw KSwgcGFydF9zdHIpOworICAgICAgICBwYXJ0X2luZm8tPnJlcG9ydF9wYXJ0X2V4cHJfZXJyb3Io RkFMU0UpOwogICAgICAgICBnb3RvIGVuZDsKICAgICAgIH0KLSAgICAgIHBhcnRfaW5mby0+cGFy dF9yZXN1bHRfdHlwZT0gSU5UX1JFU1VMVDsKICAgICB9CiAgICAgcGFydF9pbmZvLT5maXhlZD0g VFJVRTsKICAgfQpAQCAtMTgzOSwxOCArMTgzNywyMiBAQCBib29sIGZpeF9wYXJ0aXRpb25fZnVu YyhUSEQgKnRoZCwgVEFCTEUgCiAgICAgaWYgKHVubGlrZWx5KCFwYXJ0X2luZm8tPmNvbHVtbl9s aXN0ICYmCiAgICAgICAgICAgICAgICAgICBwYXJ0X2luZm8tPnBhcnRfZXhwci0+cmVzdWx0X3R5 cGUoKSAhPSBJTlRfUkVTVUxUKSkKICAgICB7Ci0gICAgICBteV9lcnJvcihFUl9QQVJUSVRJT05f RlVOQ19OT1RfQUxMT1dFRF9FUlJPUiwgTVlGKDApLCBwYXJ0X3N0cik7CisgICAgICBwYXJ0X2lu Zm8tPnJlcG9ydF9wYXJ0X2V4cHJfZXJyb3IoRkFMU0UpOwogICAgICAgZ290byBlbmQ7CiAgICAg fQogICB9CiAgIGlmICgoKHBhcnRfaW5mby0+cGFydF90eXBlICE9IEhBU0hfUEFSVElUSU9OIHx8 Ci0gICAgICBwYXJ0X2luZm8tPmxpc3Rfb2ZfcGFydF9maWVsZHMgPT0gRkFMU0UpICYmCi0gICAg ICAoIXBhcnRfaW5mby0+Y29sdW1uX2xpc3QgJiYKLSAgICAgIGNoZWNrX3BhcnRfZnVuY19maWVs ZHMocGFydF9pbmZvLT5wYXJ0X2ZpZWxkX2FycmF5LCBUUlVFKSkpIHx8CisgICAgICAgIHBhcnRf aW5mby0+bGlzdF9vZl9wYXJ0X2ZpZWxkcyA9PSBGQUxTRSkgJiYKKyAgICAgICAhcGFydF9pbmZv LT5jb2x1bW5fbGlzdCAmJgorICAgICAgIGNoZWNrX3BhcnRfZnVuY19maWVsZHMocGFydF9pbmZv LT5wYXJ0X2ZpZWxkX2FycmF5LCBUUlVFKSkgfHwKICAgICAgIChwYXJ0X2luZm8tPmxpc3Rfb2Zf c3VicGFydF9maWVsZHMgPT0gRkFMU0UgJiYKICAgICAgICBwYXJ0X2luZm8tPmlzX3N1Yl9wYXJ0 aXRpb25lZCgpICYmCiAgICAgICAgY2hlY2tfcGFydF9mdW5jX2ZpZWxkcyhwYXJ0X2luZm8tPnN1 YnBhcnRfZmllbGRfYXJyYXksIFRSVUUpKSkKICAgeworICAgIC8qCisgICAgICBSYW5nZS9MaXN0 L0hBU0ggKGJ1dCBub3QgS0VZKSBhbmQgbm90IENPTFVNTlMgb3IgSEFTSCBzdWJwYXJ0aXRpb25p bmcKKyAgICAgIHdpdGggY29sdW1ucyBpbiB0aGUgcGFydGl0aW9uaW5nIGV4cHJlc3Npb24gdXNp bmcgdW5hbGxvd2VkIGNoYXJzZXQuCisgICAgKi8KICAgICBteV9lcnJvcihFUl9QQVJUSVRJT05f RlVOQ1RJT05fSVNfTk9UX0FMTE9XRUQsIE1ZRigwKSk7CiAgICAgZ290byBlbmQ7CiAgIH0KCj09 PSBtb2RpZmllZCBmaWxlICdzcWwvc3FsX3lhY2MueXknCi0tLSBhL3NxbC9zcWxfeWFjYy55eQky MDEwLTA4LTE4IDExOjU1OjM3ICswMDAwCisrKyBiL3NxbC9zcWxfeWFjYy55eQkyMDEwLTA4LTMw IDE1OjMzOjU1ICswMDAwCkBAIC00ODEzLDcgKzQ4MTMsNyBAQCBwYXJ0X3ZhbHVlX2V4cHJfaXRl bToKIAogICAgICAgICAgICAgaWYgKCFsZXgtPnNhZmVfdG9fY2FjaGVfcXVlcnkpCiAgICAgICAg ICAgICB7Ci0gICAgICAgICAgICAgIG15X2Vycm9yKEVSX1BBUlRJVElPTl9GVU5DVElPTl9JU19O T1RfQUxMT1dFRCwgTVlGKDApKTsKKyAgICAgICAgICAgICAgbXlfcGFyc2VfZXJyb3IoRVIoRVJf V1JPTkdfRVhQUl9JTl9QQVJUSVRJT05fRlVOQ19FUlJPUikpOwogICAgICAgICAgICAgICBNWVNR TF9ZWUFCT1JUOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKHBhcnRfaW5mby0+YWRk X2NvbHVtbl9saXN0X3ZhbHVlKFlZVEhELCBwYXJ0X2V4cHIpKQoK --===============1431125444480771753== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/mattias.jonsson@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mattias.jonsson@stripped\ # 9r3def4u5ht5xw5k # target_branch: file:///Users/mattiasj/mysql-bzr/b50036-55-bf/ # testament_sha1: 1051390839e8580535cad9735fb04a451b965789 # timestamp: 2010-08-30 17:34:10 +0200 # base_revision_id: bar@stripped # # Begin bundle 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 --===============1431125444480771753==--