From: marko.makela
Date: February 6 2012 9:09am
Subject: bzr push into mysql-trunk-wl5534-stage branch (marko.makela:3823 to 3824)
 WL#5526
List-Archive: http://lists.mysql.com/commits/142760
Message-Id: <201202060909.q1699St5002889@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4MjQgTWFya28gTcOka2Vsw6QJMjAxMi0wMi0wNgogICAgICBXTCM1NTI2IG5vbi1mdW5jdGlv
bmFsIGNsZWFuLXVwIGFmdGVyIHJldmlldyBjb21tZW50cyBmcm9tIFN1bm55IEJhaW5zCiAgICAg
IAogICAgICBkaWN0X3RhYmxlX2Nsb3NlKCk6IERldGVybWluZSBpZiBpbmRleGVzIGNhbiBiZSBk
cm9wcGVkIG9ubHkgaWYgIWRpY3RfbG9ja2VkLgogICAgICAKICAgICAgZGljdF90YWJsZV9jaGVj
a19mb3JfZHVwX2luZGV4ZXMoKTogUmVtb3ZlIGEgZ290byBsYWJlbC4KICAgICAgCiAgICAgIG9u
bGluZV9yZXRyeV9kcm9wX2luZGV4ZXNfd2l0aF90cngoKTogTmV3IGZ1bmN0aW9uLCBmb3IgcmV1
c2luZyBhCiAgICAgIHRyYW5zYWN0aW9uIG9iamVjdCBmb3IgZHJvcHBpbmcgaW5jb21wbGV0ZSBp
bmRleGVzLgogICAgICAKICAgICAgcm93X2xvZ19vbmxpbmVfb3AoKSwgcm93X2xvZ19hcHBseV9v
cCgpOiBSZXBsYWNlIDYgd2l0aCBEQVRBX1RSWF9JRF9MRU4uCgogICAgbW9kaWZpZWQ6CiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGRpY3QuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MGxvZy5jYwogMzgyMyBKb24gT2xhdiBIYXVnbGlkCTIwMTItMDItMDIgW21lcmdlXQogICAgICBN
ZXJnZSBmcm9tIG15c3FsLXRydW5rIHRvIG15c3FsLXRydW5rLXdsNTUzNC1zdGFnZQogICAgICBU
ZXh0IGNvbmZsaWN0IGluIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX21vbml0b3Iu
cmVzdWx0CiAgICAgIFRleHQgY29uZmxpY3QgaW4gbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy9y
L2lubm9kYl9tb25pdG9yX2Rpc2FibGVfYmFzaWMucmVzdWx0CiAgICAgIFRleHQgY29uZmxpY3Qg
aW4gbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy9yL2lubm9kYl9tb25pdG9yX2VuYWJsZV9iYXNp
Yy5yZXN1bHQKICAgICAgVGV4dCBjb25mbGljdCBpbiBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJz
L3IvaW5ub2RiX21vbml0b3JfcmVzZXRfYWxsX2Jhc2ljLnJlc3VsdAogICAgICBUZXh0IGNvbmZs
aWN0IGluIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvci9pbm5vZGJfbW9uaXRvcl9yZXNldF9i
YXNpYy5yZXN1bHQKICAgICAgVGV4dCBjb25mbGljdCBpbiBzcWwvc3FsX3RhYmxlLmNjCiAgICAg
IFRleHQgY29uZmxpY3QgaW4gc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG1lcmdlLmNjCgogICAg
cmVtb3ZlZDoKICAgICAgaW5jbHVkZS9ieXRlb3JkZXIvCiAgICBhZGRlZDoKICAgICAgbXlzcWwt
dGVzdC9pbmNsdWRlL2Z1bmN0aW9uX2RlZmF1bHRzLmluYwogICAgICBteXNxbC10ZXN0L2luY2x1
ZGUvZnVuY3Rpb25fZGVmYXVsdHNfbm90ZW1iZWRkZWQuaW5jCiAgICAgIG15c3FsLXRlc3QvaW5j
bHVkZS9saWJkYWVtb25fZXhhbXBsZS5pbmkKICAgICAgbXlzcWwtdGVzdC9yL2Z1bmN0aW9uX2Rl
ZmF1bHRzLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3IvZnVuY3Rpb25fZGVmYXVsdHNfbm90ZW1i
ZWRkZWQucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3RkX2RhdGEvb25lcm93LnhtbAogICAgICBt
eXNxbC10ZXN0L3N1aXRlL3JwbC9yL3JwbF9mdW5jdGlvbl9kZWZhdWx0cy5yZXN1bHQKICAgICAg
bXlzcWwtdGVzdC9zdWl0ZS9ycGwvdC9ycGxfZnVuY3Rpb25fZGVmYXVsdHMudGVzdAogICAgICBt
eXNxbC10ZXN0L3QvZnVuY3Rpb25fZGVmYXVsdHMudGVzdAogICAgICBteXNxbC10ZXN0L3QvZnVu
Y3Rpb25fZGVmYXVsdHNfbm90ZW1iZWRkZWQudGVzdAogICAgICBteXNxbC10ZXN0L3dsNTg3NF91
cGRvd24KICAgICAgc3FsL2RlbGF5YWJsZV9pbnNlcnRfb3BlcmF0aW9uLmgKICAgICAgdW5pdHRl
c3QvZ3VuaXQvY29weV9pbmZvLXQuY2MKICAgICAgdW5pdHRlc3QvZ3VuaXQvY3JlYXRlX2ZpZWxk
LXQuY2MKICAgICAgdW5pdHRlc3QvZ3VuaXQvZGVsYXlhYmxlX2luc2VydF9vcGVyYXRpb24tdC5j
YwogICAgICB1bml0dGVzdC9ndW5pdC9mYWtlX3RhYmxlLmgKICAgICAgdW5pdHRlc3QvZ3VuaXQv
ZmllbGRfdGltZXN0YW1wLXQuY2MKICAgICAgdW5pdHRlc3QvZ3VuaXQvaXRlbV9mdW5jX25vd19s
b2NhbC10LmNjCiAgICAgIHVuaXR0ZXN0L2d1bml0L21vY2tfY3JlYXRlX2ZpZWxkLmgKICAgICAg
dW5pdHRlc3QvZ3VuaXQvbW9ja19maWVsZF9kYXRldGltZS5oCiAgICAgIHVuaXR0ZXN0L2d1bml0
L21vY2tfZmllbGRfdGltZXN0YW1wLmgKICAgICAgdW5pdHRlc3QvZ3VuaXQvbW9ja19maWVsZF90
aW1lc3RhbXBmLmgKICAgICAgdW5pdHRlc3QvZ3VuaXQvc3FsX3RhYmxlLXQuY2MKICAgIHJlbmFt
ZWQ6CiAgICAgIGluY2x1ZGUvYnl0ZW9yZGVyL2JpZ19lbmRpYW4uaCA9PiBpbmNsdWRlL2JpZ19l
bmRpYW4uaAogICAgICBpbmNsdWRlL2J5dGVvcmRlci9ieXRlX29yZGVyX2dlbmVyaWMuaCA9PiBp
bmNsdWRlL2J5dGVfb3JkZXJfZ2VuZXJpYy5oCiAgICAgIGluY2x1ZGUvYnl0ZW9yZGVyL2J5dGVf
b3JkZXJfZ2VuZXJpY194ODYuaCA9PiBpbmNsdWRlL2J5dGVfb3JkZXJfZ2VuZXJpY194ODYuaAog
ICAgICBpbmNsdWRlL2J5dGVvcmRlci9ieXRlX29yZGVyX2dlbmVyaWNfeDg2XzY0LmggPT4gaW5j
bHVkZS9ieXRlX29yZGVyX2dlbmVyaWNfeDg2XzY0LmgKICAgICAgaW5jbHVkZS9ieXRlb3JkZXIv
bGl0dGxlX2VuZGlhbi5oID0+IGluY2x1ZGUvbGl0dGxlX2VuZGlhbi5oCiAgICBtb2RpZmllZDoK
ICAgICAgY2xpZW50L215c3FsX3BsdWdpbi5jCiAgICAgIGluY2x1ZGUvQ01ha2VMaXN0cy50eHQK
ICAgICAgaW5jbHVkZS9teV9iaXRtYXAuaAogICAgICBpbmNsdWRlL215X2J5dGVvcmRlci5oCiAg
ICAgIGluY2x1ZGUvbXlpc2FtLmgKICAgICAgbXlzcWwtdGVzdC9jb2xsZWN0aW9ucy9kZWZhdWx0
LmRhaWx5CiAgICAgIG15c3FsLXRlc3QvY29sbGVjdGlvbnMvZGVmYXVsdC5leHBlcmltZW50YWwK
ICAgICAgbXlzcWwtdGVzdC9jb2xsZWN0aW9ucy9kZWZhdWx0LndlZWtseQogICAgICBteXNxbC10
ZXN0L2luY2x1ZGUvaWNwX3Rlc3RzLmluYwogICAgICBteXNxbC10ZXN0L2luY2x1ZGUvb3JkZXJf
YnkuaW5jCiAgICAgIG15c3FsLXRlc3Qvci9jcmVhdGUucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qv
ci9pbm5vZGJfaWNwLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3IvaW5ub2RiX2ljcF9hbGwucmVz
dWx0CiAgICAgIG15c3FsLXRlc3Qvci9pbm5vZGJfaWNwX25vbmUucmVzdWx0CiAgICAgIG15c3Fs
LXRlc3Qvci9qb2luX2NhY2hlX25vamIucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9teWlzYW0u
cmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9teWlzYW1faWNwLnJlc3VsdAogICAgICBteXNxbC10
ZXN0L3IvbXlpc2FtX2ljcF9hbGwucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9teWlzYW1faWNw
X25vbmUucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9teXNxbF9wbHVnaW4ucmVzdWx0CiAgICAg
IG15c3FsLXRlc3Qvci9teXNxbGR1bXAucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9vcHRpbWl6
ZXJfZGVidWdfc3luYy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL29yZGVyX2J5X2FsbC5yZXN1
bHQKICAgICAgbXlzcWwtdGVzdC9yL29yZGVyX2J5X2ljcF9tcnIucmVzdWx0CiAgICAgIG15c3Fs
LXRlc3Qvci9vcmRlcl9ieV9ub25lLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3IvdHlwZV90ZW1w
b3JhbF9mcmFjdGlvbmFsLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3IvdHlwZV90aW1lc3RhbXAu
cmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvZW5naW5lcy9mdW5jcy9yL2RhdGVfZnVuY3Rp
b24ucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvZW5naW5lcy9mdW5jcy9yL2RiX2FsdGVy
X2NvbGxhdGVfYXNjaWkucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvZW5naW5lcy9mdW5j
cy9yL2RiX2FsdGVyX2NvbGxhdGVfdXRmOC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGIvci9pbm5vZGItaW5kZXgucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2Ri
L3IvaW5ub2RiX21vbml0b3IucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3Qv
aW5ub2RiLWluZGV4LnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJf
YnVnMzQzMDAudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3IvaW5ub2RiX21v
bml0b3JfZGlzYWJsZV9iYXNpYy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFy
cy9yL2lubm9kYl9tb25pdG9yX2VuYWJsZV9iYXNpYy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9z
dWl0ZS9zeXNfdmFycy9yL2lubm9kYl9tb25pdG9yX3Jlc2V0X2FsbF9iYXNpYy5yZXN1bHQKICAg
ICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy9yL2lubm9kYl9tb25pdG9yX3Jlc2V0X2Jhc2lj
LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3QvY3JlYXRlLnRlc3QKICAgICAgbXlzcWwtdGVzdC90
L215aXNhbS50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9teXNxbF9wbHVnaW4udGVzdAogICAgICBt
eXNxbC10ZXN0L3QvbXlzcWxkdW1wLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L29wdGltaXplcl9k
ZWJ1Z19zeW5jLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L3R5cGVfdGVtcG9yYWxfZnJhY3Rpb25h
bC50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC90eXBlX3RpbWVzdGFtcC50ZXN0CiAgICAgIG15c3lz
L215X2JpdG1hcC5jCiAgICAgIHNxbC9ldmVudF9kYl9yZXBvc2l0b3J5LmNjCiAgICAgIHNxbC9m
aWVsZC5jYwogICAgICBzcWwvZmllbGQuaAogICAgICBzcWwvZmllbGRfY29udi5jYwogICAgICBz
cWwvaGFfbmRiY2x1c3Rlci5jYwogICAgICBzcWwvaGFfcGFydGl0aW9uLmNjCiAgICAgIHNxbC9p
dGVtLmNjCiAgICAgIHNxbC9pdGVtLmgKICAgICAgc3FsL2l0ZW1fdGltZWZ1bmMuY2MKICAgICAg
c3FsL2l0ZW1fdGltZWZ1bmMuaAogICAgICBzcWwvbG9nX2V2ZW50LmNjCiAgICAgIHNxbC9sb2df
ZXZlbnRfb2xkLmNjCiAgICAgIHNxbC9ycGxfaW5mb190YWJsZS5jYwogICAgICBzcWwvc3AuY2MK
ICAgICAgc3FsL3NwX2hlYWQuY2MKICAgICAgc3FsL3NxbF9iYXNlLmNjCiAgICAgIHNxbC9zcWxf
Y2xhc3MuY2MKICAgICAgc3FsL3NxbF9jbGFzcy5oCiAgICAgIHNxbC9zcWxfaW5zZXJ0LmNjCiAg
ICAgIHNxbC9zcWxfaW5zZXJ0LmgKICAgICAgc3FsL3NxbF9sb2FkLmNjCiAgICAgIHNxbC9zcWxf
cGFyc2UuY2MKICAgICAgc3FsL3NxbF9wYXJ0aXRpb24uY2MKICAgICAgc3FsL3NxbF9zZWxlY3Qu
Y2MKICAgICAgc3FsL3NxbF9zaG93LmNjCiAgICAgIHNxbC9zcWxfdGFibGUuY2MKICAgICAgc3Fs
L3NxbF90YWJsZS5oCiAgICAgIHNxbC9zcWxfdGltZS5jYwogICAgICBzcWwvc3FsX3VwZGF0ZS5j
YwogICAgICBzcWwvdGFibGUuY2MKICAgICAgc3FsL3RhYmxlLmgKICAgICAgc3FsL3VuaXJlZy5j
YwogICAgICBzdG9yYWdlL2FyY2hpdmUvaGFfYXJjaGl2ZS5jYwogICAgICBzdG9yYWdlL2Nzdi9o
YV90aW5hLmNjCiAgICAgIHN0b3JhZ2UvZXhhbXBsZS9oYV9leGFtcGxlLmNjCiAgICAgIHN0b3Jh
Z2UvZmVkZXJhdGVkL2hhX2ZlZGVyYXRlZC5jYwogICAgICBzdG9yYWdlL2hlYXAvaGFfaGVhcC5j
YwogICAgICBzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwYnRyLmNjCiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2UvYnRyL2J0cjBzZWEuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1Zi5j
YwogICAgICBzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwZGJsd3IuY2MKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS9maWwvZmlsMGZpbC5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFf
aW5ub2RiLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuY2MKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J0cjBidHIuaWMKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL2J1ZjBidWYuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcGFnZTBw
YWdlLmljCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmkKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3BhZ2Uv
cGFnZTBjdXIuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9wYWdlL3BhZ2UwcGFnZS5jYwogICAg
ICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwc2VsLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
c3J2L3NydjBtb24uY2MKICAgICAgc3RvcmFnZS9teWlzYW0vaGFfbXlpc2FtLmNjCiAgICAgIHN0
b3JhZ2UvbXlpc2FtL2hhX215aXNhbS5oCiAgICAgIHN0b3JhZ2UvbXlpc2FtL21pX2NoZWNrLmMK
ICAgICAgc3RvcmFnZS9teWlzYW0vbXlpc2FtY2hrLmMKICAgICAgc3RvcmFnZS9teWlzYW0vbXlp
c2FtZGVmLmgKICAgICAgc3RvcmFnZS9teWlzYW0vc29ydC5jCiAgICAgIHN0b3JhZ2UvbXlpc2Ft
bXJnL2hhX215aXNhbW1yZy5jYwogICAgICB1bml0dGVzdC9ndW5pdC9DTWFrZUxpc3RzLnR4dAo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3QwZGljdC5jYycKLS0t
IGEvc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3QwZGljdC5jYwlyZXZpZDpqb24uaGF1Z2xpZEBv
cmFjbGUuY29tLTIwMTIwMjAyMTUwNDU0LTJnZjR1MWY0enM1dWN4ZGYKKysrIGIvc3RvcmFnZS9p
bm5vYmFzZS9kaWN0L2RpY3QwZGljdC5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDEyMDIwNjA5MDcxNi1sejltbndxdng5NGJ6bmIxCkBAIC0xLDYgKzEsNiBAQAogLyoqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqCiAKLUNvcHlyaWdodCAoYykgMTk5NiwgMjAxMSwgT3JhY2xlIGFuZC9vciBp
dHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KK0NvcHlyaWdodCAoYykgMTk5Niwg
MjAxMiwgT3JhY2xlIGFuZC9vciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4K
IAogVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0
IGFuZC9vciBtb2RpZnkgaXQgdW5kZXIKIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVi
bGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlCkBAIC00MTMsMTEg
KzQxMywxMiBAQCBkaWN0X3RhYmxlX3RyeV9kcm9wX2Fib3J0ZWQoCiAJfQogCiAJaWYgKHRhYmxl
ICYmIHRhYmxlLT5uX3JlZl9jb3VudCA9PSByZWZfY291bnQgJiYgdGFibGUtPmRyb3BfYWJvcnRl
ZCkgeworCQkvKiBTaWxlbmNlIGEgZGVidWcgYXNzZXJ0aW9uIGluIHJvd19tZXJnZV9kcm9wX2lu
ZGV4ZXMoKS4gKi8KIAkJdXRfZCh0YWJsZS0+bl9yZWZfY291bnQrKyk7CiAJCXJvd19tZXJnZV9k
cm9wX2luZGV4ZXModHJ4LCB0YWJsZSwgVFJVRSk7Ci0JCXRyeF9jb21taXRfZm9yX215c3FsKHRy
eCk7CiAJCXV0X2QodGFibGUtPm5fcmVmX2NvdW50LS0pOwogCQl1dF9hZCh0YWJsZS0+bl9yZWZf
Y291bnQgPT0gcmVmX2NvdW50KTsKKwkJdHJ4X2NvbW1pdF9mb3JfbXlzcWwodHJ4KTsKIAl9CiAK
IAlyb3dfbXlzcWxfdW5sb2NrX2RhdGFfZGljdGlvbmFyeSh0cngpOwpAQCAtNDYzLDggKzQ2NCw2
IEBAIGRpY3RfdGFibGVfY2xvc2UoCiAJCQkJCWluZGV4ZXMgYWZ0ZXIgYW4gYWJvcnRlZCBvbmxp
bmUKIAkJCQkJaW5kZXggY3JlYXRpb24gKi8KIHsKLQlpYm9vbAkJZHJvcF9hYm9ydGVkOwotCiAJ
aWYgKCFkaWN0X2xvY2tlZCkgewogCQltdXRleF9lbnRlcigmZGljdF9zeXMtPm11dGV4KTsKIAl9
CkBAIC00NzIsMTEgKzQ3MSw2IEBAIGRpY3RfdGFibGVfY2xvc2UoCiAJdXRfYWQobXV0ZXhfb3du
KCZkaWN0X3N5cy0+bXV0ZXgpKTsKIAl1dF9hKHRhYmxlLT5uX3JlZl9jb3VudCA+IDApOwogCi0J
ZHJvcF9hYm9ydGVkID0gdHJ5X2Ryb3AKLQkJJiYgdGFibGUtPmRyb3BfYWJvcnRlZAotCQkmJiB0
YWJsZS0+bl9yZWZfY291bnQgPT0gMQotCQkmJiBkaWN0X3RhYmxlX2dldF9maXJzdF9pbmRleCh0
YWJsZSk7Ci0KIAktLXRhYmxlLT5uX3JlZl9jb3VudDsKIAogCU1PTklUT1JfREVDKE1PTklUT1Jf
VEFCTEVfUkVGRVJFTkNFKTsKQEAgLTQ5Miw3ICs0ODYsMTMgQEAgZGljdF90YWJsZV9jbG9zZSgK
ICNlbmRpZiAvKiBVTklWX0RFQlVHICovCiAKIAlpZiAoIWRpY3RfbG9ja2VkKSB7Ci0JCXRhYmxl
X2lkX3QJdGFibGVfaWQgPSB0YWJsZS0+aWQ7CisJCXRhYmxlX2lkX3QJdGFibGVfaWQJPSB0YWJs
ZS0+aWQ7CisJCWlib29sCQlkcm9wX2Fib3J0ZWQ7CisKKwkJZHJvcF9hYm9ydGVkID0gdHJ5X2Ry
b3AKKwkJCSYmIHRhYmxlLT5kcm9wX2Fib3J0ZWQKKwkJCSYmIHRhYmxlLT5uX3JlZl9jb3VudCA9
PSAxCisJCQkmJiBkaWN0X3RhYmxlX2dldF9maXJzdF9pbmRleCh0YWJsZSk7CiAKIAkJbXV0ZXhf
ZXhpdCgmZGljdF9zeXMtPm11dGV4KTsKIApAQCAtMTc5Niw2ICsxNzk2LDcgQEAgZGljdF90YWJs
ZV9yZW1vdmVfZnJvbV9jYWNoZV9sb3coCiAKIAkJdHJ4X3NldF9kaWN0X29wZXJhdGlvbih0cngs
IFRSWF9ESUNUX09QX0lOREVYKTsKIAorCQkvKiBTaWxlbmNlIGEgZGVidWcgYXNzZXJ0aW9uIGlu
IHJvd19tZXJnZV9kcm9wX2luZGV4ZXMoKS4gKi8KIAkJdXRfZCh0YWJsZS0+bl9yZWZfY291bnQr
Kyk7CiAJCXJvd19tZXJnZV9kcm9wX2luZGV4ZXModHJ4LCB0YWJsZSwgVFJVRSk7CiAJCXV0X2Qo
dGFibGUtPm5fcmVmX2NvdW50LS0pOwpAQCAtNTgyMSwxNCArNTgyMiwxMyBAQCBkaWN0X3RhYmxl
X2NoZWNrX2Zvcl9kdXBfaW5kZXhlcygKIAkJCQlzd2l0Y2ggKGRpY3RfaW5kZXhfZ2V0X29ubGlu
ZV9zdGF0dXMoaW5kZXgxKSkgewogCQkJCWNhc2UgT05MSU5FX0lOREVYX0NPTVBMRVRFOgogCQkJ
CWNhc2UgT05MSU5FX0lOREVYX0NSRUFUSU9OOgorCQkJCQl1dF9lcnJvcjsKIAkJCQkJYnJlYWs7
CiAJCQkJY2FzZSBPTkxJTkVfSU5ERVhfQUJPUlRFRDoKIAkJCQljYXNlIE9OTElORV9JTkRFWF9B
Qk9SVEVEX0RST1BQRUQ6Ci0JCQkJCWdvdG8gYWJvcnRlZF9vazsKKwkJCQkJYnJlYWs7CiAJCQkJ
fQotCQkJCXV0X2Vycm9yOwotCQkJYWJvcnRlZF9vazoKLQkJCQlicmVhazsKKwkJCQkvKiBmYWxs
IHRocm91Z2ggKi8KIAkJCWNhc2UgQ0hFQ0tfUEFSVElBTF9PSzoKIAkJCQlicmVhazsKIAkJCX0K
Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFuZGxlcjBhbHRl
ci5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MJcmV2
aWQ6am9uLmhhdWdsaWRAb3JhY2xlLmNvbS0yMDEyMDIwMjE1MDQ1NC0yZ2Y0dTFmNHpzNXVjeGRm
CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwMjA2MDkwNzE2LWx6OW1ud3F2eDk0YnpuYjEKQEAg
LTczMyw2ICs3MzMsOCBAQCBpbm5vYmFzZV9mdHNfY2hlY2tfZG9jX2lkX2luZGV4KAogCX0KIAog
CWlmIChoYV9hbHRlcl9pbmZvKSB7CisJCS8qIENoZWNrIGlmIGEgdW5pcXVlIGluZGV4IHdpdGgg
dGhlIG5hbWUgb2YKKwkJRlRTX0RPQ19JRF9JTkRFWF9OQU1FIGlzIGJlaW5nIGNyZWF0ZWQuICov
CiAJCWZvciAodWludCBpID0gMDsgaSA8IGhhX2FsdGVyX2luZm8tPmluZGV4X2FkZF9jb3VudDsg
aSsrKSB7CiAJCQljb25zdCBLRVkmIGtleSA9IGhhX2FsdGVyX2luZm8tPmtleV9pbmZvX2J1ZmZl
clsKIAkJCQloYV9hbHRlcl9pbmZvLT5pbmRleF9hZGRfYnVmZmVyW2ldXTsKQEAgLTEyMDMsNiAr
MTIwNSwzNCBAQCBvbmxpbmVfcmV0cnlfZHJvcF9pbmRleGVzKAogI2VuZGlmIC8qIFVOSVZfREVC
VUcgKi8KIH0KIAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqLy8qKgorQ29tbWl0IGEgZGljdGlvbmFyeSB0cmFuc2Fj
dGlvbiBhbmQgZHJvcCBhbnkgaW5kZXhlcyB0aGF0IHdlIHdlcmUgbm90CithYmxlIHRvIGZyZWUg
cHJldmlvdXNseSBkdWUgdG8gb3BlbiB0YWJsZSBoYW5kbGVzLiAqLworc3RhdGljIF9fYXR0cmli
dXRlX18oKG5vbm51bGwpKQordm9pZAorb25saW5lX3JldHJ5X2Ryb3BfaW5kZXhlc193aXRoX3Ry
eCgKKy8qPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSovCisJZGljdF90YWJsZV90Kgl0
YWJsZSwJLyohPCBpbi9vdXQ6IHRhYmxlICovCisJdHJ4X3QqCQl0cngpCS8qITwgaW4vb3V0OiB0
cmFuc2FjdGlvbiAqLworeworCXV0X2FkKHRyeF9zdGF0ZV9lcSh0cngsIFRSWF9TVEFURV9OT1Rf
U1RBUlRFRCkpOworCXV0X2FkKHRyeC0+ZGljdF9vcGVyYXRpb25fbG9ja19tb2RlID09IFJXX1hf
TEFUQ0gpOworCisJLyogTm93IHRoYXQgdGhlIGRpY3Rpb25hcnkgaXMgYmVpbmcgbG9ja2VkLCBj
aGVjayBpZiB3ZSBjYW4KKwlkcm9wIGFueSBpbmNvbXBsZXRlbHkgY3JlYXRlZCBpbmRleGVzIHRo
YXQgbWF5IGhhdmUgYmVlbiBsZWZ0CisJYmVoaW5kIGluIHJvbGxiYWNrX2lucGxhY2VfYWx0ZXJf
dGFibGUoKSBlYXJsaWVyLiAqLworCWlmICh0YWJsZS0+ZHJvcF9hYm9ydGVkKSB7CisJCS8qIFJl
LXVzZSB0aGUgZGljdGlvbmFyeSB0cmFuc2FjdGlvbiBvYmplY3QKKwkJdG8gYXZvaWQgc29tZSBt
ZW1vcnkgYWxsb2NhdGlvbiBvdmVyaGVhZC4gKi8KKwkJdXRfYWQodHJ4X2dldF9kaWN0X29wZXJh
dGlvbih0cngpID09IFRSWF9ESUNUX09QX1RBQkxFKTsKKwkJdHJ4LT5kaWN0X29wZXJhdGlvbiA9
IFRSWF9ESUNUX09QX0lOREVYOworCQl0cngtPnRhYmxlX2lkID0gMDsKKwkJdHJ4X3N0YXJ0X2lm
X25vdF9zdGFydGVkKHRyeCk7CisJCW9ubGluZV9yZXRyeV9kcm9wX2luZGV4ZXNfbG93KHRhYmxl
LCB0cngpOworCQl0cnhfY29tbWl0X2Zvcl9teXNxbCh0cngpOworCX0KK30KKwogLyoqIFVwZGF0
ZSBpbnRlcm5hbCBzdHJ1Y3R1cmVzIHdpdGggY29uY3VycmVudCB3cml0ZXMgYmxvY2tlZCwKIHdo
aWxlIHByZXBhcmluZyBBTFRFUiBUQUJMRS4KIApAQCAtMTM2MiwyMSArMTM5Miw3IEBAIHByZXBh
cmVfaW5wbGFjZV9hbHRlcl90YWJsZV9kaWN0KAogCiAJCQl1dF9hZCh1c2VyX3RhYmxlLT5uX3Jl
Zl9jb3VudCA9PSAxKTsKIAotCQkJLyogTm93IHRoYXQgdGhlIGRpY3Rpb25hcnkgaXMgYmVpbmcg
bG9ja2VkLAotCQkJY2hlY2sgaWYgd2UgY2FuIGRyb3AgYW55IGluY29tcGxldGVseSBjcmVhdGVk
Ci0JCQlpbmRleGVzIHRoYXQgbWF5IGhhdmUgYmVlbiBsZWZ0IGJlaGluZCBpbgotCQkJcm9sbGJh
Y2tfaW5wbGFjZV9hbHRlcl90YWJsZSgpIGVhcmxpZXIuICovCi0JCQlpZiAodXNlcl90YWJsZS0+
ZHJvcF9hYm9ydGVkKSB7Ci0JCQkJLyogUmUtdXNlIHRoZSBkaWN0aW9uYXJ5IHRyYW5zYWN0aW9u
IG9iamVjdAotCQkJCXRvIGF2b2lkIHNvbWUgbWVtb3J5IGFsbG9jYXRpb24gb3ZlcmhlYWQuICov
Ci0JCQkJdXRfYWQodHJ4X2dldF9kaWN0X29wZXJhdGlvbih0cngpCi0JCQkJICAgICAgPT0gVFJY
X0RJQ1RfT1BfVEFCTEUpOwotCQkJCXRyeC0+ZGljdF9vcGVyYXRpb24gPSBUUlhfRElDVF9PUF9J
TkRFWDsKLQkJCQl0cngtPnRhYmxlX2lkID0gMDsKLQkJCQl0cnhfc3RhcnRfaWZfbm90X3N0YXJ0
ZWQodHJ4KTsKLQkJCQlvbmxpbmVfcmV0cnlfZHJvcF9pbmRleGVzX2xvdyh1c2VyX3RhYmxlLCB0
cngpOwotCQkJCXRyeF9jb21taXRfZm9yX215c3FsKHRyeCk7Ci0JCQl9CisJCQlvbmxpbmVfcmV0
cnlfZHJvcF9pbmRleGVzX3dpdGhfdHJ4KHVzZXJfdGFibGUsIHRyeCk7CiAKIAkJCXJvd19teXNx
bF91bmxvY2tfZGF0YV9kaWN0aW9uYXJ5KHRyeCk7CiAJCQltZW1faGVhcF9mcmVlKGhlYXApOwpA
QCAtMTU1OSwyOSArMTU3NSwxNiBAQCBlcnJvcl9oYW5kbGluZzoKIAkJCXJvd19tZXJnZV9kcm9w
X3RhYmxlKHRyeCwgaW5kZXhlZF90YWJsZSk7CiAJCX0KIAorCQl0cnhfY29tbWl0X2Zvcl9teXNx
bCh0cngpOwogCQl1dF9hZCh1c2VyX3RhYmxlLT5uX3JlZl9jb3VudCA9PSAxKTsKIAotCQkvKiBO
b3cgdGhhdCB0aGUgZGljdGlvbmFyeSBpcyBiZWluZyBsb2NrZWQsIGNoZWNrIGlmIHdlCi0JCWNh
biBkcm9wIGFueSBpbmNvbXBsZXRlbHkgY3JlYXRlZCBpbmRleGVzIHRoYXQgbWF5IGhhdmUKLQkJ
YmVlbiBsZWZ0IGJlaGluZCBpbiByb2xsYmFja19pbnBsYWNlX2FsdGVyX3RhYmxlKCkgZWFybGll
ci4gKi8KLQotCQlpZiAodXNlcl90YWJsZS0+ZHJvcF9hYm9ydGVkKSB7Ci0JCQkvKiBDb21taXQg
dGhlIHJvd19tZXJnZV9kcm9wX3RhYmxlKCkgYWJvdmUuICovCi0JCQl0cnhfY29tbWl0X2Zvcl9t
eXNxbCh0cngpOwotCQkJLyogUmUtdXNlIHRoZSBkaWN0aW9uYXJ5IHRyYW5zYWN0aW9uIG9iamVj
dAotCQkJdG8gYXZvaWQgc29tZSBtZW1vcnkgYWxsb2NhdGlvbiBvdmVyaGVhZC4gKi8KLQkJCXV0
X2FkKHRyeF9nZXRfZGljdF9vcGVyYXRpb24odHJ4KSA9PSBUUlhfRElDVF9PUF9UQUJMRSk7Ci0J
CQl0cngtPmRpY3Rfb3BlcmF0aW9uID0gVFJYX0RJQ1RfT1BfSU5ERVg7Ci0JCQl0cngtPnRhYmxl
X2lkID0gMDsKLQkJCXRyeF9zdGFydF9pZl9ub3Rfc3RhcnRlZCh0cngpOwotCQkJb25saW5lX3Jl
dHJ5X2Ryb3BfaW5kZXhlc19sb3codXNlcl90YWJsZSwgdHJ4KTsKLQkJfQorCQlvbmxpbmVfcmV0
cnlfZHJvcF9pbmRleGVzX3dpdGhfdHJ4KHVzZXJfdGFibGUsIHRyeCk7CiAJfSBlbHNlIHsKIAkJ
dXRfYWQoaW5kZXhlZF90YWJsZSA9PSB1c2VyX3RhYmxlKTsKIAkJcm93X21lcmdlX2Ryb3BfaW5k
ZXhlcyh0cngsIHVzZXJfdGFibGUsIFRSVUUpOworCQl0cnhfY29tbWl0X2Zvcl9teXNxbCh0cngp
OwogCX0KIAotCXRyeF9jb21taXRfZm9yX215c3FsKHRyeCk7CiAJdXRfZChkaWN0X3RhYmxlX2No
ZWNrX2Zvcl9kdXBfaW5kZXhlcyh1c2VyX3RhYmxlLCBDSEVDS19BTExfQ09NUExFVEUpKTsKIAl1
dF9hZCghdXNlcl90YWJsZS0+ZHJvcF9hYm9ydGVkKTsKIAlyb3dfbXlzcWxfdW5sb2NrX2RhdGFf
ZGljdGlvbmFyeSh0cngpOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93
L3JvdzBsb2cuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBsb2cuY2MJcmV2aWQ6
am9uLmhhdWdsaWRAb3JhY2xlLmNvbS0yMDEyMDIwMjE1MDQ1NC0yZ2Y0dTFmNHpzNXVjeGRmCisr
KyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBsb2cuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMjAyMDYwOTA3MTYtbHo5bW53cXZ4OTRiem5iMQpAQCAtMTYxLDcgKzE2MSw3
IEBAIG9wX29rOgogIyBlcnJvcgogI2VuZGlmCiAJbWFjaF93cml0ZV90b182KGIsIHRyeF9pZCk7
Ci0JYiArPSA2OworCWIgKz0gREFUQV9UUlhfSURfTEVOOwogCiAJaWYgKGV4dHJhX3NpemUgPCAw
eDgwKSB7CiAJCSpiKysgPSAoYnl0ZSkgZXh0cmFfc2l6ZTsKQEAgLTY2Myw3ICs2NjMsNyBAQCBj
b3JydXB0ZWQ6CiAjIGVycm9yCiAjZW5kaWYKIAl0cnhfaWQgPSBtYWNoX3JlYWRfZnJvbV82KG1y
ZWMpOwotCW1yZWMgKz0gNjsKKwltcmVjICs9IERBVEFfVFJYX0lEX0xFTjsKIAogCWV4dHJhX3Np
emUgPSAqbXJlYysrOwogCgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFp
bHMpLg==