From: marko.makela
Date: November 10 2011 11:30am
Subject: bzr push into mysql-trunk branch (marko.makela:3588 to 3589)
List-Archive: http://lists.mysql.com/commits/141810
Message-Id: <201111101130.pAABUhkj029642@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM1ODkgTWFya28gTcOka2Vsw6QJMjAxMS0xMS0xMCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNSB0byBteXNxbC10cnVuay4KCiAgICBhZGRlZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGIvci9pbm5vZGJfcmVwbGFjZS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5v
ZGIvdC9pbm5vZGJfcmVwbGFjZS50ZXN0CiAgICBtb2RpZmllZDoKICAgICAgc3FsL3NxbF9pbnNl
cnQuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwogICAgICBz
dG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwaW5zLmMKIDM1ODggU2VyZ2V5IFZvanRvdmljaAkyMDEx
LTExLTEwIFttZXJnZV0KICAgICAgKG5vIG1lc3NhZ2UpCgo9PT0gYWRkZWQgZmlsZSAnbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfcmVwbGFjZS5yZXN1bHQnCi0tLSBhL215c3FsLXRl
c3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX3JlcGxhY2UucmVzdWx0CTE5NzAtMDEtMDEgMDA6MDA6
MDAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfcmVwbGFjZS5y
ZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTExMTAxMTI4MDktM3oxZmRs
ZGkyOHB0MHhodApAQCAtMCwwICsxLDc3IEBACisjCisjQnVnIzExNzU5Njg4IDUyMDIwOiBJbm5v
REIgY2FuIHN0aWxsIGRlYWRsb2NrCisjb24ganVzdCBJTlNFUlQuLi5PTiBEVVBMSUNBVEUgS0VZ
CisjYS5rLmEuIEJ1ZyM3OTc1IGRlYWRsb2NrIHdpdGhvdXQgYW55IGxvY2tpbmcsIHNpbXBsZSBz
ZWxlY3QgYW5kIHVwZGF0ZQorIworQ1JFQVRFIFRBQkxFIHQxIChhIElOVCBQUklNQVJZIEtFWSwg
YiBJTlQgTk9UIE5VTEwpIEVOR0lORT1Jbm5vREI7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMoMywx
KTsKK0JFR0lOOworU0VUIERFQlVHX1NZTkM9J3dyaXRlX3Jvd19ub3JlcGxhY2UgU0lHTkFMIGlu
c2VydDEgV0FJVF9GT1Igc2VsZWN0MSc7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMoMywyKTsKK1NF
VCBERUJVR19TWU5DPSdub3cgV0FJVF9GT1IgaW5zZXJ0MSc7CitTRUxFQ1QgKiBGUk9NIHQxIExP
Q0sgSU4gU0hBUkUgTU9ERTsKK2EJYgorMwkxCitTRUxFQ1QgKiBGUk9NIHQxIEZPUiBVUERBVEU7
CitTRVQgREVCVUdfU1lOQz0nbm93IFNJR05BTCBzZWxlY3QxJzsKK0VSUk9SIDIzMDAwOiBEdXBs
aWNhdGUgZW50cnkgJzMnIGZvciBrZXkgJ1BSSU1BUlknCitJTlNFUlQgSU5UTyB0MSBWQUxVRVMo
MywzKSBPTiBEVVBMSUNBVEUgS0VZIFVQREFURSBiPWIrMTA7CitFUlJPUiA0MDAwMTogRGVhZGxv
Y2sgZm91bmQgd2hlbiB0cnlpbmcgdG8gZ2V0IGxvY2s7IHRyeSByZXN0YXJ0aW5nIHRyYW5zYWN0
aW9uCitDT01NSVQ7CitTRVQgREVCVUdfU1lOQz0nd3JpdGVfcm93X3JlcGxhY2UgU0lHTkFMIGlu
c2VydDIgV0FJVF9GT1Igc2VsZWN0Mic7CitSRVBMQUNFIElOVE8gdDEgVkFMVUVTKDMsNCk7CitT
RVQgREVCVUdfU1lOQz0nbm93IFdBSVRfRk9SIGluc2VydDInOworU0VMRUNUICogRlJPTSB0MTsK
K2EJYgorMwkxMQorU0VMRUNUICogRlJPTSB0MSBMT0NLIElOIFNIQVJFIE1PREU7CitTRVQgREVC
VUdfU1lOQz0nbm93IFNJR05BTCBzZWxlY3QyJzsKK1NFVCBERUJVR19TWU5DPSd3cml0ZV9yb3df
cmVwbGFjZSBTSUdOQUwgaW5zZXJ0MyBXQUlUX0ZPUiBzZWxlY3QzJzsKK0lOU0VSVCBJTlRPIHQx
IFZBTFVFUygzLDUpIE9OIERVUExJQ0FURSBLRVkgVVBEQVRFIGI9YisyMDsKK2EJYgorMwk0CitT
RVQgREVCVUdfU1lOQz0nbm93IFdBSVRfRk9SIGluc2VydDMnOworU0VMRUNUIGIgRlJPTSB0MSBM
T0NLIElOIFNIQVJFIE1PREU7CitTRVQgREVCVUdfU1lOQz0nbm93IFNJR05BTCBzZWxlY3QzJzsK
K2IKKzI0CitTRVQgREVCVUdfU1lOQz0nd3JpdGVfcm93X25vcmVwbGFjZSBTSUdOQUwgaW5zZXJ0
NCBXQUlUX0ZPUiBzZWxlY3Q0JzsKK0xPQUQgREFUQSBJTkZJTEUgJy4uLy4uL3N0ZF9kYXRhL2xv
YWRkYXRhNS5kYXQnIElOVE8gVEFCTEUgdDEgRklFTERTIFRFUk1JTkFURUQgQlkgJycgRU5DTE9T
RUQgQlkgJycgKGEsIGIpOworU0VUIERFQlVHX1NZTkM9J25vdyBXQUlUX0ZPUiBpbnNlcnQ0JzsK
K1NFTEVDVCBiIEZST00gdDEgV0hFUkUgYT0zIExPQ0sgSU4gU0hBUkUgTU9ERTsKK2IKKzI0CitT
RUxFQ1QgYiBGUk9NIHQxIFdIRVJFIGE9MyBGT1IgVVBEQVRFOworU0VUIERFQlVHX1NZTkM9J25v
dyBTSUdOQUwgc2VsZWN0NCc7CitiCisyNAorRVJST1IgMjMwMDA6IER1cGxpY2F0ZSBlbnRyeSAn
MycgZm9yIGtleSAnUFJJTUFSWScKK1NFVCBERUJVR19TWU5DPSd3cml0ZV9yb3dfbm9yZXBsYWNl
IFNJR05BTCBpbnNlcnQ1IFdBSVRfRk9SIHNlbGVjdDUnOworTE9BRCBEQVRBIElORklMRSAnLi4v
Li4vc3RkX2RhdGEvbG9hZGRhdGE1LmRhdCcgSUdOT1JFIElOVE8gVEFCTEUgdDEgRklFTERTIFRF
Uk1JTkFURUQgQlkgJycgRU5DTE9TRUQgQlkgJycgKGEsIGIpOworU0VUIERFQlVHX1NZTkM9J25v
dyBXQUlUX0ZPUiBpbnNlcnQ1JzsKK1NFTEVDVCAqIEZST00gdDE7CithCWIKKzMJMjQKK1NFTEVD
VCAqIEZST00gdDEgV0hFUkUgYT0zIExPQ0sgSU4gU0hBUkUgTU9ERTsKK2EJYgorMwkyNAorU0VM
RUNUICogRlJPTSB0MSBXSEVSRSBhPTMgRk9SIFVQREFURTsKK1NFVCBERUJVR19TWU5DPSdub3cg
U0lHTkFMIHNlbGVjdDUnOworYQliCiszCTI0CitTRVQgREVCVUdfU1lOQz0nd3JpdGVfcm93X3Jl
cGxhY2UgU0lHTkFMIGluc2VydDYgV0FJVF9GT1Igc2VsZWN0Nic7CitMT0FEIERBVEEgSU5GSUxF
ICcuLi8uLi9zdGRfZGF0YS9sb2FkZGF0YTUuZGF0JyBSRVBMQUNFIElOVE8gVEFCTEUgdDEgRklF
TERTIFRFUk1JTkFURUQgQlkgJycgRU5DTE9TRUQgQlkgJycgKGEsIGIpOworU0VUIERFQlVHX1NZ
TkM9J25vdyBXQUlUX0ZPUiBpbnNlcnQ2JzsKK1NFTEVDVCAqIEZST00gdDE7CithCWIKKzEJMgor
MwkyNAorNQk2CitTRUxFQ1QgYSxiIEZST00gdDEgTE9DSyBJTiBTSEFSRSBNT0RFOworU0VUIERF
QlVHX1NZTkM9J25vdyBTSUdOQUwgc2VsZWN0Nic7CithCWIKKzEJMgorMwk0Cis1CTYKK1NFVCBE
RUJVR19TWU5DPSdSRVNFVCc7CitEUk9QIFRBQkxFIHQxOwoKPT09IGFkZGVkIGZpbGUgJ215c3Fs
LXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX3JlcGxhY2UudGVzdCcKLS0tIGEvbXlzcWwtdGVz
dC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfcmVwbGFjZS50ZXN0CTE5NzAtMDEtMDEgMDA6MDA6MDAg
KzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfcmVwbGFjZS50ZXN0
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTExMTEwMTEyODA5LTN6MWZkbGRpMjhw
dDB4aHQKQEAgLTAsMCArMSwxODYgQEAKKy0tc291cmNlIGluY2x1ZGUvaGF2ZV9pbm5vZGIuaW5j
CistLXNvdXJjZSBpbmNsdWRlL2hhdmVfZGVidWdfc3luYy5pbmMKKworLS1lY2hvICMKKy0tZWNo
byAjQnVnIzExNzU5Njg4IDUyMDIwOiBJbm5vREIgY2FuIHN0aWxsIGRlYWRsb2NrCistLWVjaG8g
I29uIGp1c3QgSU5TRVJULi4uT04gRFVQTElDQVRFIEtFWQorLS1lY2hvICNhLmsuYS4gQnVnIzc5
NzUgZGVhZGxvY2sgd2l0aG91dCBhbnkgbG9ja2luZywgc2ltcGxlIHNlbGVjdCBhbmQgdXBkYXRl
CistLWVjaG8gIworCitDUkVBVEUgVEFCTEUgdDEgKGEgSU5UIFBSSU1BUlkgS0VZLCBiIElOVCBO
T1QgTlVMTCkgRU5HSU5FPUlubm9EQjsKKworSU5TRVJUIElOVE8gdDEgVkFMVUVTKDMsMSk7CisK
K2Nvbm5lY3QgKGNvbjEsbG9jYWxob3N0LHJvb3QsLCk7Citjb25uZWN0IChjb24yLGxvY2FsaG9z
dCxyb290LCwpOworY29ubmVjdGlvbiBjb24xOworCitCRUdJTjsKKyMgbm9ybWFsIElOU0VSVCBv
ZiBhIGR1cGxpY2F0ZSBzaG91bGQgb25seSBTLWxvY2sgdGhlIGV4aXN0aW5nIHJlY29yZCAoMywx
KQorU0VUIERFQlVHX1NZTkM9J3dyaXRlX3Jvd19ub3JlcGxhY2UgU0lHTkFMIGluc2VydDEgV0FJ
VF9GT1Igc2VsZWN0MSc7CistLXNlbmQKK0lOU0VSVCBJTlRPIHQxIFZBTFVFUygzLDIpOworCitj
b25uZWN0aW9uIGRlZmF1bHQ7CitTRVQgREVCVUdfU1lOQz0nbm93IFdBSVRfRk9SIGluc2VydDEn
OworIyB0aGlzIHNob3VsZCBTLWxvY2sgKDMsMSk7IG5vIGNvbmZsaWN0CitTRUxFQ1QgKiBGUk9N
IHQxIExPQ0sgSU4gU0hBUkUgTU9ERTsKKyMgdGhpcyBzaG91bGQgWC1sb2NrICgzLDEpLCBjb25m
bGljdGluZyB3aXRoIGNvbjEKKy0tc2VuZAorU0VMRUNUICogRlJPTSB0MSBGT1IgVVBEQVRFOwor
Citjb25uZWN0aW9uIGNvbjI7CisjIENoZWNrIHRoYXQgdGhlIGFib3ZlIFNFTEVDVCBpcyBibG9j
a2VkCitsZXQgJHdhaXRfY29uZGl0aW9uPQorICBzZWxlY3QgY291bnQoKikgPSAxIGZyb20gaW5m
b3JtYXRpb25fc2NoZW1hLnByb2Nlc3NsaXN0CisgIHdoZXJlIHN0YXRlID0gJ1NlbmRpbmcgZGF0
YScgYW5kCisgICAgICAgIGluZm8gPSAnU0VMRUNUICogRlJPTSB0MSBGT1IgVVBEQVRFJzsKKy0t
c291cmNlIGluY2x1ZGUvd2FpdF9jb25kaXRpb24uaW5jCitTRVQgREVCVUdfU1lOQz0nbm93IFNJ
R05BTCBzZWxlY3QxJzsKKworY29ubmVjdGlvbiBjb24xOworLS1lcnJvciBFUl9EVVBfRU5UUlkK
K3JlYXA7CisjIFdlIGFyZSBzdGlsbCBob2xkaW5nIGFuIFMtbG9jayBvbiAoMywxKSBhZnRlciB0
aGUgZmFpbGVkIElOU0VSVC4KKyMgVGhlIGZvbGxvd2luZyB3aWxsIHVwZ3JhZGUgaXQgdG8gYW4g
WC1sb2NrLCBjYXVzaW5nIGEgZGVhZGxvY2suCisjIElubm9EQiBzaG91bGQgcmVzb2x2ZSB0aGUg
ZGVhZGxvY2sgYnkgYWJvcnRpbmcgdGhlIGJsb2NrZWQgU0VMRUNULgorSU5TRVJUIElOVE8gdDEg
VkFMVUVTKDMsMykgT04gRFVQTElDQVRFIEtFWSBVUERBVEUgYj1iKzEwOworCitjb25uZWN0aW9u
IGRlZmF1bHQ7CistLWVycm9yIEVSX0xPQ0tfREVBRExPQ0sKK3JlYXA7Citjb25uZWN0aW9uIGNv
bjE7CitDT01NSVQ7CisKK1NFVCBERUJVR19TWU5DPSd3cml0ZV9yb3dfcmVwbGFjZSBTSUdOQUwg
aW5zZXJ0MiBXQUlUX0ZPUiBzZWxlY3QyJzsKKy0tc2VuZAorUkVQTEFDRSBJTlRPIHQxIFZBTFVF
UygzLDQpOworCitjb25uZWN0aW9uIGRlZmF1bHQ7CitTRVQgREVCVUdfU1lOQz0nbm93IFdBSVRf
Rk9SIGluc2VydDInOworU0VMRUNUICogRlJPTSB0MTsKKy0tc2VuZAorU0VMRUNUICogRlJPTSB0
MSBMT0NLIElOIFNIQVJFIE1PREU7CisKK2Nvbm5lY3Rpb24gY29uMjsKKyMgQ2hlY2sgdGhhdCB0
aGUgYWJvdmUgU0VMRUNUIGlzIGJsb2NrZWQgYmVjYXVzZSBvZiBYIGxvY2suCitsZXQgJHdhaXRf
Y29uZGl0aW9uPQorICBzZWxlY3QgY291bnQoKikgPSAxIGZyb20gaW5mb3JtYXRpb25fc2NoZW1h
LnByb2Nlc3NsaXN0CisgIHdoZXJlIHN0YXRlID0gJ1NlbmRpbmcgZGF0YScgYW5kCisgICAgICAg
IGluZm8gPSAnU0VMRUNUICogRlJPTSB0MSBMT0NLIElOIFNIQVJFIE1PREUnOworLS1zb3VyY2Ug
aW5jbHVkZS93YWl0X2NvbmRpdGlvbi5pbmMKK1NFVCBERUJVR19TWU5DPSdub3cgU0lHTkFMIHNl
bGVjdDInOworCitjb25uZWN0aW9uIGNvbjE7CityZWFwOworCitTRVQgREVCVUdfU1lOQz0nd3Jp
dGVfcm93X3JlcGxhY2UgU0lHTkFMIGluc2VydDMgV0FJVF9GT1Igc2VsZWN0Myc7CistLXNlbmQK
K0lOU0VSVCBJTlRPIHQxIFZBTFVFUygzLDUpIE9OIERVUExJQ0FURSBLRVkgVVBEQVRFIGI9Yisy
MDsKKworY29ubmVjdGlvbiBkZWZhdWx0OworcmVhcDsKK1NFVCBERUJVR19TWU5DPSdub3cgV0FJ
VF9GT1IgaW5zZXJ0Myc7CistLXNlbmQKK1NFTEVDVCBiIEZST00gdDEgTE9DSyBJTiBTSEFSRSBN
T0RFOworCitjb25uZWN0aW9uIGNvbjI7CisjIENoZWNrIHRoYXQgdGhlIGFib3ZlIFNFTEVDVCBp
cyBibG9ja2VkIGJlY2F1c2Ugb2YgWCBsb2NrLgorbGV0ICR3YWl0X2NvbmRpdGlvbj0KKyAgc2Vs
ZWN0IGNvdW50KCopID0gMSBmcm9tIGluZm9ybWF0aW9uX3NjaGVtYS5wcm9jZXNzbGlzdAorICB3
aGVyZSBzdGF0ZSA9ICdTZW5kaW5nIGRhdGEnIGFuZAorICAgICAgICBpbmZvID0gJ1NFTEVDVCBi
IEZST00gdDEgTE9DSyBJTiBTSEFSRSBNT0RFJzsKKy0tc291cmNlIGluY2x1ZGUvd2FpdF9jb25k
aXRpb24uaW5jCitTRVQgREVCVUdfU1lOQz0nbm93IFNJR05BTCBzZWxlY3QzJzsKKworY29ubmVj
dGlvbiBkZWZhdWx0OworcmVhcDsKKworY29ubmVjdGlvbiBjb24xOworcmVhcDsKK1NFVCBERUJV
R19TWU5DPSd3cml0ZV9yb3dfbm9yZXBsYWNlIFNJR05BTCBpbnNlcnQ0IFdBSVRfRk9SIHNlbGVj
dDQnOworLS1zZW5kCitMT0FEIERBVEEgSU5GSUxFICcuLi8uLi9zdGRfZGF0YS9sb2FkZGF0YTUu
ZGF0JyBJTlRPIFRBQkxFIHQxIEZJRUxEUyBURVJNSU5BVEVEIEJZICcnIEVOQ0xPU0VEIEJZICcn
IChhLCBiKTsKKworY29ubmVjdGlvbiBkZWZhdWx0OworU0VUIERFQlVHX1NZTkM9J25vdyBXQUlU
X0ZPUiBpbnNlcnQ0JzsKKyMgdGhpcyBzaG91bGQgUy1sb2NrICgzLDEpOyBubyBjb25mbGljdAor
U0VMRUNUIGIgRlJPTSB0MSBXSEVSRSBhPTMgTE9DSyBJTiBTSEFSRSBNT0RFOworIyB0aGlzIHNo
b3VsZCBYLWxvY2sgKDMsMSksIGNvbmZsaWN0aW5nIHdpdGggY29uMQorLS1zZW5kCitTRUxFQ1Qg
YiBGUk9NIHQxIFdIRVJFIGE9MyBGT1IgVVBEQVRFOworCitjb25uZWN0aW9uIGNvbjI7CisjIENo
ZWNrIHRoYXQgdGhlIGFib3ZlIFNFTEVDVCBpcyBibG9ja2VkCitsZXQgJHdhaXRfY29uZGl0aW9u
PQorICBzZWxlY3QgY291bnQoKikgPSAxIGZyb20gaW5mb3JtYXRpb25fc2NoZW1hLnByb2Nlc3Ns
aXN0CisgIHdoZXJlIHN0YXRlID0gJ3N0YXRpc3RpY3MnIGFuZAorICAgICAgICBpbmZvID0gJ1NF
TEVDVCBiIEZST00gdDEgV0hFUkUgYT0zIEZPUiBVUERBVEUnOworLS1zb3VyY2UgaW5jbHVkZS93
YWl0X2NvbmRpdGlvbi5pbmMKK1NFVCBERUJVR19TWU5DPSdub3cgU0lHTkFMIHNlbGVjdDQnOwor
Citjb25uZWN0aW9uIGRlZmF1bHQ7CityZWFwOworCitjb25uZWN0aW9uIGNvbjE7CistLWVycm9y
IEVSX0RVUF9FTlRSWQorcmVhcDsKK1NFVCBERUJVR19TWU5DPSd3cml0ZV9yb3dfbm9yZXBsYWNl
IFNJR05BTCBpbnNlcnQ1IFdBSVRfRk9SIHNlbGVjdDUnOworLS1zZW5kCitMT0FEIERBVEEgSU5G
SUxFICcuLi8uLi9zdGRfZGF0YS9sb2FkZGF0YTUuZGF0JyBJR05PUkUgSU5UTyBUQUJMRSB0MSBG
SUVMRFMgVEVSTUlOQVRFRCBCWSAnJyBFTkNMT1NFRCBCWSAnJyAoYSwgYik7CisKK2Nvbm5lY3Rp
b24gZGVmYXVsdDsKK1NFVCBERUJVR19TWU5DPSdub3cgV0FJVF9GT1IgaW5zZXJ0NSc7CitTRUxF
Q1QgKiBGUk9NIHQxOworIyB0aGlzIHNob3VsZCBTLWxvY2s7IG5vIGNvbmZsaWN0CitTRUxFQ1Qg
KiBGUk9NIHQxIFdIRVJFIGE9MyBMT0NLIElOIFNIQVJFIE1PREU7CisjIHRoaXMgc2hvdWxkIFgt
bG9jaywgY29uZmxpY3Rpbmcgd2l0aCB0aGUgUy1sb2NrIG9mIHRoZSBJR05PUkUgaW4gY29uMQor
LS1zZW5kCitTRUxFQ1QgKiBGUk9NIHQxIFdIRVJFIGE9MyBGT1IgVVBEQVRFOworCitjb25uZWN0
aW9uIGNvbjI7CisjIENoZWNrIHRoYXQgdGhlIGFib3ZlIFNFTEVDVCBpcyBibG9ja2VkCitsZXQg
JHdhaXRfY29uZGl0aW9uPQorICBzZWxlY3QgY291bnQoKikgPSAxIGZyb20gaW5mb3JtYXRpb25f
c2NoZW1hLnByb2Nlc3NsaXN0CisgIHdoZXJlIHN0YXRlID0gJ3N0YXRpc3RpY3MnIGFuZAorICAg
ICAgICBpbmZvID0gJ1NFTEVDVCAqIEZST00gdDEgV0hFUkUgYT0zIEZPUiBVUERBVEUnOworLS1z
b3VyY2UgaW5jbHVkZS93YWl0X2NvbmRpdGlvbi5pbmMKK1NFVCBERUJVR19TWU5DPSdub3cgU0lH
TkFMIHNlbGVjdDUnOworCitjb25uZWN0aW9uIGNvbjE7CityZWFwOworY29ubmVjdGlvbiBkZWZh
dWx0OworcmVhcDsKKworY29ubmVjdGlvbiBjb24xOworU0VUIERFQlVHX1NZTkM9J3dyaXRlX3Jv
d19yZXBsYWNlIFNJR05BTCBpbnNlcnQ2IFdBSVRfRk9SIHNlbGVjdDYnOworLS1zZW5kCitMT0FE
IERBVEEgSU5GSUxFICcuLi8uLi9zdGRfZGF0YS9sb2FkZGF0YTUuZGF0JyBSRVBMQUNFIElOVE8g
VEFCTEUgdDEgRklFTERTIFRFUk1JTkFURUQgQlkgJycgRU5DTE9TRUQgQlkgJycgKGEsIGIpOwor
Citjb25uZWN0aW9uIGRlZmF1bHQ7CitTRVQgREVCVUdfU1lOQz0nbm93IFdBSVRfRk9SIGluc2Vy
dDYnOworU0VMRUNUICogRlJPTSB0MTsKKyMgdGhpcyBzaG91bGQgY29uZmxpY3Qgd2l0aCB0aGUg
WC1sb2NrIGFjcXVpcmVkIGJ5IHRoZSBSRVBMQUNFCistLXNlbmQKK1NFTEVDVCBhLGIgRlJPTSB0
MSBMT0NLIElOIFNIQVJFIE1PREU7CisKK2Nvbm5lY3Rpb24gY29uMjsKKyMgQ2hlY2sgdGhhdCB0
aGUgYWJvdmUgU0VMRUNUIGlzIGJsb2NrZWQKK2xldCAkd2FpdF9jb25kaXRpb249CisgIHNlbGVj
dCBjb3VudCgqKSA9IDEgZnJvbSBpbmZvcm1hdGlvbl9zY2hlbWEucHJvY2Vzc2xpc3QKKyAgd2hl
cmUgc3RhdGUgPSAnU2VuZGluZyBkYXRhJyBhbmQKKyAgICAgICAgaW5mbyA9ICdTRUxFQ1QgYSxi
IEZST00gdDEgTE9DSyBJTiBTSEFSRSBNT0RFJzsKKy0tc291cmNlIGluY2x1ZGUvd2FpdF9jb25k
aXRpb24uaW5jCitTRVQgREVCVUdfU1lOQz0nbm93IFNJR05BTCBzZWxlY3Q2JzsKKworY29ubmVj
dGlvbiBjb24xOworcmVhcDsKK2Nvbm5lY3Rpb24gZGVmYXVsdDsKK3JlYXA7CisKK2Rpc2Nvbm5l
Y3QgY29uMTsKK2Rpc2Nvbm5lY3QgY29uMjsKKworY29ubmVjdGlvbiBkZWZhdWx0OworU0VUIERF
QlVHX1NZTkM9J1JFU0VUJzsKK0RST1AgVEFCTEUgdDE7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3Fs
L3NxbF9pbnNlcnQuY2MnCi0tLSBhL3NxbC9zcWxfaW5zZXJ0LmNjCXJldmlkOnNlcmdleS52b2p0
b3ZpY2hAb3JhY2xlLmNvbS0yMDExMTExMDA5NTY1MS1uYjcwY2VhNGxndmY4dzNhCisrKyBiL3Nx
bC9zcWxfaW5zZXJ0LmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTExMTEwMTEy
ODA5LTN6MWZkbGRpMjhwdDB4aHQKQEAgLTc5LDYgKzc5LDggQEAKICNpbmNsdWRlICJkZWJ1Z19z
eW5jLmgiCiAjaW5jbHVkZSAib3B0X2V4cGxhaW4uaCIKIAorI2luY2x1ZGUgImRlYnVnX3N5bmMu
aCIKKwogI2lmbmRlZiBFTUJFRERFRF9MSUJSQVJZCiBzdGF0aWMgYm9vbCBkZWxheWVkX2dldF90
YWJsZShUSEQgKnRoZCwgTURMX3JlcXVlc3QgKmdybF9wcm90ZWN0aW9uX3JlcXVlc3QsCiAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICBUQUJMRV9MSVNUICp0YWJsZV9saXN0KTsKQEAgLTE1
NjQsNiArMTU2Niw4IEBAIGludCB3cml0ZV9yZWNvcmQoVEhEICp0aGQsIFRBQkxFICp0YWJsZSwK
IAllcnJvcj0gSEFfRVJSX0ZPVU5EX0RVUFBfS0VZOyAgICAgICAgIC8qIERhdGFiYXNlIGNhbid0
IGZpbmQga2V5ICovCiAJZ290byBlcnI7CiAgICAgICB9CisgICAgICBERUJVR19TWU5DKHRoZCwg
IndyaXRlX3Jvd19yZXBsYWNlIik7CisKICAgICAgIC8qIFJlYWQgYWxsIGNvbHVtbnMgZm9yIHRo
ZSByb3cgd2UgYXJlIGdvaW5nIHRvIHJlcGxhY2UgKi8KICAgICAgIHRhYmxlLT51c2VfYWxsX2Nv
bHVtbnMoKTsKICAgICAgIC8qCkBAIC0xNzUyLDYgKzE3NTYsNyBAQCBpbnQgd3JpdGVfcmVjb3Jk
KFRIRCAqdGhkLCBUQUJMRSAqdGFibGUsCiAgIH0KICAgZWxzZSBpZiAoKGVycm9yPXRhYmxlLT5m
aWxlLT5oYV93cml0ZV9yb3codGFibGUtPnJlY29yZFswXSkpKQogICB7CisgICAgREVCVUdfU1lO
Qyh0aGQsICJ3cml0ZV9yb3dfbm9yZXBsYWNlIik7CiAgICAgaWYgKCFpbmZvLT5pZ25vcmUgfHwK
ICAgICAgICAgdGFibGUtPmZpbGUtPmlzX2ZhdGFsX2Vycm9yKGVycm9yLCBIQV9DSEVDS19EVVAp
KQogICAgICAgZ290byBlcnI7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9o
YW5kbGVyL2hhX2lubm9kYi5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lu
bm9kYi5jYwlyZXZpZDpzZXJnZXkudm9qdG92aWNoQG9yYWNsZS5jb20tMjAxMTExMTAwOTU2NTEt
bmI3MGNlYTRsZ3ZmOHczYQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2Ri
LmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTExMTEwMTEyODA5LTN6MWZkbGRp
MjhwdDB4aHQKQEAgLTU2NzUsOCArNTY3NSw3IEBAIG5vX2NvbW1pdDoKIAogCQkJc3dpdGNoIChz
cWxfY29tbWFuZCkgewogCQkJY2FzZSBTUUxDT01fTE9BRDoKLQkJCQlpZiAoKHRyeC0+ZHVwbGlj
YXRlcwotCQkJCSAgICAmIChUUlhfRFVQX0lHTk9SRSB8IFRSWF9EVVBfUkVQTEFDRSkpKSB7CisJ
CQkJaWYgKHRyeC0+ZHVwbGljYXRlcykgewogCiAJCQkJCWdvdG8gc2V0X21heF9hdXRvaW5jOwog
CQkJCX0KQEAgLTU5NTEsOCArNTk1MCw3IEBAIGhhX2lubm9iYXNlOjp1cGRhdGVfcm93KAogCSAg
ICAmJiB0YWJsZS0+bmV4dF9udW1iZXJfZmllbGQKIAkgICAgJiYgbmV3X3JvdyA9PSB0YWJsZS0+
cmVjb3JkWzBdCiAJICAgICYmIHRoZF9zcWxfY29tbWFuZCh1c2VyX3RoZCkgPT0gU1FMQ09NX0lO
U0VSVAotCSAgICAmJiAodHJ4LT5kdXBsaWNhdGVzICYgKFRSWF9EVVBfSUdOT1JFIHwgVFJYX0RV
UF9SRVBMQUNFKSkKLQkJPT0gVFJYX0RVUF9JR05PUkUpICB7CisJICAgICYmIHRyeC0+ZHVwbGlj
YXRlcykgIHsKIAogCQl1bG9uZ2xvbmcJYXV0b19pbmM7CiAJCXVsb25nbG9uZwljb2xfbWF4X3Zh
bHVlOwpAQCAtOTU3Nyw2ICs5NTc1LDcgQEAgaGFfaW5ub2Jhc2U6OmV4dHJhKAogCQkJYnJlYWs7
CiAJCWNhc2UgSEFfRVhUUkFfUkVTRVRfU1RBVEU6CiAJCQlyZXNldF90ZW1wbGF0ZSgpOworCQkJ
dGhkX3RvX3RyeChoYV90aGQoKSktPmR1cGxpY2F0ZXMgPSAwOwogCQkJYnJlYWs7CiAJCWNhc2Ug
SEFfRVhUUkFfTk9fS0VZUkVBRDoKIAkJCXByZWJ1aWx0LT5yZWFkX2p1c3Rfa2V5ID0gMDsKQEAg
LTk1OTQsMTkgKzk1OTMsMTggQEAgaGFfaW5ub2Jhc2U6OmV4dHJhKAogCQkJcGFyYW1ldGVycyBi
ZWxvdy4gIFdlIG11c3Qgbm90IGludm9rZSB1cGRhdGVfdGhkKCkKIAkJCWVpdGhlciwgYmVjYXVz
ZSB0aGUgY2FsbGluZyB0aHJlYWRzIG1heSBjaGFuZ2UuCiAJCQlDQVJFRlVMIEhFUkUsIE9SIE1F
TU9SWSBDT1JSVVBUSU9OIE1BWSBPQ0NVUiEgKi8KLQkJY2FzZSBIQV9FWFRSQV9JR05PUkVfRFVQ
X0tFWToKKwkJY2FzZSBIQV9FWFRSQV9JTlNFUlRfV0lUSF9VUERBVEU6CiAJCQl0aGRfdG9fdHJ4
KGhhX3RoZCgpKS0+ZHVwbGljYXRlcyB8PSBUUlhfRFVQX0lHTk9SRTsKIAkJCWJyZWFrOworCQlj
YXNlIEhBX0VYVFJBX05PX0lHTk9SRV9EVVBfS0VZOgorCQkJdGhkX3RvX3RyeChoYV90aGQoKSkt
PmR1cGxpY2F0ZXMgJj0gflRSWF9EVVBfSUdOT1JFOworCQkJYnJlYWs7CiAJCWNhc2UgSEFfRVhU
UkFfV1JJVEVfQ0FOX1JFUExBQ0U6CiAJCQl0aGRfdG9fdHJ4KGhhX3RoZCgpKS0+ZHVwbGljYXRl
cyB8PSBUUlhfRFVQX1JFUExBQ0U7CiAJCQlicmVhazsKIAkJY2FzZSBIQV9FWFRSQV9XUklURV9D
QU5OT1RfUkVQTEFDRToKIAkJCXRoZF90b190cngoaGFfdGhkKCkpLT5kdXBsaWNhdGVzICY9IH5U
UlhfRFVQX1JFUExBQ0U7CiAJCQlicmVhazsKLQkJY2FzZSBIQV9FWFRSQV9OT19JR05PUkVfRFVQ
X0tFWToKLQkJCXRoZF90b190cngoaGFfdGhkKCkpLT5kdXBsaWNhdGVzICY9Ci0JCQkJfihUUlhf
RFVQX0lHTk9SRSB8IFRSWF9EVVBfUkVQTEFDRSk7Ci0JCQlicmVhazsKIAkJZGVmYXVsdDovKiBE
byBub3RoaW5nICovCiAJCQk7CiAJfQoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh
c2Uvcm93L3JvdzBpbnMuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGlucy5jCXJl
dmlkOnNlcmdleS52b2p0b3ZpY2hAb3JhY2xlLmNvbS0yMDExMTExMDA5NTY1MS1uYjcwY2VhNGxn
dmY4dzNhCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBpbnMuYwlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDExMTExMDExMjgwOS0zejFmZGxkaTI4cHQweGh0CkBAIC0xNjcz
LDcgKzE2NzMsNyBAQCByb3dfaW5zX3NjYW5fc2VjX2luZGV4X2Zvcl9kdXBsaWNhdGUoCiAJdWxp
bnQJCW5fZmllbGRzX2NtcDsKIAlidHJfcGN1cl90CXBjdXI7CiAJdWxpbnQJCWVycgkJPSBEQl9T
VUNDRVNTOwotCXVuc2lnbmVkCWFsbG93X2R1cGxpY2F0ZXM7CisJdWxpbnQJCWFsbG93X2R1cGxp
Y2F0ZXM7CiAJbXRyX3QJCW10cjsKIAltZW1faGVhcF90KgloZWFwCQk9IE5VTEw7CiAJdWxpbnQJ
CW9mZnNldHNfW1JFQ19PRkZTX05PUk1BTF9TSVpFXTsKQEAgLTE3MDQsNyArMTcwNCw3IEBAIHJv
d19pbnNfc2Nhbl9zZWNfaW5kZXhfZm9yX2R1cGxpY2F0ZSgKIAogCWJ0cl9wY3VyX29wZW4oaW5k
ZXgsIGVudHJ5LCBQQUdFX0NVUl9HRSwgQlRSX1NFQVJDSF9MRUFGLCAmcGN1ciwgJm10cik7CiAK
LQlhbGxvd19kdXBsaWNhdGVzID0gdGhyX2dldF90cngodGhyKS0+ZHVwbGljYXRlcyAmIFRSWF9E
VVBfSUdOT1JFOworCWFsbG93X2R1cGxpY2F0ZXMgPSB0aHJfZ2V0X3RyeCh0aHIpLT5kdXBsaWNh
dGVzOwogCiAJLyogU2NhbiBpbmRleCByZWNvcmRzIGFuZCBjaGVjayBpZiB0aGVyZSBpcyBhIGR1
cGxpY2F0ZSAqLwogCkBAIC0xODM4LDcgKzE4MzgsNyBAQCByb3dfaW5zX2R1cGxpY2F0ZV9lcnJv
cl9pbl9jbHVzdCgKIAkJCXN1cmUgdGhhdCBpbiByb2xsLWZvcndhcmQgd2UgZ2V0IHRoZSBzYW1l
IGR1cGxpY2F0ZQogCQkJZXJyb3JzIGFzIGluIG9yaWdpbmFsIGV4ZWN1dGlvbiAqLwogCi0JCQlp
ZiAodHJ4LT5kdXBsaWNhdGVzICYgVFJYX0RVUF9JR05PUkUpIHsKKwkJCWlmICh0cngtPmR1cGxp
Y2F0ZXMpIHsKIAogCQkJCS8qIElmIHRoZSBTUUwtcXVlcnkgd2lsbCB1cGRhdGUgb3IgcmVwbGFj
ZQogCQkJCWR1cGxpY2F0ZSBrZXkgd2Ugd2lsbCB0YWtlIFgtbG9jayBmb3IKQEAgLTE4ODIsNyAr
MTg4Miw3IEBAIHJvd19pbnNfZHVwbGljYXRlX2Vycm9yX2luX2NsdXN0KAogCQkJb2Zmc2V0cyA9
IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGN1cnNvci0+aW5kZXgsIG9mZnNldHMsCiAJCQkJCQkgIFVM
SU5UX1VOREVGSU5FRCwgJmhlYXApOwogCi0JCQlpZiAodHJ4LT5kdXBsaWNhdGVzICYgVFJYX0RV
UF9JR05PUkUpIHsKKwkJCWlmICh0cngtPmR1cGxpY2F0ZXMpIHsKIAogCQkJCS8qIElmIHRoZSBT
UUwtcXVlcnkgd2lsbCB1cGRhdGUgb3IgcmVwbGFjZQogCQkJCWR1cGxpY2F0ZSBrZXkgd2Ugd2ls
bCB0YWtlIFgtbG9jayBmb3IKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVt
YWlscyku