From: marko.makela
Date: May 25 2012 11:43am
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3864 to 3865)
 Bug#14117641 WL#6255
List-Archive: http://lists.mysql.com/commits/143956
X-Bug: 14117641
Message-Id: <201205251143.q4PBh87u022468@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4NjUgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yNQogICAgICBCdWcjMTQxMTc2NDEgKHBvc3Np
YmxlIGZpeCkgYW5kIGEgV0wjNjI1NSBvcHRpbWl6YXRpb24KICAgICAgCiAgICAgIEFsbG93IHRo
ZSBub24tb25saW5lIElubm9EQiBpbi1wbGFjZSBEREwgb3BlcmF0aW9ucyB3aXRoIExPQ0s9U0hB
UkVELgogICAgICAKICAgICAgcHJlcGFyZV9pbnBsYWNlX2FsdGVyX3RhYmxlX2RpY3QoKTogV2hl
biBjcmVhdGluZyBpbmRleGVzIGFuZAogICAgICBhbiBvbmxpbmUgb3BlcmF0aW9uIGhhcyBub3Qg
YmVlbiByZXF1ZXN0ZWQsIGFjcXVpcmUgUy1sb2NrIG9uIHRoZSB0YWJsZS4KICAgICAgUHJldmlv
dXNseSwgd2UgYWNxdWlyZWQgYW4gWC1sb2NrLCBhbmQgb25seSB3aGVuIHRoZSB0YWJsZSB3YXMg
YmVpbmcgcmVidWlsdC4KICAgICAgRmFpbHVyZSB0byBsb2NrIHRoZSB0YWJsZSBtaWdodCBleHBs
YWluIEJ1ZyMxNDExNzY0MSBpZiB0aGVyZSB3YXMgYQogICAgICBmb3JlaWduIGtleSBDQVNDQURF
IG9yIFNFVCBOVUxMIGNvbnN0cmFpbnQgcmVmZXJlbmNpbmcgdGhlIHRhYmxlLgoKICAgIG1vZGlm
aWVkOgogICAgICBteXNxbC10ZXN0L3IvaW5ub2RiX215c3FsX3N5bmMucmVzdWx0CiAgICAgIG15
c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWFsdGVyLnJlc3VsdAogICAgICBteXNxbC10
ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1hbHRlci50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9p
bm5vZGJfbXlzcWxfc3luYy50ZXN0CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5k
bGVyMGFsdGVyLmNjCiAzODY0IE1hcmtvIE3DpGtlbMOkCTIwMTItMDUtMjQKICAgICAgcm93X3Vu
ZG9fbW9kX3JlbW92ZV9jbHVzdF9sb3coKTogRW5hYmxlIGEgZGVidWcgYXNzZXJ0aW9uIGFuZAog
ICAgICBhZGQgY29tbWVudHMgb24gREJfVFJYX0lEIGFuZCB0aGUgZGVsZXRlLW1hcmsgZmxhZy4K
CiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVtb2QuY2MKPT09
IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvci9pbm5vZGJfbXlzcWxfc3luYy5yZXN1bHQnCi0t
LSBhL215c3FsLXRlc3Qvci9pbm5vZGJfbXlzcWxfc3luYy5yZXN1bHQJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMjA1MjQxMjM4NTAteWNycTBmdXp3aWtzajR5eAorKysgYi9teXNx
bC10ZXN0L3IvaW5ub2RiX215c3FsX3N5bmMucmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTIwNTI1MTEzOTI0LTIzamNrb3lkNG4wd2twdTgKQEAgLTExNSw3ICsxMTUsNyBA
QCBTRVQgREVCVUdfU1lOQz0gIm5vdyBTSUdOQUwgcXVlcnkiOwogIyBDb25uZWN0aW9uIGRlZmF1
bHQKICMgUmVhcGluZzogQUxURVIgVEFCTEUgZGIxLnQxIEFERCBJTkRFWCh2YWx1ZSkKIERST1Ag
REFUQUJBU0UgZGIxOwotIyBUZXN0IDI6IFByaW1hcnkgaW5kZXggKGltcGxpY2l0KSwgc2hvdWxk
IGJsb2NrIHJlYWRzLgorIyBUZXN0IDI6IFByaW1hcnkgaW5kZXggKGltcGxpY2l0KSwgc2hvdWxk
IGJsb2NrIHdyaXRlcy4KIENSRUFURSBUQUJMRSB0MShhIElOVCBOT1QgTlVMTCwgYiBJTlQgTk9U
IE5VTEwpIGVuZ2luZT1pbm5vZGI7CiBTRVQgREVCVUdfU1lOQz0gImFsdGVyX3RhYmxlX2lucGxh
Y2VfYWZ0ZXJfbG9ja19kb3duZ3JhZGUgU0lHTkFMIG1hbmFnZSBXQUlUX0ZPUiBxdWVyeSI7CiAj
IFNlbmRpbmc6CkBAIC0xMjMsMTcgKzEyMywxOCBAQCBBTFRFUiBUQUJMRSB0MSBBREQgVU5JUVVF
IElOREVYKGEpOwogIyBDb25uZWN0aW9uIGNvbjEKIFNFVCBERUJVR19TWU5DPSAibm93IFdBSVRf
Rk9SIG1hbmFnZSI7CiBVU0UgdGVzdDsKLSMgU2VuZGluZzoKIFNFTEVDVCAqIEZST00gdDE7Cith
CWIKKyMgU2VuZGluZzoKK1VQREFURSB0MSBTRVQgYT1OVUxMOwogIyBDb25uZWN0aW9uIGNvbjIK
ICMgV2FpdGluZyBmb3IgU0VMRUNUIHRvIGJlIGJsb2NrZWQgYnkgdGhlIG1ldGFkYXRhIGxvY2sg
b24gdDEKIFNFVCBERUJVR19TWU5DPSAibm93IFNJR05BTCBxdWVyeSI7CiAjIENvbm5lY3Rpb24g
ZGVmYXVsdAogIyBSZWFwaW5nOiBBTFRFUiBUQUJMRSB0MSBBREQgVU5JUVVFIElOREVYKGEpCiAj
IENvbm5lY3Rpb24gY29uMQotIyBSZWFwaW5nOiBTRUxFQ1QgKiBGUk9NIHQxCi1hCWIKLSMgVGVz
dCAzOiBQcmltYXJ5IGluZGV4IChleHBsaWNpdCksIHNob3VsZCBibG9jayByZWFkcy4KKyMgUmVh
cGluZzogVVBEQVRFIHQxIFNFVCBhPU5VTEwKKyMgVGVzdCAzOiBQcmltYXJ5IGluZGV4IChleHBs
aWNpdCksIHNob3VsZCBibG9jayB3cml0ZXMuCiAjIENvbm5lY3Rpb24gZGVmYXVsdAogQUxURVIg
VEFCTEUgdDEgRFJPUCBJTkRFWCBhOwogU0VUIERFQlVHX1NZTkM9ICJhbHRlcl90YWJsZV9pbnBs
YWNlX2FmdGVyX2xvY2tfZG93bmdyYWRlIFNJR05BTCBtYW5hZ2UgV0FJVF9GT1IgcXVlcnkiOwpA
QCAtMTQxLDE2ICsxNDIsMTcgQEAgU0VUIERFQlVHX1NZTkM9ICJhbHRlcl90YWJsZV9pbnBsYWNl
X2FmdAogQUxURVIgVEFCTEUgdDEgQUREIFBSSU1BUlkgS0VZIChhKTsKICMgQ29ubmVjdGlvbiBj
b24xCiBTRVQgREVCVUdfU1lOQz0gIm5vdyBXQUlUX0ZPUiBtYW5hZ2UiOwotIyBTZW5kaW5nOgog
U0VMRUNUICogRlJPTSB0MTsKK2EJYgorIyBTZW5kaW5nOgorVVBEQVRFIHQxIFNFVCBhPU5VTEw7
CiAjIENvbm5lY3Rpb24gY29uMgogIyBXYWl0aW5nIGZvciBTRUxFQ1QgdG8gYmUgYmxvY2tlZCBi
eSB0aGUgbWV0YWRhdGEgbG9jayBvbiB0MQogU0VUIERFQlVHX1NZTkM9ICJub3cgU0lHTkFMIHF1
ZXJ5IjsKICMgQ29ubmVjdGlvbiBkZWZhdWx0CiAjIFJlYXBpbmc6IEFMVEVSIFRBQkxFIHQxIEFE
RCBQUklNQVJZIEtFWSAoYSkKICMgQ29ubmVjdGlvbiBjb24xCi0jIFJlYXBpbmc6IFNFTEVDVCAq
IEZST00gdDEKLWEJYgorIyBSZWFwaW5nOiBVUERBVEUgdDEgU0VUIGE9TlVMTAogIyBUZXN0IDQ6
IFNlY29uZGFyeSB1bmlxdWUgaW5kZXgsIHNob3VsZCBub3QgYmxvY2sgcmVhZHMuCiAjIENvbm5l
Y3Rpb24gZGVmYXVsdAogU0VUIERFQlVHX1NZTkM9ICJhbHRlcl90YWJsZV9pbnBsYWNlX2FmdGVy
X2xvY2tfZG93bmdyYWRlIFNJR05BTCBtYW5hZ2UgV0FJVF9GT1IgcXVlcnkiOwoKPT09IG1vZGlm
aWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWFsdGVyLnJlc3VsdCcK
LS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItYWx0ZXIucmVzdWx0CXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTI0MTIzODUwLXljcnEwZnV6d2lrc2o0eXgK
KysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItYWx0ZXIucmVzdWx0CXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTI1MTEzOTI0LTIzamNrb3lkNG4wd2twdTgK
QEAgLTQxNCwxMyArNDE0LDEzIEBAIElECUZPUl9DT0xfTkFNRQlSRUZfQ09MX05BTUUJUE9TCiBD
UkVBVEUgVEFCTEUgdDFvIExJS0UgdDE7CiBBTFRFUiBUQUJMRSB0MSBBREQgRlVMTFRFWFQgSU5E
RVggKGN0KSwKIENIQU5HRSBjMSBwayBJTlQsIEFMVEVSIGMyIFNFVCBERUZBVUxUIDQyLCBSRU5B
TUUgVE8gdHQsCi1BTEdPUklUSE09SU5QTEFDRSwgTE9DSz1TSEFSRUQ7CitBTEdPUklUSE09SU5Q
TEFDRSwgTE9DSz1OT05FOwogRVJST1IgNDIwMDA6IFRoaXMgdmVyc2lvbiBvZiBNeVNRTCBkb2Vz
bid0IHlldCBzdXBwb3J0ICdBTFRFUiBUQUJMRSB0MSBBREQgRlVMTFRFWFQgSU5ERVggKGN0KSwK
IENIQU5HRSBjMSBwayBJTlQsIEFMVEVSIGMyIFNFVCBERUZBVUxUIDQyLCBSRU5BTUUgVE8gdHQs
Ci1BTEdPUklUSE09SU5QTEFDRSwgTE9DSz1TSEFSRUQnCitBTEdPUklUSE09SU5QTEFDRSwgTE9D
Sz1OT05FJwogQUxURVIgVEFCTEUgdDEgQUREIEZVTExURVhUIElOREVYIChjdCksCiBDSEFOR0Ug
YzEgcGsgSU5ULCBBTFRFUiBjMiBTRVQgREVGQVVMVCA0MiwgUkVOQU1FIFRPIHR0LAotQUxHT1JJ
VEhNPUlOUExBQ0UsIExPQ0s9RVhDTFVTSVZFOworQUxHT1JJVEhNPUlOUExBQ0UsIExPQ0s9U0hB
UkVEOwogV2FybmluZ3M6CiBXYXJuaW5nCTEyNAlJbm5vREIgcmVidWlsZGluZyB0YWJsZSB0byBh
ZGQgY29sdW1uIEZUU19ET0NfSUQKIFNFTEVDVCBpLk5BTUUsaS5QT1MsaS5NVFlQRSxpLlBSVFlQ
RSxpLkxFTgoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5u
b2RiLWFsdGVyLnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWFs
dGVyLnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjQxMjM4NTAteWNy
cTBmdXp3aWtzajR5eAorKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1hbHRl
ci50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTI1MTEzOTI0LTIzamNr
b3lkNG4wd2twdTgKQEAgLTE4MCwxNiArMTgwLDE2IEBAIEFMVEVSIFRBQkxFIHQxIERST1AgSU5E
RVggYzIsIENIQU5HRSBjMwogQ1JFQVRFIFRBQkxFIHQxbyBMSUtFIHQxOwogCiAjIFRoaXMgd2ls
bCBpbXBsaWNpdGx5IGFkZCBhIERPQ19JRCBjb2x1bW4sIGNvcHlpbmcgdGhlIHRhYmxlIHdoaWxl
Ci0jIGhvbGRpbmcgYW4gZXhjbHVzaXZlIGxvY2suIFRoZSBMT0NLPVNIQVJFRCBzaG91bGQgdGh1
cyBmYWlsLgorIyBob2xkaW5nIGEgbG9jay4gVGhlIExPQ0s9Tk9ORSBzaG91bGQgdGh1cyBmYWls
LgogLS1lcnJvciBFUl9OT1RfU1VQUE9SVEVEX1lFVAogQUxURVIgVEFCTEUgdDEgQUREIEZVTExU
RVhUIElOREVYIChjdCksCiBDSEFOR0UgYzEgcGsgSU5ULCBBTFRFUiBjMiBTRVQgREVGQVVMVCA0
MiwgUkVOQU1FIFRPIHR0LAotQUxHT1JJVEhNPUlOUExBQ0UsIExPQ0s9U0hBUkVEOworQUxHT1JJ
VEhNPUlOUExBQ0UsIExPQ0s9Tk9ORTsKIAotIyBSZXRyeSB3aXRoIExPQ0s9RVhDTFVTSVZFLgor
IyBSZXRyeSB3aXRoIExPQ0s9U0hBUkVELgogQUxURVIgVEFCTEUgdDEgQUREIEZVTExURVhUIElO
REVYIChjdCksCiBDSEFOR0UgYzEgcGsgSU5ULCBBTFRFUiBjMiBTRVQgREVGQVVMVCA0MiwgUkVO
QU1FIFRPIHR0LAotQUxHT1JJVEhNPUlOUExBQ0UsIExPQ0s9RVhDTFVTSVZFOworQUxHT1JJVEhN
PUlOUExBQ0UsIExPQ0s9U0hBUkVEOwogCiAjIFRoZSBvdXRwdXQgc2hvdWxkIGJlIGVtcHR5LCBi
ZWNhdXNlIGluZGV4LT5pZCB3YXMgcmVhc3NpZ25lZC4KIC0tIHNvdXJjZSBzdWl0ZS9pbm5vZGIv
aW5jbHVkZS9pbm5vZGJfZGljdC5pbmMKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3Qv
aW5ub2RiX215c3FsX3N5bmMudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC90L2lubm9kYl9teXNxbF9z
eW5jLnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjQxMjM4NTAteWNy
cTBmdXp3aWtzajR5eAorKysgYi9teXNxbC10ZXN0L3QvaW5ub2RiX215c3FsX3N5bmMudGVzdAly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUyNTExMzkyNC0yM2pja295ZDRuMHdr
cHU4CkBAIC0xODYsNyArMTg2LDcgQEAgY29ubmVjdGlvbiBkZWZhdWx0OwogLS1yZWFwCiBEUk9Q
IERBVEFCQVNFIGRiMTsKIAotLS1lY2hvICMgVGVzdCAyOiBQcmltYXJ5IGluZGV4IChpbXBsaWNp
dCksIHNob3VsZCBibG9jayByZWFkcy4KKy0tZWNobyAjIFRlc3QgMjogUHJpbWFyeSBpbmRleCAo
aW1wbGljaXQpLCBzaG91bGQgYmxvY2sgd3JpdGVzLgogCiBDUkVBVEUgVEFCTEUgdDEoYSBJTlQg
Tk9UIE5VTEwsIGIgSU5UIE5PVCBOVUxMKSBlbmdpbmU9aW5ub2RiOwogU0VUIERFQlVHX1NZTkM9
ICJhbHRlcl90YWJsZV9pbnBsYWNlX2FmdGVyX2xvY2tfZG93bmdyYWRlIFNJR05BTCBtYW5hZ2Ug
V0FJVF9GT1IgcXVlcnkiOwpAQCAtMTk3LDE1ICsxOTcsMTYgQEAgU0VUIERFQlVHX1NZTkM9ICJh
bHRlcl90YWJsZV9pbnBsYWNlX2FmdAogY29ubmVjdGlvbiBjb24xOwogU0VUIERFQlVHX1NZTkM9
ICJub3cgV0FJVF9GT1IgbWFuYWdlIjsKIFVTRSB0ZXN0OworU0VMRUNUICogRlJPTSB0MTsKIC0t
ZWNobyAjIFNlbmRpbmc6Ci0tLXNlbmQgU0VMRUNUICogRlJPTSB0MQorLS1zZW5kIFVQREFURSB0
MSBTRVQgYT1OVUxMCiAKIC0tZWNobyAjIENvbm5lY3Rpb24gY29uMgogY29ubmVjdGlvbiBjb24y
OwogLS1lY2hvICMgV2FpdGluZyBmb3IgU0VMRUNUIHRvIGJlIGJsb2NrZWQgYnkgdGhlIG1ldGFk
YXRhIGxvY2sgb24gdDEKIGxldCAkd2FpdF9jb25kaXRpb249IFNFTEVDVCBDT1VOVCgqKT0gMSBG
Uk9NIGluZm9ybWF0aW9uX3NjaGVtYS5wcm9jZXNzbGlzdAogICBXSEVSRSBzdGF0ZT0gJ1dhaXRp
bmcgZm9yIHRhYmxlIG1ldGFkYXRhIGxvY2snCi0gIEFORCBpbmZvPSdTRUxFQ1QgKiBGUk9NIHQx
JzsKKyAgQU5EIGluZm89J1VQREFURSB0MSBTRVQgYT1OVUxMJzsKIC0tc291cmNlIGluY2x1ZGUv
d2FpdF9jb25kaXRpb24uaW5jCiBTRVQgREVCVUdfU1lOQz0gIm5vdyBTSUdOQUwgcXVlcnkiOwog
CkBAIC0yMTYsMTAgKzIxNywxMCBAQCBjb25uZWN0aW9uIGRlZmF1bHQ7CiAKIC0tZWNobyAjIENv
bm5lY3Rpb24gY29uMQogY29ubmVjdGlvbiBjb24xOwotLS1lY2hvICMgUmVhcGluZzogU0VMRUNU
ICogRlJPTSB0MQorLS1lY2hvICMgUmVhcGluZzogVVBEQVRFIHQxIFNFVCBhPU5VTEwKIC0tcmVh
cAogCi0tLWVjaG8gIyBUZXN0IDM6IFByaW1hcnkgaW5kZXggKGV4cGxpY2l0KSwgc2hvdWxkIGJs
b2NrIHJlYWRzLgorLS1lY2hvICMgVGVzdCAzOiBQcmltYXJ5IGluZGV4IChleHBsaWNpdCksIHNo
b3VsZCBibG9jayB3cml0ZXMuCiAKIC0tZWNobyAjIENvbm5lY3Rpb24gZGVmYXVsdAogY29ubmVj
dGlvbiBkZWZhdWx0OwpAQCAtMjMxLDE1ICsyMzIsMTYgQEAgU0VUIERFQlVHX1NZTkM9ICJhbHRl
cl90YWJsZV9pbnBsYWNlX2FmdAogLS1lY2hvICMgQ29ubmVjdGlvbiBjb24xCiBjb25uZWN0aW9u
IGNvbjE7CiBTRVQgREVCVUdfU1lOQz0gIm5vdyBXQUlUX0ZPUiBtYW5hZ2UiOworU0VMRUNUICog
RlJPTSB0MTsKIC0tZWNobyAjIFNlbmRpbmc6Ci0tLXNlbmQgU0VMRUNUICogRlJPTSB0MQorLS1z
ZW5kIFVQREFURSB0MSBTRVQgYT1OVUxMCiAKIC0tZWNobyAjIENvbm5lY3Rpb24gY29uMgogY29u
bmVjdGlvbiBjb24yOwogLS1lY2hvICMgV2FpdGluZyBmb3IgU0VMRUNUIHRvIGJlIGJsb2NrZWQg
YnkgdGhlIG1ldGFkYXRhIGxvY2sgb24gdDEKIGxldCAkd2FpdF9jb25kaXRpb249IFNFTEVDVCBD
T1VOVCgqKT0gMSBGUk9NIGluZm9ybWF0aW9uX3NjaGVtYS5wcm9jZXNzbGlzdAogICBXSEVSRSBz
dGF0ZT0gJ1dhaXRpbmcgZm9yIHRhYmxlIG1ldGFkYXRhIGxvY2snCi0gIEFORCBpbmZvPSdTRUxF
Q1QgKiBGUk9NIHQxJzsKKyAgQU5EIGluZm89J1VQREFURSB0MSBTRVQgYT1OVUxMJzsKIC0tc291
cmNlIGluY2x1ZGUvd2FpdF9jb25kaXRpb24uaW5jCiBTRVQgREVCVUdfU1lOQz0gIm5vdyBTSUdO
QUwgcXVlcnkiOwogCkBAIC0yNTAsNyArMjUyLDcgQEAgY29ubmVjdGlvbiBkZWZhdWx0OwogCiAt
LWVjaG8gIyBDb25uZWN0aW9uIGNvbjEKIGNvbm5lY3Rpb24gY29uMTsKLS0tZWNobyAjIFJlYXBp
bmc6IFNFTEVDVCAqIEZST00gdDEKKy0tZWNobyAjIFJlYXBpbmc6IFVQREFURSB0MSBTRVQgYT1O
VUxMCiAtLXJlYXAKIAogLS1lY2hvICMgVGVzdCA0OiBTZWNvbmRhcnkgdW5pcXVlIGluZGV4LCBz
aG91bGQgbm90IGJsb2NrIHJlYWRzLgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh
c2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2hhbmRs
ZXIvaGFuZGxlcjBhbHRlci5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUy
NDEyMzg1MC15Y3JxMGZ1endpa3NqNHl4CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9o
YW5kbGVyMGFsdGVyLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTI1MTEz
OTI0LTIzamNrb3lkNG4wd2twdTgKQEAgLTE4Myw3ICsxODMsNyBAQCBpbm5vYmFzZV9uZWVkX3Jl
YnVpbGQoCiBieSBBTFRFUiBUQUJMRSBhbmQgaG9sZGluZyBkYXRhIHVzZWQgZHVyaW5nIGluLXBs
YWNlIGFsdGVyLgogCiBAcmV0dmFsIEhBX0FMVEVSX0lOUExBQ0VfTk9UX1NVUFBPUlRFRAlOb3Qg
c3VwcG9ydGVkCi1AcmV0dmFsIEhBX0FMVEVSX0lOUExBQ0VfRVhDTFVTSVZFX0xPQ0sJU3VwcG9y
dGVkLCBidXQgcmVxdWlyZXMgWC1sb2NrCitAcmV0dmFsIEhBX0FMVEVSX0lOUExBQ0VfU0hBUkVE
X0xPQ0sJU3VwcG9ydGVkLCBidXQgcmVxdWlyZXMgUy1sb2NrCiBAcmV0dmFsIEhBX0FMVEVSX0lO
UExBQ0VfTk9fTE9DSyBTdXBwb3J0ZWQKIEByZXR2YWwgSEFfQUxURVJfSU5QTEFDRV9OT19MT0NL
X0FGVEVSX1BSRVBBUkUJU3VwcG9ydGVkLCBwcmVwYXJlIHBoYXNlCiAoYW55IHRyYW5zYWN0aW9u
cyB0aGF0IGhhdmUgbW9kaWZpZWQgdGhlIHRhYmxlIG11c3QgY29tbWl0IG9yIHJvbGwgYmFjawpA
QCAtMjc3LDE2ICsyNzcsMTYgQEAgaGFfaW5ub2Jhc2U6OmNoZWNrX2lmX3N1cHBvcnRlZF9pbnBs
YWNlXwogCiAJcHJlYnVpbHQtPnRyeC0+d2lsbF9sb2NrKys7CiAKLQkvKiBSZWJ1aWxkaW5nIHRo
ZSBjbHVzdGVyZWQgaW5kZXggcmVxdWlyZXMgYW4gZXhjbHVzaXZlIGxvY2sgb24gdGhlCisJLyog
UmVidWlsZGluZyB0aGUgY2x1c3RlcmVkIGluZGV4IHJlcXVpcmVzIGEgc2hhcmVkIGxvY2sgb24g
dGhlCiAJdGFibGUgZHVyaW5nIHRoZSB3aG9sZSBjb3B5aW5nIG9wZXJhdGlvbi4gKi8KIAlpZiAo
aW5ub2Jhc2VfbmVlZF9yZWJ1aWxkKGhhX2FsdGVyX2luZm8pKSB7Ci0JCURCVUdfUkVUVVJOKEhB
X0FMVEVSX0lOUExBQ0VfRVhDTFVTSVZFX0xPQ0spOworCQlEQlVHX1JFVFVSTihIQV9BTFRFUl9J
TlBMQUNFX1NIQVJFRF9MT0NLKTsKIAl9CiAKIAlpZiAoaGFfYWx0ZXJfaW5mby0+aGFuZGxlcl9m
bGFncwogCSAgICAmIChBbHRlcl9pbnBsYWNlX2luZm86OkFERF9JTkRFWAogCSAgICAgICB8IEFs
dGVyX2lucGxhY2VfaW5mbzo6QUREX1VOSVFVRV9JTkRFWCkpIHsKLQkJLyogQnVpbGRpbmcgYSBm
dWxsLXRleHQgaW5kZXggcmVxdWlyZXMgYW4gZXhjbHVzaXZlIGxvY2suICovCisJCS8qIEJ1aWxk
aW5nIGEgZnVsbC10ZXh0IGluZGV4IHJlcXVpcmVzIGEgc2hhcmVkIGxvY2suICovCiAKIAkJZm9y
ICh1aW50IGkgPSAwOyBpIDwgaGFfYWx0ZXJfaW5mby0+aW5kZXhfYWRkX2NvdW50OyBpKyspIHsK
IAkJCWNvbnN0IEtFWSoga2V5ID0KQEAgLTI5OCw3ICsyOTgsNyBAQCBoYV9pbm5vYmFzZTo6Y2hl
Y2tfaWZfc3VwcG9ydGVkX2lucGxhY2VfCiAJCQkJCQkgIHwgSEFfUEFDS19LRVkKIAkJCQkJCSAg
fCBIQV9HRU5FUkFURURfS0VZCiAJCQkJCQkgIHwgSEFfQklOQVJZX1BBQ0tfS0VZKSkpOwotCQkJ
CURCVUdfUkVUVVJOKEhBX0FMVEVSX0lOUExBQ0VfRVhDTFVTSVZFX0xPQ0spOworCQkJCURCVUdf
UkVUVVJOKEhBX0FMVEVSX0lOUExBQ0VfU0hBUkVEX0xPQ0spOwogCQkJfQogCQl9CiAJfQpAQCAt
MTQ0Myw4ICsxNDQzLDggQEAgcHJlcGFyZV9pbnBsYWNlX2FsdGVyX3RhYmxlX2RpY3QoCiAJREJV
R19BU1NFUlQoIWFkZF9mdHNfZG9jX2lkIHx8IG5ld19jbHVzdGVyZWQpOwogCiAJLyogQSBwcmlt
YXJ5IGtleSBpbmRleCBjYW5ub3QgYmUgY3JlYXRlZCBvbmxpbmUuIFRoZSB0YWJsZQotCXNob3Vs
ZCBiZSBleGNsdXNpdmVseSBsb2NrZWQgaW4gdGhpcyBjYXNlLiBJdCBzaG91bGQgYWxzbwotCWJl
IGV4Y2x1c2l2ZWx5IGxvY2tlZCB3aGVuIGEgZnVsbC10ZXh0IGluZGV4IGlzIGJlaW5nIGNyZWF0
ZWQuICovCisJc2hvdWxkIGJlIGxvY2tlZCBpbiB0aGlzIGNhc2UuIEl0IHNob3VsZCBhbHNvIGJl
IGxvY2tlZCB3aGVuIGEKKwlmdWxsLXRleHQgaW5kZXggaXMgYmVpbmcgY3JlYXRlZC4gKi8KIAlE
QlVHX0FTU0VSVCghIW5ld19jbHVzdGVyZWQKIAkJICAgID09ICgoaGFfYWx0ZXJfaW5mby0+aGFu
ZGxlcl9mbGFncwogCQkJICYgSU5OT0JBU0VfSU5QTEFDRV9SRUJVSUxEKQpAQCAtMTQ2MSwxMyAr
MTQ2MSwyMCBAQCBwcmVwYXJlX2lucGxhY2VfYWx0ZXJfdGFibGVfZGljdCgKIAl0aGUgZGF0YSBk
aWN0aW9uYXJ5IHdpbGwgYmUgbG9ja2VkIGluIGNyYXNoIHJlY292ZXJ5LiAqLwogCXRyeF9zZXRf
ZGljdF9vcGVyYXRpb24odHJ4LCBUUlhfRElDVF9PUF9JTkRFWCk7CiAKLQljb25zdCBib29sIGV4
Y2x1c2l2ZSA9IGhhX2FsdGVyX2luZm8tPmFsdGVyX2luZm8tPnJlcXVlc3RlZF9sb2NrCi0JCT09
IEFsdGVyX2luZm86OkFMVEVSX1RBQkxFX0xPQ0tfRVhDTFVTSVZFOworCWNvbnN0IGJvb2wgbG9j
a2VkID0gaGFfYWx0ZXJfaW5mby0+YWx0ZXJfaW5mby0+cmVxdWVzdGVkX2xvY2sKKwkJPT0gQWx0
ZXJfaW5mbzo6QUxURVJfVEFCTEVfTE9DS19FWENMVVNJVkUKKwkJfHwgaGFfYWx0ZXJfaW5mby0+
YWx0ZXJfaW5mby0+cmVxdWVzdGVkX2xvY2sKKwkJPT0gQWx0ZXJfaW5mbzo6QUxURVJfVEFCTEVf
TE9DS19TSEFSRUQ7CisKKwkvKiBGb3Igbm93LCByZWJ1aWxkaW5nIHRoZSBjbHVzdGVyZWQgaW5k
ZXggcmVxdWlyZXMgYSBsb2NrLiAqLworCXV0X2FkKCFuZXdfY2x1c3RlcmVkIHx8IGxvY2tlZAor
CSAgICAgIHx8IGhhX2FsdGVyX2luZm8tPmFsdGVyX2luZm8tPnJlcXVlc3RlZF9sb2NrCisJICAg
ICAgPT0gQWx0ZXJfaW5mbzo6QUxURVJfVEFCTEVfTE9DS19ERUZBVUxUKTsKIAogCS8qIEFjcXVp
cmUgYSBsb2NrIG9uIHRoZSB0YWJsZSBiZWZvcmUgY3JlYXRpbmcgYW55IGluZGV4ZXMuICovCi0J
aWYgKG5ld19jbHVzdGVyZWQpIHsKKwlpZiAobmV3X2NsdXN0ZXJlZCB8fCBsb2NrZWQpIHsKIAkJ
ZXJyb3IgPSByb3dfbWVyZ2VfbG9ja190YWJsZSgKLQkJCXVzZXJfdHJ4LCBpbmRleGVkX3RhYmxl
LCBMT0NLX1gpOworCQkJdXNlcl90cngsIGluZGV4ZWRfdGFibGUsIExPQ0tfUyk7CiAKIAkJaWYg
KGVycm9yICE9IERCX1NVQ0NFU1MpIHsKIApAQCAtMTY4NSw5ICsxNjkyLDkgQEAgY29sX2ZhaWw6
CiAKIAkJLyogSWYgb25seSBvbmxpbmUgQUxURVIgVEFCTEUgb3BlcmF0aW9ucyBoYXZlIGJlZW4K
IAkJcmVxdWVzdGVkLCBhbGxvY2F0ZSBhIG1vZGlmaWNhdGlvbiBsb2cuIElmIHRoZSB0YWJsZQot
CQl3aWxsIGJlIGV4Y2x1c2l2ZWx5IGxvY2tlZCBhbnl3YXksIHRoZSBtb2RpZmljYXRpb24KLQkJ
bG9nIGlzIHVubmVjZXNzYXJ5LiAqLwotCQlpZiAoIWV4Y2x1c2l2ZSAmJiAhbnVtX2Z0c19pbmRl
eAorCQl3aWxsIGJlIGxvY2tlZCBhbnl3YXksIHRoZSBtb2RpZmljYXRpb24gbG9nIGlzCisJCXVu
bmVjZXNzYXJ5LiAqLworCQlpZiAoIWxvY2tlZCAmJiAhbnVtX2Z0c19pbmRleAogCQkgICAgJiYg
IWlubm9iYXNlX25lZWRfcmVidWlsZChoYV9hbHRlcl9pbmZvKQogCQkgICAgJiYgIXVzZXJfdGFi
bGUtPmliZF9maWxlX21pc3NpbmcKIAkJICAgICYmICF1c2VyX3RhYmxlLT50YWJsZXNwYWNlX2Rp
c2NhcmRlZCkgewpAQCAtMTc3OSwxMSArMTc4NiwxMSBAQCBvcF9vazoKIAl1dF9hKHRyeC0+bG9j
ay5uX2FjdGl2ZV90aHJzID09IDApOwogCiAJaWYgKG5ld19jbHVzdGVyZWQpIHsKLQkJLyogQSBj
bHVzdGVyZWQgaW5kZXggaXMgdG8gYmUgYnVpbHQuICBBY3F1aXJlIGFuIGV4Y2x1c2l2ZQorCQkv
KiBBIGNsdXN0ZXJlZCBpbmRleCBpcyB0byBiZSBidWlsdC4gIEFjcXVpcmUgYSBzaGFyZWQKIAkJ
dGFibGUgbG9jayBhbHNvIG9uIHRoZSB0YWJsZSB0aGF0IGlzIGJlaW5nIGNyZWF0ZWQuICovCiAJ
CURCVUdfQVNTRVJUKGluZGV4ZWRfdGFibGUgIT0gdXNlcl90YWJsZSk7CiAKLQkJZXJyb3IgPSBy
b3dfbWVyZ2VfbG9ja190YWJsZSh1c2VyX3RyeCwgaW5kZXhlZF90YWJsZSwgTE9DS19YKTsKKwkJ
ZXJyb3IgPSByb3dfbWVyZ2VfbG9ja190YWJsZSh1c2VyX3RyeCwgaW5kZXhlZF90YWJsZSwgTE9D
S19TKTsKIAl9CiAKIGVycm9yX2hhbmRsaW5nOgpAQCAtMTgwMiw3ICsxODA5LDcgQEAgZXJyb3Jf
aGFuZGxpbmc6CiAJCQlhZGRfaW5kZXgsIGFkZF9rZXlfbnVtcywgbl9hZGRfaW5kZXgsCiAJCQlk
cm9wX2luZGV4LCBuX2Ryb3BfaW5kZXgsCiAJCQlkcm9wX2ZvcmVpZ24sIG5fZHJvcF9mb3JlaWdu
LAotCQkJIWV4Y2x1c2l2ZSAmJiAhbmV3X2NsdXN0ZXJlZCAmJiAhbnVtX2Z0c19pbmRleCwKKwkJ
CSFsb2NrZWQgJiYgIW5ld19jbHVzdGVyZWQgJiYgIW51bV9mdHNfaW5kZXgsCiAJCQloZWFwLCB0
cngsIGluZGV4ZWRfdGFibGUpOwogCQlEQlVHX1JFVFVSTihmYWxzZSk7CiAJY2FzZSBEQl9UQUJM
RVNQQUNFX0FMUkVBRFlfRVhJU1RTOgpAQCAtMjI4NSwxNCArMjI5MiwxNiBAQCBpbmRleF9uZWVk
ZWQ6CiAKIAlpZiAoIShoYV9hbHRlcl9pbmZvLT5oYW5kbGVyX2ZsYWdzICYgSU5OT0JBU0VfSU5Q
TEFDRV9DUkVBVEUpKSB7CiAJCWlmIChoZWFwKSB7Ci0JCQljb25zdCBib29sIGV4Y2x1c2l2ZQor
CQkJY29uc3QgYm9vbCBsb2NrZWQKIAkJCQk9IGhhX2FsdGVyX2luZm8tPmFsdGVyX2luZm8tPnJl
cXVlc3RlZF9sb2NrCi0JCQkJPT0gQWx0ZXJfaW5mbzo6QUxURVJfVEFCTEVfTE9DS19FWENMVVNJ
VkU7CisJCQkJPT0gQWx0ZXJfaW5mbzo6QUxURVJfVEFCTEVfTE9DS19FWENMVVNJVkUKKwkJCQl8
fCBoYV9hbHRlcl9pbmZvLT5hbHRlcl9pbmZvLT5yZXF1ZXN0ZWRfbG9jaworCQkJCT09IEFsdGVy
X2luZm86OkFMVEVSX1RBQkxFX0xPQ0tfU0hBUkVEOwogCQkJaGFfYWx0ZXJfaW5mby0+aGFuZGxl
cl9jdHgKIAkJCQk9IG5ldyBoYV9pbm5vYmFzZV9pbnBsYWNlX2N0eCgKIAkJCQkJTlVMTCwgTlVM
TCwgMCwKIAkJCQkJZHJvcF9pbmRleCwgbl9kcm9wX2luZGV4LAotCQkJCQlkcm9wX2ZrLCBuX2Ry
b3BfZmssICFleGNsdXNpdmUsCisJCQkJCWRyb3BfZmssIG5fZHJvcF9maywgIWxvY2tlZCwKIAkJ
CQkJaGVhcCwgTlVMTCwgaW5kZXhlZF90YWJsZSk7CiAJCX0KIAoKTm8gYnVuZGxlIChyZWFzb246
IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=