From: marko.makela
Date: June 28 2011 12:41pm
Subject: bzr push into mysql-5.5 branch (marko.makela:3470 to 3471) Bug#12699505
List-Archive: http://lists.mysql.com/commits/139960
X-Bug: 12699505
Message-Id: <201106281241.p5SCfIel025182@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM0NzEgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0yOAogICAgICBCdWcjMTI2OTk1MDUgTWVtb3J5
IGxlYWsgaW4gcm93X2NyZWF0ZV9pbmRleF9mb3JfbXlzcWwoKQogICAgICAKICAgICAgREJfQ09M
X0FQUEVBUlNfVFdJQ0VfSU5fSU5ERVg6IFJlbW92ZS4gVGhpcyBjb25kaXRpb24gaXMgYWxyZWFk
eQogICAgICBjaGVja2VkIGFuZCByZXBvcnRlZCBieSBNeVNRTCBiZWZvcmUgcGFzc2luZyB0aGUg
aW5kZXggZGVmaW5pdGlvbiB0bwogICAgICB0aGUgc3RvcmFnZSBlbmdpbmUuCiAgICAgIAogICAg
ICByb3dfY3JlYXRlX2luZGV4X2Zvcl9teXNxbCgpOiBSZW1vdmUgdGhlIHJlZHVuZGFudCBjaGVj
ayBmb3IKICAgICAgREJfQ09MX0FQUEVBUlNfVFdJQ0VfSU5fSU5ERVguIFdoZW4gZW5mb3JjaW5n
IHRoZSBjb2x1bW4gcHJlZml4IGluZGV4CiAgICAgIGxpbWl0LCBpbnZva2UgZGljdF9tZW1faW5k
ZXhfZnJlZShpbmRleCkgdG8gcGx1ZyB0aGUgbWVtb3J5IGxlYWsuIEluCiAgICAgIHRoZSBsb29w
LCB1c2UgaW5kZXgtPm5fZGVmIGluc3RlYWQgb2YgZGljdF9pbmRleF9nZXRfbl9maWVsZHMoaW5k
ZXgpLAogICAgICBiZWNhdXNlIHRoZSBsYXR0ZXIgd291bGQgYmUgMCBmb3IgaW5kZXhlcyB0aGF0
IGhhdmUgbm90IGJlZW4gY29waWVkIHRvCiAgICAgIHRoZSBkYXRhIGRpY3Rpb25hcnkgY2FjaGUu
CiAgICAgIAogICAgICBpbm5vZGItdXNlLXN5cy1tYWxsb2MudGVzdDoKICAgICAgCiAgICAgIEFk
ZCB0ZXN0IGNhc2VzIGZvciBhdHRlbXB0aW5nIHRvIHRyaWdnZXIgdGhlIGVycm9yIGNoZWNrcyBp
bgogICAgICByb3dfY3JlYXRlX2luZGV4X2Zvcl9teXNxbCgpLiBCZWZvcmUgTXlTUUwgNS41IGFu
ZCBXTCM1NzQzLCB0aGUgbGVhawogICAgICBpcyBvbmx5IHJlcHJvZHVjaWJsZSBpZiBoYV9pbm5v
YmFzZTo6bWF4X3N1cHBvcnRlZF9rZXlfcGFydF9sZW5ndGgoKQogICAgICByZXR1cm5lZCBhIGhp
Z2hlciBsaW1pdCB0aGFuIHRoZSBvbmUgdXNlZCBpbgogICAgICByb3dfY3JlYXRlX2luZGV4X2Zv
cl9teXNxbCgpLgogICAgICAKICAgICAgSW4gTXlTUUwgNS41IGFuZCBsYXRlciwgdGhlIGxlYWsg
aXMgcmVwcm9kdWNpYmxlIHdpdGgKICAgICAgaW5ub2RiX2xhcmdlX3ByZWZpeD10cnVlLgogICAg
ICAKICAgICAgcmI6Njg4IGFwcHJvdmVkIGJ5IEppbW15IFlhbmcKCiAgICBtb2RpZmllZDoKICAg
ICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItdXNlLXN5cy1tYWxsb2MucmVzdWx0
CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLXVzZS1zeXMtbWFsbG9jLW1h
c3Rlci5vcHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItdXNlLXN5cy1t
YWxsb2MudGVzdAogICAgICBzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjCiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kYjBlcnIuaAogICAgICBzdG9yYWdlL2lubm9i
YXNlL3Jvdy9yb3cwbXlzcWwuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3V0L3V0MHV0LmMKIDM0
NzAgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0yOCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3FsLTUu
MSB0byBteXNxbC01LjUuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvcGFn
ZS9wYWdlMHppcC5jCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9y
L2lubm9kYi11c2Utc3lzLW1hbGxvYy5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiL3IvaW5ub2RiLXVzZS1zeXMtbWFsbG9jLnJlc3VsdAlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDExMDYyODA5MDM1NS1rNTNzN3dsZGtqNTBmMmh5CisrKyBiL215c3FsLXRlc3Qv
c3VpdGUvaW5ub2RiL3IvaW5ub2RiLXVzZS1zeXMtbWFsbG9jLnJlc3VsdAlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDExMDYyODEyMjgyMS1jNmp4b3l6Njg2eDcyY3V2CkBAIC05LDQw
ICs5LDQ1IEBAIFNFTEVDVCBAQEdMT0JBTC5pbm5vZGJfdXNlX3N5c19tYWxsb2M7CiBAQEdMT0JB
TC5pbm5vZGJfdXNlX3N5c19tYWxsb2MKIDEKIDEgRXhwZWN0ZWQKLWRyb3AgdGFibGUgaWYgZXhp
c3RzIHQxOwotY3JlYXRlIHRhYmxlIHQxKGEgaW50IG5vdCBudWxsKSBlbmdpbmU9aW5ub2RiIERF
RkFVTFQgQ0hBUlNFVD1sYXRpbjE7Ci1pbnNlcnQgaW50byB0MSB2YWx1ZXMgKDEpLCgyKSwoMyks
KDQpLCg1KSwoNiksKDcpOworY3JlYXRlIHRhYmxlIHQxKGEgaW50IG5vdCBudWxsLGtleShhLGEp
KSBlbmdpbmU9aW5ub2RiIERFRkFVTFQgQ0hBUlNFVD1sYXRpbjE7CitFUlJPUiA0MlMyMTogRHVw
bGljYXRlIGNvbHVtbiBuYW1lICdhJworY3JlYXRlIHRhYmxlIHQxKGEgaW50LGIgdGV4dCxrZXko
Yig3NjgpKSkgZW5naW5lPWlubm9kYiBERUZBVUxUIENIQVJTRVQ9bGF0aW4xOworRVJST1IgSFkw
MDA6IEluZGV4IGNvbHVtbiBzaXplIHRvbyBsYXJnZS4gVGhlIG1heGltdW0gY29sdW1uIHNpemUg
aXMgNzY3IGJ5dGVzLgorY3JlYXRlIHRhYmxlIHQxKGEgaW50IG5vdCBudWxsLGIgdGV4dCkgZW5n
aW5lPWlubm9kYiBERUZBVUxUIENIQVJTRVQ9bGF0aW4xOworaW5zZXJ0IGludG8gdDEgdmFsdWVz
ICgxLCcnKSwoMiwnJyksKDMsJycpLCg0LCcnKSwoNSwnJyksKDYsJycpLCg3LCcnKTsKK2NyZWF0
ZSBpbmRleCB0MWFhIG9uIHQxKGEsYSk7CitFUlJPUiA0MlMyMTogRHVwbGljYXRlIGNvbHVtbiBu
YW1lICdhJworY3JlYXRlIGluZGV4IHQxYiBvbiB0MShiKDc2OCkpOworRVJST1IgSFkwMDA6IElu
ZGV4IGNvbHVtbiBzaXplIHRvbyBsYXJnZS4gVGhlIG1heGltdW0gY29sdW1uIHNpemUgaXMgNzY3
IGJ5dGVzLgorU0hPVyBDUkVBVEUgVEFCTEUgdDE7CitUYWJsZQlDcmVhdGUgVGFibGUKK3QxCUNS
RUFURSBUQUJMRSBgdDFgICgKKyAgYGFgIGludCgxMSkgTk9UIE5VTEwsCisgIGBiYCB0ZXh0Cisp
IEVOR0lORT1Jbm5vREIgREVGQVVMVCBDSEFSU0VUPWxhdGluMQogc2VsZWN0ICogZnJvbSB0MTsK
LWEKLTEKLTIKLTMKLTQKLTUKLTYKLTcKLWRyb3AgdGFibGUgdDE7Ci1TRUxFQ1QgQEBHTE9CQUwu
aW5ub2RiX3VzZV9zeXNfbWFsbG9jOwotQEBHTE9CQUwuaW5ub2RiX3VzZV9zeXNfbWFsbG9jCi0x
Ci0xIEV4cGVjdGVkCi1TRVQgQEBHTE9CQUwuaW5ub2RiX3VzZV9zeXNfbWFsbG9jPTA7Ci1FUlJP
UiBIWTAwMDogVmFyaWFibGUgJ2lubm9kYl91c2Vfc3lzX21hbGxvYycgaXMgYSByZWFkIG9ubHkg
dmFyaWFibGUKLUV4cGVjdGVkIGVycm9yICdSZWFkIG9ubHkgdmFyaWFibGUnCi1TRUxFQ1QgQEBH
TE9CQUwuaW5ub2RiX3VzZV9zeXNfbWFsbG9jOwotQEBHTE9CQUwuaW5ub2RiX3VzZV9zeXNfbWFs
bG9jCi0xCi0xIEV4cGVjdGVkCi1kcm9wIHRhYmxlIGlmIGV4aXN0cyB0MTsKLWNyZWF0ZSB0YWJs
ZSB0MShhIGludCBub3QgbnVsbCkgZW5naW5lPWlubm9kYiBERUZBVUxUIENIQVJTRVQ9bGF0aW4x
OwotaW5zZXJ0IGludG8gdDEgdmFsdWVzICgxKSwoMiksKDMpLCg0KSwoNSksKDYpLCg3KTsKLXNl
bGVjdCAqIGZyb20gdDE7Ci1hCi0xCi0yCi0zCi00Ci01Ci02Ci03CithCWIKKzEJCisyCQorMwkK
KzQJCis1CQorNgkKKzcJCiBkcm9wIHRhYmxlIHQxOworQ1JFQVRFIFRBQkxFIHQyKGEgaW50IHBy
aW1hcnkga2V5LCBiIHRleHQpIEVOR0lORT1Jbm5vREIgREVGQVVMVCBDSEFSU0VUPWxhdGluMTsK
K0lOU0VSVCBJTlRPIHQyIFZBTFVFUyAoMSwnJyksKDIsJycpLCgzLCcnKSwoNCwnJyksKDUsJycp
LCg2LCcnKSwoNywnJyk7CitDUkVBVEUgSU5ERVggdDJhYSBvbiB0MihhLGEpOworRVJST1IgNDJT
MjE6IER1cGxpY2F0ZSBjb2x1bW4gbmFtZSAnYScKK0NSRUFURSBJTkRFWCB0MmIgb24gdDIoYig3
NjgpKTsKK0VSUk9SIEhZMDAwOiBJbmRleCBjb2x1bW4gc2l6ZSB0b28gbGFyZ2UuIFRoZSBtYXhp
bXVtIGNvbHVtbiBzaXplIGlzIDc2NyBieXRlcy4KK1NFTEVDVCAqIEZST00gdDI7CithCWIKKzEJ
CisyCQorMwkKKzQJCis1CQorNgkKKzcJCitEUk9QIFRBQkxFIHQyOwoKPT09IG1vZGlmaWVkIGZp
bGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLXVzZS1zeXMtbWFsbG9jLW1hc3Rl
ci5vcHQnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLXVzZS1zeXMtbWFs
bG9jLW1hc3Rlci5vcHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MjgwOTAz
NTUtazUzczd3bGRrajUwZjJoeQorKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9k
Yi11c2Utc3lzLW1hbGxvYy1tYXN0ZXIub3B0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTEwNjI4MTIyODIxLWM2anhveXo2ODZ4NzJjdXYKQEAgLTEsMyArMSwyIEBACi0tLWRlZmF1
bHQtc3RvcmFnZS1lbmdpbmU9TXlJU0FNCi0tLWxvb3NlLWlubm9kYi11c2Utc3lzLW1hbGxvYz10
cnVlCi0tLWxvb3NlLWlubm9kYi11c2Utc3lzLW1hbGxvYz10cnVlCistLWlubm9kYi11c2Utc3lz
LW1hbGxvYz10cnVlCistLWlubm9kYi1sYXJnZS1wcmVmaXg9dHJ1ZQoKPT09IG1vZGlmaWVkIGZp
bGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLXVzZS1zeXMtbWFsbG9jLnRlc3Qn
Ci0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLXVzZS1zeXMtbWFsbG9jLnRl
c3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MjgwOTAzNTUtazUzczd3bGRr
ajUwZjJoeQorKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi11c2Utc3lzLW1h
bGxvYy50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjI4MTIyODIxLWM2
anhveXo2ODZ4NzJjdXYKQEAgLTEsNCArMSw0IEBACi0tLXNvdXJjZSBpbmNsdWRlL2hhdmVfaW5u
b2RiLmluYworLS0gc291cmNlIGluY2x1ZGUvaGF2ZV9pbm5vZGIuaW5jCiAKICNkaXNwbGF5IGN1
cnJlbnQgdmFsdWUgb2YgaW5ub2RiX3VzZV9zeXNfbWFsbG9jCiBTRUxFQ1QgQEBHTE9CQUwuaW5u
b2RiX3VzZV9zeXNfbWFsbG9jOwpAQCAtMTMsMzYgKzEzLDMzIEBAIFNFTEVDVCBAQEdMT0JBTC5p
bm5vZGJfdXNlX3N5c19tYWxsb2M7CiAtLWVjaG8gMSBFeHBlY3RlZAogCiAKLSNkbyBzb21lIHN0
dWZmIHRvIHNlZSBpZiBpdCB3b3Jrcy4KLS0tZGlzYWJsZV93YXJuaW5ncwotZHJvcCB0YWJsZSBp
ZiBleGlzdHMgdDE7Ci0tLWVuYWJsZV93YXJuaW5ncwotCi1jcmVhdGUgdGFibGUgdDEoYSBpbnQg
bm90IG51bGwpIGVuZ2luZT1pbm5vZGIgREVGQVVMVCBDSEFSU0VUPWxhdGluMTsKLWluc2VydCBp
bnRvIHQxIHZhbHVlcyAoMSksKDIpLCgzKSwoNCksKDUpLCg2KSwoNyk7CisjIERvIHNvbWUgc3R1
ZmYgdG8gc2VlIGlmIGl0IHdvcmtzLgorIyBBbHNvLCB0ZXN0IHRoZSBjb2RlIHBhdGhzIG9mCisj
IEJ1ZyAjMTI2OTk1MDUgTUVNT1JZIExFQUsgSU4gUk9XX0NSRUFURV9JTkRFWF9GT1JfTVlTUUwo
KQorIyAodGhlIGxlYWsgd291bGQgb25seSBiZSB0cmlnZ2VyZWQgaWYKKyMgaGFfaW5ub2Jhc2U6
Om1heF9zdXBwb3J0ZWRfa2V5X3BhcnRfbGVuZ3RoKCkgd2VyZSBzZXQKKyMgaGlnaGVyIHRoYW4g
dGhlIGxpbWl0IHVzZWQgaW4gcm93X2NyZWF0ZV9pbmRleF9mb3JfbXlzcWwoKSkKKworLS1lcnJv
ciBFUl9EVVBfRklFTEROQU1FCitjcmVhdGUgdGFibGUgdDEoYSBpbnQgbm90IG51bGwsa2V5KGEs
YSkpIGVuZ2luZT1pbm5vZGIgREVGQVVMVCBDSEFSU0VUPWxhdGluMTsKKyMgdGhhbmtzIHRvIC0t
aW5ub2RiLWxhcmdlLXByZWZpeD0xIHRoaXMgd2lsbCBub3QgYmUgdHJ1bmNhdGVkIHRvIGIoNzY3
KQorLS0gZXJyb3IgRVJfSU5ERVhfQ09MVU1OX1RPT19MT05HCitjcmVhdGUgdGFibGUgdDEoYSBp
bnQsYiB0ZXh0LGtleShiKDc2OCkpKSBlbmdpbmU9aW5ub2RiIERFRkFVTFQgQ0hBUlNFVD1sYXRp
bjE7CitjcmVhdGUgdGFibGUgdDEoYSBpbnQgbm90IG51bGwsYiB0ZXh0KSBlbmdpbmU9aW5ub2Ri
IERFRkFVTFQgQ0hBUlNFVD1sYXRpbjE7CitpbnNlcnQgaW50byB0MSB2YWx1ZXMgKDEsJycpLCgy
LCcnKSwoMywnJyksKDQsJycpLCg1LCcnKSwoNiwnJyksKDcsJycpOworLS1lcnJvciBFUl9EVVBf
RklFTEROQU1FCitjcmVhdGUgaW5kZXggdDFhYSBvbiB0MShhLGEpOworLS0gZXJyb3IgRVJfSU5E
RVhfQ09MVU1OX1RPT19MT05HCitjcmVhdGUgaW5kZXggdDFiIG9uIHQxKGIoNzY4KSk7CitTSE9X
IENSRUFURSBUQUJMRSB0MTsKIHNlbGVjdCAqIGZyb20gdDE7Ci1kcm9wIHRhYmxlIHQxOwotLS1z
b3VyY2UgaW5jbHVkZS9oYXZlX2lubm9kYi5pbmMKIAotI2Rpc3BsYXkgY3VycmVudCB2YWx1ZSBv
ZiBpbm5vZGJfdXNlX3N5c19tYWxsb2MKLVNFTEVDVCBAQEdMT0JBTC5pbm5vZGJfdXNlX3N5c19t
YWxsb2M7Ci0tLWVjaG8gMSBFeHBlY3RlZAotCi0jdHJ5IGNoYW5naW5nIGl0LiBTaG91bGQgZmFp
bC4KLS0tZXJyb3IgRVJfSU5DT1JSRUNUX0dMT0JBTF9MT0NBTF9WQVIKLVNFVCBAQEdMT0JBTC5p
bm5vZGJfdXNlX3N5c19tYWxsb2M9MDsKLS0tZWNobyBFeHBlY3RlZCBlcnJvciAnUmVhZCBvbmx5
IHZhcmlhYmxlJwotCi1TRUxFQ1QgQEBHTE9CQUwuaW5ub2RiX3VzZV9zeXNfbWFsbG9jOwotLS1l
Y2hvIDEgRXhwZWN0ZWQKLQotCi0jZG8gc29tZSBzdHVmZiB0byBzZWUgaWYgaXQgd29ya3MuCi0t
LWRpc2FibGVfd2FybmluZ3MKLWRyb3AgdGFibGUgaWYgZXhpc3RzIHQxOwotLS1lbmFibGVfd2Fy
bmluZ3MKLQotY3JlYXRlIHRhYmxlIHQxKGEgaW50IG5vdCBudWxsKSBlbmdpbmU9aW5ub2RiIERF
RkFVTFQgQ0hBUlNFVD1sYXRpbjE7Ci1pbnNlcnQgaW50byB0MSB2YWx1ZXMgKDEpLCgyKSwoMyks
KDQpLCg1KSwoNiksKDcpOwotc2VsZWN0ICogZnJvbSB0MTsKIGRyb3AgdGFibGUgdDE7CitDUkVB
VEUgVEFCTEUgdDIoYSBpbnQgcHJpbWFyeSBrZXksIGIgdGV4dCkgRU5HSU5FPUlubm9EQiBERUZB
VUxUIENIQVJTRVQ9bGF0aW4xOworSU5TRVJUIElOVE8gdDIgVkFMVUVTICgxLCcnKSwoMiwnJyks
KDMsJycpLCg0LCcnKSwoNSwnJyksKDYsJycpLCg3LCcnKTsKKy0tZXJyb3IgRVJfRFVQX0ZJRUxE
TkFNRQorQ1JFQVRFIElOREVYIHQyYWEgb24gdDIoYSxhKTsKKy0tIGVycm9yIEVSX0lOREVYX0NP
TFVNTl9UT09fTE9ORworQ1JFQVRFIElOREVYIHQyYiBvbiB0MihiKDc2OCkpOworU0VMRUNUICog
RlJPTSB0MjsKK0RST1AgVEFCTEUgdDI7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
YmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVy
L2hhX2lubm9kYi5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYyODA5MDM1
NS1rNTNzN3dsZGtqNTBmMmh5CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYV9pbm5v
ZGIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MjgxMjI4MjEtYzZqeG95
ejY4Nng3MmN1dgpAQCAtOTkwLDcgKzk5MCw2IEBAIGNvbnZlcnRfZXJyb3JfY29kZV90b19teXNx
bCgKIAkJCQkJCW1pc2xlYWRpbmcsIGEgbmV3IE15U1FMIGVycm9yCiAJCQkJCQljb2RlIHNob3Vs
ZCBiZSBpbnRyb2R1Y2VkICovCiAKLQljYXNlIERCX0NPTF9BUFBFQVJTX1RXSUNFX0lOX0lOREVY
OgogCWNhc2UgREJfQ09SUlVQVElPTjoKIAkJcmV0dXJuKEhBX0VSUl9DUkFTSEVEKTsKIAoKPT09
IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kYjBlcnIuaCcKLS0tIGEv
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RiMGVyci5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTEwNjI4MDkwMzU1LWs1M3M3d2xka2o1MGYyaHkKKysrIGIvc3RvcmFnZS9pbm5v
YmFzZS9pbmNsdWRlL2RiMGVyci5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEw
NjI4MTIyODIxLWM2anhveXo2ODZ4NzJjdXYKQEAgLTY0LDggKzY0LDYgQEAgZW51bSBkYl9lcnIg
ewogCURCX0NBTk5PVF9BRERfQ09OU1RSQUlOVCwJLyogYWRkaW5nIGEgZm9yZWlnbiBrZXkgY29u
c3RyYWludAogCQkJCQl0byBhIHRhYmxlIGZhaWxlZCAqLwogCURCX0NPUlJVUFRJT04sCQkJLyog
ZGF0YSBzdHJ1Y3R1cmUgY29ycnVwdGlvbiBub3RpY2VkICovCi0JREJfQ09MX0FQUEVBUlNfVFdJ
Q0VfSU5fSU5ERVgsCS8qIElubm9EQiBjYW5ub3QgaGFuZGxlIGFuIGluZGV4Ci0JCQkJCXdoZXJl
IHNhbWUgY29sdW1uIGFwcGVhcnMgdHdpY2UgKi8KIAlEQl9DQU5OT1RfRFJPUF9DT05TVFJBSU5U
LAkvKiBkcm9wcGluZyBhIGZvcmVpZ24ga2V5IGNvbnN0cmFpbnQKIAkJCQkJZnJvbSBhIHRhYmxl
IGZhaWxlZCAqLwogCURCX05PX1NBVkVQT0lOVCwJCS8qIG5vIHNhdmVwb2ludCBleGlzdHMgd2l0
aCB0aGUgZ2l2ZW4KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cw
bXlzcWwuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG15c3FsLmMJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MjgwOTAzNTUtazUzczd3bGRrajUwZjJoeQorKysg
Yi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbXlzcWwuYwlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDExMDYyODEyMjgyMS1jNmp4b3l6Njg2eDcyY3V2CkBAIC0yMDE1LDQxICsyMDE1
LDEzIEBAIHJvd19jcmVhdGVfaW5kZXhfZm9yX215c3FsKAogCiAJdHJ4X3N0YXJ0X2lmX25vdF9z
dGFydGVkKHRyeCk7CiAKLQkvKiBDaGVjayB0aGF0IHRoZSBzYW1lIGNvbHVtbiBkb2VzIG5vdCBh
cHBlYXIgdHdpY2UgaW4gdGhlIGluZGV4LgotCVN0YXJ0aW5nIGZyb20gNC4wLjE0LCBJbm5vREIg
c2hvdWxkIGJlIGFibGUgdG8gY29wZSB3aXRoIHRoYXQsIGJ1dAotCXNhZmVyIG5vdCB0byBhbGxv
dyB0aGVtLiAqLwotCi0JZm9yIChpID0gMDsgaSA8IGRpY3RfaW5kZXhfZ2V0X25fZmllbGRzKGlu
ZGV4KTsgaSsrKSB7Ci0JCXVsaW50CQlqOwotCi0JCWZvciAoaiA9IDA7IGogPCBpOyBqKyspIHsK
LQkJCWlmICgwID09IHV0X3N0cmNtcCgKLQkJCQkgICAgZGljdF9pbmRleF9nZXRfbnRoX2ZpZWxk
KGluZGV4LCBqKS0+bmFtZSwKLQkJCQkgICAgZGljdF9pbmRleF9nZXRfbnRoX2ZpZWxkKGluZGV4
LCBpKS0+bmFtZSkpIHsKLQkJCQl1dF9wcmludF90aW1lc3RhbXAoc3RkZXJyKTsKLQotCQkJCWZw
dXRzKCIgIElubm9EQjogRXJyb3I6IGNvbHVtbiAiLCBzdGRlcnIpOwotCQkJCXV0X3ByaW50X25h
bWUoc3RkZXJyLCB0cngsIEZBTFNFLAotCQkJCQkgICAgICBkaWN0X2luZGV4X2dldF9udGhfZmll
bGQoCi0JCQkJCQkgICAgICBpbmRleCwgaSktPm5hbWUpOwotCQkJCWZwdXRzKCIgYXBwZWFycyB0
d2ljZSBpbiAiLCBzdGRlcnIpOwotCQkJCWRpY3RfaW5kZXhfbmFtZV9wcmludChzdGRlcnIsIHRy
eCwgaW5kZXgpOwotCQkJCWZwdXRzKCJcbiIKLQkJCQkgICAgICAiSW5ub0RCOiBUaGlzIGlzIG5v
dCBhbGxvd2VkIgotCQkJCSAgICAgICIgaW4gSW5ub0RCLlxuIiwgc3RkZXJyKTsKLQotCQkJCWVy
ciA9IERCX0NPTF9BUFBFQVJTX1RXSUNFX0lOX0lOREVYOwotCi0JCQkJZ290byBlcnJvcl9oYW5k
bGluZzsKLQkJCX0KLQkJfQotCi0JCS8qIENoZWNrIGFsc28gdGhhdCBwcmVmaXhfbGVuIGFuZCBh
Y3R1YWwgbGVuZ3RoCi0JCWlzIGxlc3MgdGhhbiB0aGF0IGZyb20gRElDVF9NQVhfRklFTERfTEVO
X0JZX0ZPUk1BVCgpICovCisJZm9yIChpID0gMDsgaSA8IGluZGV4LT5uX2RlZjsgaSsrKSB7CisJ
CS8qIENoZWNrIHRoYXQgcHJlZml4X2xlbiBhbmQgYWN0dWFsIGxlbmd0aAorCQk8IERJQ1RfTUFY
X0lOREVYX0NPTF9MRU4gKi8KIAogCQlsZW4gPSBkaWN0X2luZGV4X2dldF9udGhfZmllbGQoaW5k
ZXgsIGkpLT5wcmVmaXhfbGVuOwogCi0JCWlmIChmaWVsZF9sZW5ndGhzKSB7CisJCWlmIChmaWVs
ZF9sZW5ndGhzICYmIGZpZWxkX2xlbmd0aHNbaV0pIHsKIAkJCWxlbiA9IHV0X21heChsZW4sIGZp
ZWxkX2xlbmd0aHNbaV0pOwogCQl9CiAKQEAgLTIwNTcsNiArMjAyOSw3IEBAIHJvd19jcmVhdGVf
aW5kZXhfZm9yX215c3FsKAogCQlpZiAobGVuID4gKHVsaW50KSBESUNUX01BWF9GSUVMRF9MRU5f
QllfRk9STUFUKHRhYmxlKSkgewogCQkJZXJyID0gREJfVE9PX0JJR19JTkRFWF9DT0w7CiAKKwkJ
CWRpY3RfbWVtX2luZGV4X2ZyZWUoaW5kZXgpOwogCQkJZ290byBlcnJvcl9oYW5kbGluZzsKIAkJ
fQogCX0KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3V0L3V0MHV0LmMnCi0t
LSBhL3N0b3JhZ2UvaW5ub2Jhc2UvdXQvdXQwdXQuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDExMDYyODA5MDM1NS1rNTNzN3dsZGtqNTBmMmh5CisrKyBiL3N0b3JhZ2UvaW5ub2Jh
c2UvdXQvdXQwdXQuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYyODEyMjgy
MS1jNmp4b3l6Njg2eDcyY3V2CkBAIC02NzQsOCArNjc0LDYgQEAgdXRfc3RyZXJyKAogCQlyZXR1
cm4oIkNhbm5vdCBhZGQgY29uc3RyYWludCIpOwogCWNhc2UgREJfQ09SUlVQVElPTjoKIAkJcmV0
dXJuKCJEYXRhIHN0cnVjdHVyZSBjb3JydXB0aW9uIik7Ci0JY2FzZSBEQl9DT0xfQVBQRUFSU19U
V0lDRV9JTl9JTkRFWDoKLQkJcmV0dXJuKCJDb2x1bW4gYXBwZWFycyB0d2ljZSBpbiBpbmRleCIp
OwogCWNhc2UgREJfQ0FOTk9UX0RST1BfQ09OU1RSQUlOVDoKIAkJcmV0dXJuKCJDYW5ub3QgZHJv
cCBjb25zdHJhaW50Iik7CiAJY2FzZSBEQl9OT19TQVZFUE9JTlQ6CgpObyBidW5kbGUgKHJlYXNv
bjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==