From: marko.makela Date: October 21 2011 4:14am Subject: bzr push into mysql-5.5 branch (marko.makela:3584 to 3585) List-Archive: http://lists.mysql.com/commits/141525 Message-Id: <201110210414.p9L4E53T015134@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDM1ODUgTWFya28gTcOka2Vsw6QJMjAxMS0xMC0yMSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs LTUuMSB0byBteXNxbC01LjUuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv YnRyL2J0cjBjdXIuYwogMzU4NCBCam9ybiBNdW5jaAkyMDExLTEwLTE5IFttZXJnZV0KICAgICAg UmVtb3ZpbmcgY29weXJpZ2h0IGhlYWRlcnMgZnJvbSB0ZXN0IGZpbGVzCgogICAgbW9kaWZpZWQ6 CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS9pbmNsdWRlL2JpbmxvZ19jb21tb24u aW5jCiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS9pbmNsdWRlL2NsZWFudXBfaGVs cGVyLmluYwogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvaW5jbHVkZS9wcml2aWxl Z2UuaW5jCiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS9pbmNsdWRlL3NldHVwX2hl bHBlci5pbmMKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL2luY2x1ZGUvc3RhcnRf c2VydmVyX2NvbW1vbi5pbmMKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL2luY2x1 ZGUvdXBncmFkZV9jaGVjay5pbmMKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3Qv YWdncmVnYXRlLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3QvYmFkX29w dGlvbl8xLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3QvYmFkX29wdGlv bl8yLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3QvYmFkX29wdGlvbl8z LnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3QvYmFkX29wdGlvbl80LnRl c3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3QvYmFkX29wdGlvbl81LnRlc3QK ICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3QvYmlubG9nX21peC50ZXN0CiAgICAg IG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS90L2JpbmxvZ19yb3cudGVzdAogICAgICBteXNx bC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9iaW5sb2dfc3RtdC50ZXN0CiAgICAgIG15c3FsLXRl c3Qvc3VpdGUvcGVyZnNjaGVtYS90L2NoZWNrc3VtLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0 ZS9wZXJmc2NoZW1hL3QvY25mX29wdGlvbi5jbmYKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJm c2NoZW1hL3QvY25mX29wdGlvbi50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVt YS90L2NvbHVtbl9wcml2aWxlZ2UudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hl bWEvdC9kZGxfY29uZF9pbnN0YW5jZXMudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZz Y2hlbWEvdC9kZGxfZXZlbnRzX3dhaXRzX2N1cnJlbnQudGVzdAogICAgICBteXNxbC10ZXN0L3N1 aXRlL3BlcmZzY2hlbWEvdC9kZGxfZXZlbnRzX3dhaXRzX2hpc3RvcnkudGVzdAogICAgICBteXNx bC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9kZGxfZXZlbnRzX3dhaXRzX2hpc3RvcnlfbG9uZy50 ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS90L2RkbF9ld3NfYnlfaW5zdGFu Y2UudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9kZGxfZXdzX2J5X3Ro cmVhZF9ieV9ldmVudF9uYW1lLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1h L3QvZGRsX2V3c19nbG9iYWxfYnlfZXZlbnRfbmFtZS50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3Vp dGUvcGVyZnNjaGVtYS90L2RkbF9maWxlX2luc3RhbmNlcy50ZXN0CiAgICAgIG15c3FsLXRlc3Qv c3VpdGUvcGVyZnNjaGVtYS90L2RkbF9mc19ieV9ldmVudF9uYW1lLnRlc3QKICAgICAgbXlzcWwt dGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3QvZGRsX2ZzX2J5X2luc3RhbmNlLnRlc3QKICAgICAgbXlz cWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3QvZGRsX211dGV4X2luc3RhbmNlcy50ZXN0CiAgICAg IG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS90L2RkbF9wZXJmb3JtYW5jZV90aW1lcnMudGVz dAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9kZGxfcndsb2NrX2luc3RhbmNl cy50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS90L2RkbF9zZXR1cF9jb25z dW1lcnMudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9kZGxfc2V0dXBf aW5zdHJ1bWVudHMudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9kZGxf c2V0dXBfdGltZXJzLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3QvZGRs X3RocmVhZHMudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9kaXNhYmxl ZC5kZWYKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3QvZG1sX2NvbmRfaW5zdGFu Y2VzLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3QvZG1sX2V2ZW50c193 YWl0c19jdXJyZW50LnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3QvZG1s X2V2ZW50c193YWl0c19oaXN0b3J5LnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2No ZW1hL3QvZG1sX2V2ZW50c193YWl0c19oaXN0b3J5X2xvbmcudGVzdAogICAgICBteXNxbC10ZXN0 L3N1aXRlL3BlcmZzY2hlbWEvdC9kbWxfZXdzX2J5X2luc3RhbmNlLnRlc3QKICAgICAgbXlzcWwt dGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3QvZG1sX2V3c19ieV90aHJlYWRfYnlfZXZlbnRfbmFtZS50 ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS90L2RtbF9ld3NfZ2xvYmFsX2J5 X2V2ZW50X25hbWUudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9kbWxf ZmlsZV9pbnN0YW5jZXMudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9k bWxfZmlsZV9zdW1tYXJ5X2J5X2V2ZW50X25hbWUudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRl L3BlcmZzY2hlbWEvdC9kbWxfZmlsZV9zdW1tYXJ5X2J5X2luc3RhbmNlLnRlc3QKICAgICAgbXlz cWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3QvZG1sX211dGV4X2luc3RhbmNlcy50ZXN0CiAgICAg IG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS90L2RtbF9wZXJmb3JtYW5jZV90aW1lcnMudGVz dAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9kbWxfcndsb2NrX2luc3RhbmNl cy50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS90L2RtbF9zZXR1cF9jb25z dW1lcnMudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9kbWxfc2V0dXBf aW5zdHJ1bWVudHMudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9kbWxf c2V0dXBfdGltZXJzLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3QvZG1s X3RocmVhZHMudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9mdW5jX2Zp bGVfaW8udGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9mdW5jX211dGV4 LnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3QvZ2xvYmFsX3JlYWRfbG9j ay50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS90L2luZm9ybWF0aW9uX3Nj aGVtYS50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS90L21pc2MudGVzdAog ICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9teWlzYW1fZmlsZV9pby50ZXN0CiAg ICAgIG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS90L25vX3RocmVhZHMudGVzdAogICAgICBt eXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9vbmVfdGhyZWFkX3Blcl9jb24udGVzdAogICAg ICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9wZnNfdXBncmFkZS50ZXN0CiAgICAgIG15 c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS90L3ByaXZpbGVnZS50ZXN0CiAgICAgIG15c3FsLXRl c3Qvc3VpdGUvcGVyZnNjaGVtYS90L3F1ZXJ5X2NhY2hlLnRlc3QKICAgICAgbXlzcWwtdGVzdC9z dWl0ZS9wZXJmc2NoZW1hL3QvcmVhZF9vbmx5LnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9w ZXJmc2NoZW1hL3QvcmVsYXlsb2cudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hl bWEvdC9zY2hlbWEudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9zZWxl Y3RzLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3Qvc2VydmVyX2luaXQu dGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9zaG9ydF9vcHRpb25fMS50 ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS90L3Nob3J0X29wdGlvbl8yLnRl c3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3Qvc3RhcnRfc2VydmVyX25vX2Nv bmRfY2xhc3MudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9zdGFydF9z ZXJ2ZXJfbm9fY29uZF9pbnN0LnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1h L3Qvc3RhcnRfc2VydmVyX25vX2ZpbGVfY2xhc3MudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRl L3BlcmZzY2hlbWEvdC9zdGFydF9zZXJ2ZXJfbm9fZmlsZV9pbnN0LnRlc3QKICAgICAgbXlzcWwt dGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3Qvc3RhcnRfc2VydmVyX25vX211dGV4X2NsYXNzLnRlc3QK ICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3Qvc3RhcnRfc2VydmVyX25vX211dGV4 X2luc3QudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9zdGFydF9zZXJ2 ZXJfbm9fcndsb2NrX2NsYXNzLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1h L3Qvc3RhcnRfc2VydmVyX25vX3J3bG9ja19pbnN0LnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0 ZS9wZXJmc2NoZW1hL3Qvc3RhcnRfc2VydmVyX25vX3RocmVhZF9jbGFzcy50ZXN0CiAgICAgIG15 c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS90L3N0YXJ0X3NlcnZlcl9ub190aHJlYWRfaW5zdC50 ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS90L3N0YXJ0X3NlcnZlcl9vZmYu dGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9zdGFydF9zZXJ2ZXJfb24u dGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC90YW1wZXJlZF9wZXJmc2No ZW1hX3RhYmxlMS50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS90L3RocmVh ZF9jYWNoZS50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYV9zdHJlc3MvaW5j bHVkZS9zZXR0aW5ncy5pbmMKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hX3N0cmVz cy90L21vZGlmeS50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYV9zdHJlc3Mv dC9yZWFkLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hX3N0cmVzcy90L3Nl dHVwLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hX3N0cmVzcy90L3dvcmsu dGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3JwbC90L3JwbF9pcF9taXgudGVzdAogICAgICBt eXNxbC10ZXN0L3N1aXRlL3JwbC90L3JwbF9pcF9taXgyLnRlc3QKICAgICAgbXlzcWwtdGVzdC9z dWl0ZS9ycGwvdC9ycGxfaXB2NF9hc19pcHY2LnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9y cGwvdC9ycGxfaXB2Ni50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC9hbGxf dmFycy50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC9wZXJmb3JtYW5jZV9z Y2hlbWFfYmFzaWMudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3QvcGZzX2V2 ZW50c193YWl0c19oaXN0b3J5X2xvbmdfc2l6ZV9iYXNpYy50ZXN0CiAgICAgIG15c3FsLXRlc3Qv c3VpdGUvc3lzX3ZhcnMvdC9wZnNfZXZlbnRzX3dhaXRzX2hpc3Rvcnlfc2l6ZV9iYXNpYy50ZXN0 CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC9wZnNfbWF4X2NvbmRfY2xhc3Nlc19i YXNpYy50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC9wZnNfbWF4X2NvbmRf aW5zdGFuY2VzX2Jhc2ljLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L3Bm c19tYXhfZmlsZV9jbGFzc2VzX2Jhc2ljLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNf dmFycy90L3Bmc19tYXhfZmlsZV9oYW5kbGVzX2Jhc2ljLnRlc3QKICAgICAgbXlzcWwtdGVzdC9z dWl0ZS9zeXNfdmFycy90L3Bmc19tYXhfZmlsZV9pbnN0YW5jZXNfYmFzaWMudGVzdAogICAgICBt eXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3QvcGZzX21heF9tdXRleF9jbGFzc2VzX2Jhc2ljLnRl c3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L3Bmc19tYXhfbXV0ZXhfaW5zdGFu Y2VzX2Jhc2ljLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L3Bmc19tYXhf cndsb2NrX2NsYXNzZXNfYmFzaWMudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJz L3QvcGZzX21heF9yd2xvY2tfaW5zdGFuY2VzX2Jhc2ljLnRlc3QKICAgICAgbXlzcWwtdGVzdC9z dWl0ZS9zeXNfdmFycy90L3Bmc19tYXhfdGFibGVfaGFuZGxlc19iYXNpYy50ZXN0CiAgICAgIG15 c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC9wZnNfbWF4X3RhYmxlX2luc3RhbmNlc19iYXNpYy50 ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC9wZnNfbWF4X3RocmVhZF9jbGFz c2VzX2Jhc2ljLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L3Bmc19tYXhf dGhyZWFkX2luc3RhbmNlc19iYXNpYy50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9oYW5kbGVyX3Jl YWRfbGFzdC50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9pcHY0X2FzX2lwdjYudGVzdAogICAgICBt eXNxbC10ZXN0L3QvaXB2Ni50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9teXNxbGQtLWhlbHAtbm90 d2luLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L215c3FsZC0taGVscC13aW4udGVzdAogICAgICBt eXNxbC10ZXN0L3QvcGFyc2VyX3N0YWNrLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L3Nob3dfY2hl Y2sudGVzdAogICAgICBteXNxbC10ZXN0L3Qvc2lnbmFsLnRlc3QKICAgICAgbXlzcWwtdGVzdC90 L3NpZ25hbF9jb2RlLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L3NpZ25hbF9kZW1vMS50ZXN0CiAg ICAgIG15c3FsLXRlc3QvdC9zaWduYWxfZGVtbzIudGVzdAogICAgICBteXNxbC10ZXN0L3Qvc2ln bmFsX2RlbW8zLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L3NpZ25hbF9zcWxtb2RlLnRlc3QKICAg ICAgbXlzcWwtdGVzdC90L3NwLWxvY2sudGVzdAo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9p bm5vYmFzZS9idHIvYnRyMGN1ci5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3Vy LmMJcmV2aWQ6Ympvcm4ubXVuY2hAb3JhY2xlLmNvbS0yMDExMTAxOTIxNDQxNy1lbW5idXkwNDl1 ZjJxcDE2CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYwlyZXZpZDptYXJrby5t YWtlbGFAb3JhY2xlLmNvbS0yMDExMTAyMTAzNTQ0OS1iOGhsdHozeTBpN2FtNnpiCkBAIC0zNTQy LDE2ICszNTQyLDExIEBAIGJ0cl9yZWNvcmRfbm90X251bGxfZmllbGRfaW5fcmVjKAogCX0KIAog CWZvciAoaSA9IDA7IGkgPCBuX3VuaXF1ZTsgaSsrKSB7Ci0JCXVsaW50CXJlY19sZW47Ci0KLQkJ cmVjX2dldF9udGhfZmllbGRfb2ZmcyhvZmZzZXRzLCBpLCAmcmVjX2xlbik7Ci0KLQkJaWYgKHJl Y19sZW4gIT0gVU5JVl9TUUxfTlVMTCkgewotCQkJbl9ub3RfbnVsbFtpXSsrOwotCQl9IGVsc2Ug ewotCQkJLyogQnJlYWsgaWYgd2UgaGl0IHRoZSBmaXJzdCBOVUxMIHZhbHVlICovCisJCWlmIChy ZWNfb2Zmc19udGhfc3FsX251bGwob2Zmc2V0cywgaSkpIHsKIAkJCWJyZWFrOwogCQl9CisKKwkJ bl9ub3RfbnVsbFtpXSsrOwogCX0KIH0KIApAQCAtMzY5NCw4ICszNjg5LDcgQEAgYnRyX2VzdGlt YXRlX251bWJlcl9vZl9kaWZmZXJlbnRfa2V5X3ZhbAogCiAJCQlpZiAobl9ub3RfbnVsbCkgewog CQkJCWJ0cl9yZWNvcmRfbm90X251bGxfZmllbGRfaW5fcmVjKAotCQkJCQluX2NvbHMsIG9mZnNl dHNfbmV4dF9yZWMsCi0JCQkJCW5fbm90X251bGwpOworCQkJCQluX2NvbHMsIG9mZnNldHNfbmV4 dF9yZWMsIG5fbm90X251bGwpOwogCQkJfQogCiAJCQl0b3RhbF9leHRlcm5hbF9zaXplCgpObyBi dW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==