From: marko.makela
Date: March 30 2011 12:09pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3718 to 3719)
 Bug#11877216
List-Archive: http://lists.mysql.com/commits/134249
X-Bug: 11877216
Message-Id: <201103301209.p2UC9pXg010642@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1555348080=="

--===============1555348080==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

IDM3MTkgTWFya28gTcOka2Vsw6QJMjAxMS0wMy0zMAogICAgICBCdWcjMTE4NzcyMTYgSW5ub0RC
IHRvbyBlYWdlciB0byBjb21taXQgc3VpY2lkZSBvbiBhIGJ1c3kgc2VydmVyCiAgICAgIAogICAg
ICBzeW5jX2FycmF5X3ByaW50X2xvbmdfd2FpdHMoKTogUmV0dXJuIHRoZSBsb25nZXN0IHdhaXRp
bmcgdGhyZWFkIElECiAgICAgIGFuZCB0aGUgbG9uZ2VzdCB3YWl0ZWQtZm9yIGxvY2suIE9ubHkg
aWYgdGhvc2UgcmVtYWluIHVuY2hhbmdlZAogICAgICBiZXR3ZWVuIGNhbGxzIGluIHNydl9lcnJv
cl9tb25pdG9yX3RocmVhZCgpLCBpbmNyZW1lbnQKICAgICAgZmF0YWxfY250LiBPdGhlcndpc2Us
IHJlc2V0IGZhdGFsX2NudC4KICAgICAgCiAgICAgIEJhY2tncm91bmQ6IFRoZXJlIGlzIGEgYnVp
bHQtaW4gd2F0Y2hkb2cgaW4gSW5ub0RCIHdob3NlIHB1cnBvc2UgaXMgdG8KICAgICAga2lsbCB0
aGUgc2VydmVyIHdoZW4gc29tZSB0aHJlYWQgaXMgc3R1Y2sgd2FpdGluZyBmb3IgYSBtdXRleCBv
cgogICAgICBydy1sb2NrLiBCZWZvcmUgdGhpcyBmaXgsIHRoZSBsb2dpYyB3YXMgZmxhd2VkLgog
ICAgICAKICAgICAgVGhlIGZ1bmN0aW9uIHN5bmNfYXJyYXlfcHJpbnRfbG9uZ193YWl0cygpIHJl
dHVybnMgVFJVRSBpZiBpdCBmaW5kcyBhCiAgICAgIGxvY2sgd2FpdCB0aGF0IGV4Y2VlZHMgMTAg
bWludXRlcyAoc3J2X2ZhdGFsX3NlbWFwaG9yZV93YWl0X3RocmVzaG9sZCkuCiAgICAgIFRoZSBm
dW5jdGlvbiBzcnZfZXJyb3JfbW9uaXRvcl90aHJlYWQoKSB3aWxsIGtpbGwgdGhlIHNlcnZlciBp
ZiB0aGlzCiAgICAgIGhhcHBlbnMgMTAgdGltZXMgaW4gYSByb3cgKGZhdGFsX2NudCByZWFjaGVz
IDEwKSwgY2hlY2tlZCBldmVyeSAzMAogICAgICBzZWNvbmRzLiBUaGlzIGlzIHdyb25nLCBiZWNh
dXNlIHRoaXMgc2l0dWF0aW9uIGRvZXMgbm90IG1lYW4gdGhhdCB0aGUKICAgICAgc2VydmVyIGlz
IGh1bmcuIElmIHRoZSBzZXJ2ZXIgaXMgdmVyeSBidXN5IGZvciBhIGxpdHRsZSBvdmVyIDE1CiAg
ICAgIG1pbnV0ZXMsIGl0IHdpbGwgYmUga2lsbGVkLgogICAgICAKICAgICAgQ29uc2lkZXIgdGhp
cyBleGFtcGxlLiBUaHJlYWQgVDEgaXMgd2FpdGluZyBmb3IgbXV0ZXggTS4gU29tZSB0aW1lCiAg
ICAgIGxhdGVyLCB0aHJlYWRzIFQyLi5UbiBzdGFydCB3YWl0aW5nIGZvciB0aGUgc2FtZSBtdXRl
eCBNLiBJZiBUMSBrZWVwcwogICAgICB3YWl0aW5nIGZvciA2MDAgc2Vjb25kcywgZmF0YWxfY250
IHdpbGwgYmUgaW5jcmVtZW50ZWQgdG8gMS4gU28gZmFyLAogICAgICBzbyBnb29kLiBOb3csIGlm
IE0gaXMgZ3JhbnRlZCB0byBUMSwgdGhlIHNlcnZlciB3YXMgb2J2aW91c2x5IG5vdAogICAgICBz
dHVjay4gQnV0LCBUMi4uVG4ga2VlcHMgd2FpdGluZywgYW5kIHRoZWlyIHdhaXQgdGltZSB3aWxs
IGJlIGxvbmdlcgogICAgICB0aGFuIDYwMCBzZWNvbmRzLiBJZiA1IG1pbnV0ZXMgbGF0ZXIsIHNv
bWUgVG4gaGFzIHN0aWxsIGJlZW4gd2FpdGluZwogICAgICBmb3IgbW9yZSB0aGFuIDEwIG1pbnV0
ZXMgZm9yIHRoZSBtdXRleCBNLCB0aGUgc2VydmVyIGNhbiBiZSBraWxsZWQsCiAgICAgIGV2ZW4g
dGhvdWdoIGl0IGlzIG5vdCBzdHVjay4KICAgICAgCiAgICAgIHJiOjYyMiBhcHByb3ZlZCBieSBK
aW1teSBZYW5nCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9z
eW5jMGFyci5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzcnYuYwogICAgICBzdG9y
YWdlL2lubm9iYXNlL3N5bmMvc3luYzBhcnIuYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4v
Q2hhbmdlTG9nCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3N5bmMwYXJyLmgK
ICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Nydi9zcnYwc3J2LmMKICAgICAgc3RvcmFnZS9p
bm5vZGJfcGx1Z2luL3N5bmMvc3luYzBhcnIuYwogMzcxOCBWYXNpbCBEaW1vdgkyMDExLTAzLTI4
CiAgICAgIFN0b3JlIHRoZSAnXDAnLXRlcm1pbmF0ZWQgcXVlcnkgaW4gcm93LT50cnhfcXVlcnkK
ICAgICAgCiAgICAgIFRoaXMgcHJvYmxlbSB3YXMgaW50cm9kdWNlZCBpbgogICAgICBtYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxNDEzMDgxNS15bTdqN2NmdTg4cm82a200CiAgICAgIGFu
ZCBpcyBwcm9iYWJseSB0aGUgcmVhc29uIGZvciB0aGUgZm9sbG93aW5nIHZhbGdyaW5kIHdhcm5p
bmc6CiAgICAgIAogICAgICBmcm9tIGh0dHA6Ly9idWdzLm15c3FsLmNvbS81MjY5MSAsIGh0dHA6
Ly9idWdzLm15c3FsLmNvbS9maWxlLnBocD9pZD0xNjg4MCA6CiAgICAgIAogICAgICBWZXJzaW9u
OiAnNS42LjMtbTUtdmFsZ3JpbmQtbWF4LWRlYnVnJyAgc29ja2V0OiAnL3RtcC9teXNxbC5zb2Nr
JyAgcG9ydDogMzMwNiAgU291cmNlIGRpc3RyaWJ1dGlvbgogICAgICA9PTE0OTQ3PT0gVGhyZWFk
IDE4OgogICAgICA9PTE0OTQ3PT0gQ29uZGl0aW9uYWwganVtcCBvciBtb3ZlIGRlcGVuZHMgb24g
dW5pbml0aWFsaXNlZCB2YWx1ZShzKQogICAgICA9PTE0OTQ3PT0gICAgYXQgMHg0QTA2MzE4OiBf
X0dJX3N0cmxlbiAobWNfcmVwbGFjZV9zdHJtZW0uYzoyODQpCiAgICAgID09MTQ5NDc9PSAgICBi
eSAweDlGM0Q3QTogZmlsbF9pbm5vZGJfdHJ4X2Zyb21fY2FjaGUodHJ4X2lfc19jYWNoZV9zdHJ1
Y3QqLCBUSEQqLCBUQUJMRSopIChpX3MuY2M6NTkxKQogICAgICA9PTE0OTQ3PT0gICAgYnkgMHg5
RjREN0Q6IHRyeF9pX3NfY29tbW9uX2ZpbGxfdGFibGUoVEhEKiwgVEFCTEVfTElTVCosIEl0ZW0q
KSAoaV9zLmNjOjEyMzgpCiAgICAgID09MTQ5NDc9PSAgICBieSAweDc2ODlGMzogZ2V0X3NjaGVt
YV90YWJsZXNfcmVzdWx0KEpPSU4qLCBlbnVtX3NjaGVtYV90YWJsZV9zdGF0ZSkgKHNxbF9zaG93
LmNjOjY3NDUpCiAgICAgID09MTQ5NDc9PSAgICBieSAweDcxNUE3NTogSk9JTjo6ZXhlYygpIChz
cWxfc2VsZWN0LmNjOjI4NjEpCiAgICAgID09MTQ5NDc9PSAgICBieSAweDcxODVCRDogbXlzcWxf
c2VsZWN0KFRIRCosIEl0ZW0qKiosIFRBQkxFX0xJU1QqLCB1bnNpZ25lZCBpbnQsIExpc3Q8SXRl
bT4mLCBJdGVtKiwgdW5zaWduZWQgaW50LCBzdF9vcmRlciosIHN0X29yZGVyKiwgSXRlbSosIHN0
X29yZGVyKiwgdW5zaWduZWQgbG9uZyBsb25nLCBzZWxlY3RfcmVzdWx0Kiwgc3Rfc2VsZWN0X2xl
eF91bml0Kiwgc3Rfc2VsZWN0X2xleCopIChzcWxfc2VsZWN0LmNjOjM2MDkpCiAgICAgID09MTQ5
NDc9PSAgICBieSAweDcwRTgyMzogaGFuZGxlX3NlbGVjdChUSEQqLCBMRVgqLCBzZWxlY3RfcmVz
dWx0KiwgdW5zaWduZWQgbG9uZykgKHNxbF9zZWxlY3QuY2M6MzE5KQogICAgICA9PTE0OTQ3PT0g
ICAgYnkgMHg2RjIzMDU6IGV4ZWN1dGVfc3FsY29tX3NlbGVjdChUSEQqLCBUQUJMRV9MSVNUKikg
KHNxbF9wYXJzZS5jYzo0NTU3KQogICAgICA9PTE0OTQ3PT0gICAgYnkgMHg2RUFFRDQ6IG15c3Fs
X2V4ZWN1dGVfY29tbWFuZChUSEQqKSAoc3FsX3BhcnNlLmNjOjIxMzUpCiAgICAgID09MTQ5NDc9
PSAgICBieSAweDZGNDRDOTogbXlzcWxfcGFyc2UoVEhEKiwgY2hhciosIHVuc2lnbmVkIGludCwg
UGFyc2VyX3N0YXRlKikgKHNxbF9wYXJzZS5jYzo1NTk3KQogICAgICA9PTE0OTQ3PT0gICAgYnkg
MHg2RTg2NEI6IGRpc3BhdGNoX2NvbW1hbmQoZW51bV9zZXJ2ZXJfY29tbWFuZCwgVEhEKiwgY2hh
ciosIHVuc2lnbmVkIGludCkgKHNxbF9wYXJzZS5jYzoxMDkzKQogICAgICA9PTE0OTQ3PT0gICAg
YnkgMHg2RTc4NUU6IGRvX2NvbW1hbmQoVEhEKikgKHNxbF9wYXJzZS5jYzo4MTUpCiAgICAgID09
MTQ5NDc9PSAgICBieSAweDZDMThERDogZG9faGFuZGxlX29uZV9jb25uZWN0aW9uKFRIRCopIChz
cWxfY29ubmVjdC5jYzo3NzEpCiAgICAgID09MTQ5NDc9PSAgICBieSAweDZDMTQ2RTogaGFuZGxl
X29uZV9jb25uZWN0aW9uIChzcWxfY29ubmVjdC5jYzo3MDcpCiAgICAgID09MTQ5NDc9PSAgICBi
eSAweDMwRTE4MDc3NjA6IHN0YXJ0X3RocmVhZCAocHRocmVhZF9jcmVhdGUuYzozMDEpCiAgICAg
ID09MTQ5NDc9PSAgICBieSAweDM1RUE2NzBGOiA/Pz8KICAgICAgPT0xNDk0Nz09ICBVbmluaXRp
YWxpc2VkIHZhbHVlIHdhcyBjcmVhdGVkIGJ5IGEgaGVhcCBhbGxvY2F0aW9uCiAgICAgID09MTQ5
NDc9PSAgICBhdCAweDRBMDUxNUQ6IG1hbGxvYyAodmdfcmVwbGFjZV9tYWxsb2MuYzoxOTUpCiAg
ICAgID09MTQ5NDc9PSAgICBieSAweEI0Qjk0ODogbWVtX2FyZWFfYWxsb2MgKG1lbTBwb29sLmM6
Mzg1KQogICAgICA9PTE0OTQ3PT0gICAgYnkgMHhCNEEyN0M6IG1lbV9oZWFwX2NyZWF0ZV9ibG9j
ayAobWVtMG1lbS5jOjMzMykKICAgICAgPT0xNDk0Nz09ICAgIGJ5IDB4QjRBNTMwOiBtZW1faGVh
cF9hZGRfYmxvY2sgKG1lbTBtZW0uYzo0NDYpCiAgICAgID09MTQ5NDc9PSAgICBieSAweEIwRDJB
NDogbWVtX2hlYXBfYWxsb2MgKG1lbTBtZW0uaWM6MTg2KQogICAgICA9PTE0OTQ3PT0gICAgYnkg
MHhCMEQ5QzI6IGhhX3N0b3JhZ2VfcHV0X21lbWxpbSAoaGEwc3RvcmFnZS5jOjExOCkKICAgICAg
PT0xNDk0Nz09ICAgIGJ5IDB4QTQ3OUQ4OiBmaWxsX3RyeF9yb3cgKHRyeDBpX3MuYzo1MjEpCiAg
ICAgID09MTQ5NDc9PSAgICBieSAweEE0OTBFOTogZmV0Y2hfZGF0YV9pbnRvX2NhY2hlICh0cngw
aV9zLmM6MTMxOSkKICAgICAgPT0xNDk0Nz09ICAgIGJ5IDB4QTQ5MUJBOiB0cnhfaV9zX3Bvc3Np
Ymx5X2ZldGNoX2RhdGFfaW50b19jYWNoZSAodHJ4MGlfcy5jOjEzNTIpCiAgICAgID09MTQ5NDc9
PSAgICBieSAweDlGNENFNzogdHJ4X2lfc19jb21tb25fZmlsbF90YWJsZShUSEQqLCBUQUJMRV9M
SVNUKiwgSXRlbSopIChpX3MuY2M6MTIyMSkKICAgICAgPT0xNDk0Nz09ICAgIGJ5IDB4NzY4OUYz
OiBnZXRfc2NoZW1hX3RhYmxlc19yZXN1bHQoSk9JTiosIGVudW1fc2NoZW1hX3RhYmxlX3N0YXRl
KSAoc3FsX3Nob3cuY2M6Njc0NSkKICAgICAgPT0xNDk0Nz09ICAgIGJ5IDB4NzE1QTc1OiBKT0lO
OjpleGVjKCkgKHNxbF9zZWxlY3QuY2M6Mjg2MSkKICAgICAgPT0xNDk0Nz09ICAgIGJ5IDB4NzE4
NUJEOiBteXNxbF9zZWxlY3QoVEhEKiwgSXRlbSoqKiwgVEFCTEVfTElTVCosIHVuc2lnbmVkIGlu
dCwgTGlzdDxJdGVtPiYsIEl0ZW0qLCB1bnNpZ25lZCBpbnQsIHN0X29yZGVyKiwgc3Rfb3JkZXIq
LCBJdGVtKiwgc3Rfb3JkZXIqLCB1bnNpZ25lZCBsb25nIGxvbmcsIHNlbGVjdF9yZXN1bHQqLCBz
dF9zZWxlY3RfbGV4X3VuaXQqLCBzdF9zZWxlY3RfbGV4KikgKHNxbF9zZWxlY3QuY2M6MzYwOSkK
ICAgICAgPT0xNDk0Nz09ICAgIGJ5IDB4NzBFODIzOiBoYW5kbGVfc2VsZWN0KFRIRCosIExFWCos
IHNlbGVjdF9yZXN1bHQqLCB1bnNpZ25lZCBsb25nKSAoc3FsX3NlbGVjdC5jYzozMTkpCiAgICAg
ID09MTQ5NDc9PSAgICBieSAweDZGMjMwNTogZXhlY3V0ZV9zcWxjb21fc2VsZWN0KFRIRCosIFRB
QkxFX0xJU1QqKSAoc3FsX3BhcnNlLmNjOjQ1NTcpCiAgICAgID09MTQ5NDc9PSAgICBieSAweDZF
QUVENDogbXlzcWxfZXhlY3V0ZV9jb21tYW5kKFRIRCopIChzcWxfcGFyc2UuY2M6MjEzNSkKICAg
ICAgPT0xNDk0Nz09ICAgIGJ5IDB4NkY0NEM5OiBteXNxbF9wYXJzZShUSEQqLCBjaGFyKiwgdW5z
aWduZWQgaW50LCBQYXJzZXJfc3RhdGUqKSAoc3FsX3BhcnNlLmNjOjU1OTcpCiAgICAgID09MTQ5
NDc9PSAgICBieSAweDZFODY0QjogZGlzcGF0Y2hfY29tbWFuZChlbnVtX3NlcnZlcl9jb21tYW5k
LCBUSEQqLCBjaGFyKiwgdW5zaWduZWQgaW50KSAoc3FsX3BhcnNlLmNjOjEwOTMpCiAgICAgID09
MTQ5NDc9PSAgICBieSAweDZFNzg1RTogZG9fY29tbWFuZChUSEQqKSAoc3FsX3BhcnNlLmNjOjgx
NSkKICAgICAgPT0xNDk0Nz09ICAgIGJ5IDB4NkMxOEREOiBkb19oYW5kbGVfb25lX2Nvbm5lY3Rp
b24oVEhEKikgKHNxbF9jb25uZWN0LmNjOjc3MSkKICAgICAgPT0xNDk0Nz09ICAgIGJ5IDB4NkMx
NDZFOiBoYW5kbGVfb25lX2Nvbm5lY3Rpb24gKHNxbF9jb25uZWN0LmNjOjcwNykKICAgICAgPT0x
NDk0Nz09ICAgIGJ5IDB4MzBFMTgwNzc2MDogc3RhcnRfdGhyZWFkIChwdGhyZWFkX2NyZWF0ZS5j
OjMwMSkKICAgICAgPT0xNDk0Nz09ICAgIGJ5IDB4MzVFQTY3MEY6ID8/PwogICAgICAKICAgICAg
CiAgICAgIChnZGIpIGJ0CiAgICAgICMwICAweDAwMDAwMDAwMDRhMDYzMTggaW4gX3ZnclpVX2xp
YmNaZHNvWmFfX19HSV9zdHJsZW4gKHN0cj0weDMwMjZiZmEwICJpbnNlcnQgaW50byBgYmxvYnRl
c3RgIHNldCBgZGF0YWA9J3BrZWZ4eHBrYWxwYWJ6Z3Jjemx4ZWZrcmVxbGplcWJ2enJjbmh2aHNq
c2Zudnh6anNsdGZ1aW5jZmZpZ2RrbWh2dmNtbnNlbHV6Z2J0ZWRyZm14dm5yZG16ZXNiaW5qZ3d2
aGFya3BnanBscmxucXVkZmlkYnF3Z2J5a3VweWN4enlpa3pxaW5jbnNqcnhnbmNxemxneXF3amRi
anVsenRnc2ZmeHBqZ3ltc25udGRpYnZrbHdxeWxtd2hzbWRza21sbHh1d2FmYWJkam53bHlvZmtu
d3VpeGl5cmducGxtZXJmZGV3Z2l6a2Roem5pdGVzZnFlcHNxYmJ3a2RlcGttam9zZXl4am9mbW1q
YXFkaXB3b3BmcndpZG1ocWJ0b3Zkc2x2YXl4Y25wZXd6aHBwZWV0YmxjY3BwbmlhbWV6aWJ1b2lu
dmx4a2FmcGNtb3phd3RwbGZwZXB4d2x3aHltc3VyYWV6Y3d2anF6d29nc296b2Rsc2Z6aml5cmNh
bGpqaHF3ZHJjamF3dmVsaGVmenphZXh2Y2J5b3JsY3l1cHF3Z2p1YW1pcXBpcHV0dG5kandjc3V5
emRmaHV4c3d1b3docnpkdnJpd3J4cW1jcXRodnp6enZpdmJhYmJuaGRidGNmZHRnc3N2bWlycmNk
ZG55dG5jdGN2cXBsd3l0eHh6eGVsbGRod2FoYWx6eHZneW5haXdqeWV6aHhxaGxzcXVkbmdla29j
ZnZsYnFwcnhxaHlod2Jhb21ncWl3a3BmZ3VvaHV2bG5odHJzc3pnYWN4aGh6ZXBweXF3ZndhYmlx
emd5emtwZXJpaWR5dW5yeWtvcHlzdmxjeHdocmNib2V0amx0YXdkamVyZ2Fsc2Z2YXhuY216b3pu
cnl1bXJqbW5jdmh2eHF2cWhoYnpubmlma2d1dWlmZm1scmJtZ3d0enZudXdsYWd1aXhxYWRrdXBm
aGFzYmJ4bndrcnZzZmhycWFuZm12anR6ZnFvZHR1dGtqbHhmY29ndHNqeXdyZGdtemdzemp0c21p
bWFlbHN2ZWF5cXJ3dmlxd3dlZmV6aXVhcXNxcGF1eHBuemhheGp0a2RmdnZvZG5pd2V6c2tieGZ4
c3p5bml5emt6eG5nY2Z3Z2pseXJsc2ttcnp4cW5wdHdsaWxzeHlidWd1YWZ4eGt2cnl5anJua2ho
Y214dXVzaXRhZmxhaXV4amh5Zm56a2FobGdtYXN6dWpxbWZkaHlwcGRucHdlcWFubXZ6Z2pmeXpq
b2xibXByaG51dXhleHRjYXh6aWNmdnN1b2NocHJtbGYiLi4uKSBhdCBtY19yZXBsYWNlX3N0cm1l
bS5jOjI4NAogICAgICAjMSAgMHgwMDAwMDAwMDAwOWYzZDdiIGluIGZpbGxfaW5ub2RiX3RyeF9m
cm9tX2NhY2hlIChjYWNoZT0weDE0NjI0NDAsIHRoZD0weDJhNDk1MDAwLCB0YWJsZT0weDJhNDIy
NTAwKSBhdCAvaG9tZS9zYmVzdGVyL2J1aWxkL2J6ci9teXNxbC10cnVuay9zdG9yYWdlL2lubm9i
YXNlL2hhbmRsZXIvaV9zLmNjOjU5MQogICAgICAjMiAgMHgwMDAwMDAwMDAwOWY0ZDdlIGluIHRy
eF9pX3NfY29tbW9uX2ZpbGxfdGFibGUgKHRoZD0weDJhNDk1MDAwLCB0YWJsZXM9MHgyYTRjM2Vj
MCkgYXQgL2hvbWUvc2Jlc3Rlci9idWlsZC9ienIvbXlzcWwtdHJ1bmsvc3RvcmFnZS9pbm5vYmFz
ZS9oYW5kbGVyL2lfcy5jYzoxMjM4CiAgICAgICMzICAweDAwMDAwMDAwMDA3Njg5ZjQgaW4gZ2V0
X3NjaGVtYV90YWJsZXNfcmVzdWx0IChqb2luPTB4MzBmOTBjNDAsIGV4ZWN1dGVkX3BsYWNlPVBS
T0NFU1NFRF9CWV9KT0lOX0VYRUMpIGF0IC9ob21lL3NiZXN0ZXIvYnVpbGQvYnpyL215c3FsLXRy
dW5rL3NxbC9zcWxfc2hvdy5jYzo2NzQ1CiAgICAgICM0ICAweDAwMDAwMDAwMDA3MTVhNzYgaW4g
Sk9JTjo6ZXhlYyAodGhpcz0weDMwZjkwYzQwKSBhdCAvaG9tZS9zYmVzdGVyL2J1aWxkL2J6ci9t
eXNxbC10cnVuay9zcWwvc3FsX3NlbGVjdC5jYzoyODYxCiAgICAgICM1ICAweDAwMDAwMDAwMDA3
MTg1YmUgaW4gbXlzcWxfc2VsZWN0ICh0aGQ9MHgyYTQ5NTAwMCwgcnJlZl9wb2ludGVyX2FycmF5
PTB4MmE0OTc1OTAsIHRhYmxlcz0weDJhNGMzZWMwLCB3aWxkX251bT0xLCBmaWVsZHM9Li4uLCBj
b25kcz0weDAsIG9nX251bT0wLCBvcmRlcj0weDAsIGdyb3VwPTB4MCwgaGF2aW5nPTB4MCwgcHJv
Y19wYXJhbT0weDAsIHNlbGVjdF9vcHRpb25zPTI2ODQ2MTk1MjAsIHJlc3VsdD0weDMwMzE5NzIw
LCB1bml0PTB4MmE0OTZkMjgsIHNlbGVjdF9sZXg9MHgyYTQ5NzM3OCkgYXQgL2hvbWUvc2Jlc3Rl
ci9idWlsZC9ienIvbXlzcWwtdHJ1bmsvc3FsL3NxbF9zZWxlY3QuY2M6MzYwOQogICAgICAjNiAg
MHgwMDAwMDAwMDAwNzBlODI0IGluIGhhbmRsZV9zZWxlY3QgKHRoZD0weDJhNDk1MDAwLCBsZXg9
MHgyYTQ5NmM3OCwgcmVzdWx0PTB4MzAzMTk3MjAsIHNldHVwX3RhYmxlc19kb25lX29wdGlvbj0w
KSBhdCAvaG9tZS9zYmVzdGVyL2J1aWxkL2J6ci9teXNxbC10cnVuay9zcWwvc3FsX3NlbGVjdC5j
YzozMTkKICAgICAgIzcgIDB4MDAwMDAwMDAwMDZmMjMwNiBpbiBleGVjdXRlX3NxbGNvbV9zZWxl
Y3QgKHRoZD0weDJhNDk1MDAwLCBhbGxfdGFibGVzPTB4MmE0YzNlYzApIGF0IC9ob21lL3NiZXN0
ZXIvYnVpbGQvYnpyL215c3FsLXRydW5rL3NxbC9zcWxfcGFyc2UuY2M6NDU1NwogICAgICAjOCAg
MHgwMDAwMDAwMDAwNmVhZWQ1IGluIG15c3FsX2V4ZWN1dGVfY29tbWFuZCAodGhkPTB4MmE0OTUw
MDApIGF0IC9ob21lL3NiZXN0ZXIvYnVpbGQvYnpyL215c3FsLXRydW5rL3NxbC9zcWxfcGFyc2Uu
Y2M6MjEzNQogICAgICAjOSAgMHgwMDAwMDAwMDAwNmY0NGNhIGluIG15c3FsX3BhcnNlICh0aGQ9
MHgyYTQ5NTAwMCwgcmF3YnVmPTB4MzBkODAwNjAgInNlbGVjdCAqIGZyb20gaW5ub2RiX3RyeCIs
IGxlbmd0aD0yNCwgcGFyc2VyX3N0YXRlPTB4MzVlYTU1NDApIGF0IC9ob21lL3NiZXN0ZXIvYnVp
bGQvYnpyL215c3FsLXRydW5rL3NxbC9zcWxfcGFyc2UuY2M6NTU5NwogICAgICAjMTAgMHgwMDAw
MDAwMDAwNmU4NjRjIGluIGRpc3BhdGNoX2NvbW1hbmQgKGNvbW1hbmQ9Q09NX1FVRVJZLCB0aGQ9
MHgyYTQ5NTAwMCwgcGFja2V0PTB4MzBiYjRlMzEgInNlbGVjdCAqIGZyb20gaW5ub2RiX3RyeCIs
IHBhY2tldF9sZW5ndGg9MjQpIGF0IC9ob21lL3NiZXN0ZXIvYnVpbGQvYnpyL215c3FsLXRydW5r
L3NxbC9zcWxfcGFyc2UuY2M6MTA5MwogICAgICAjMTEgMHgwMDAwMDAwMDAwNmU3ODVmIGluIGRv
X2NvbW1hbmQgKHRoZD0weDJhNDk1MDAwKSBhdCAvaG9tZS9zYmVzdGVyL2J1aWxkL2J6ci9teXNx
bC10cnVuay9zcWwvc3FsX3BhcnNlLmNjOjgxNQogICAgICAjMTIgMHgwMDAwMDAwMDAwNmMxOGRl
IGluIGRvX2hhbmRsZV9vbmVfY29ubmVjdGlvbiAodGhkX2FyZz0weDJhNDk1MDAwKSBhdCAvaG9t
ZS9zYmVzdGVyL2J1aWxkL2J6ci9teXNxbC10cnVuay9zcWwvc3FsX2Nvbm5lY3QuY2M6NzcxCiAg
ICAgICMxMyAweDAwMDAwMDAwMDA2YzE0NmYgaW4gaGFuZGxlX29uZV9jb25uZWN0aW9uIChhcmc9
MHgyYTQ5NTAwMCkgYXQgL2hvbWUvc2Jlc3Rlci9idWlsZC9ienIvbXlzcWwtdHJ1bmsvc3FsL3Nx
bF9jb25uZWN0LmNjOjcwNwogICAgICAjMTQgMHgwMDAwMDAzMGUxODA3NzYxIGluIHN0YXJ0X3Ro
cmVhZCAoYXJnPTB4MzVlYTY3MTApIGF0IHB0aHJlYWRfY3JlYXRlLmM6MzAxCiAgICAgICMxNSAw
eDAwMDAwMDMwZTE0ZTE0ZWQgaW4gY2xvbmUgKCkgYXQgLi4vc3lzZGVwcy91bml4L3N5c3YvbGlu
dXgveDg2XzY0L2Nsb25lLlM6MTE1CiAgICAgIChnZGIpIGZyYW1lIDEKICAgICAgIzEgIDB4MDAw
MDAwMDAwMDlmM2Q3YiBpbiBmaWxsX2lubm9kYl90cnhfZnJvbV9jYWNoZSAoY2FjaGU9MHgxNDYy
NDQwLCB0aGQ9MHgyYTQ5NTAwMCwgdGFibGU9MHgyYTQyMjUwMCkgYXQgL2hvbWUvc2Jlc3Rlci9i
dWlsZC9ienIvbXlzcWwtdHJ1bmsvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2lfcy5jYzo1OTEK
ICAgICAgNTkxICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJvdy0+dHJ4X3F1
ZXJ5X2NzKTsKICAgICAgKGdkYikgbGlzdAogICAgICA1ODYgICAgICAgICAgICAgICAgICAgICBp
ZiAocm93LT50cnhfcXVlcnkpIHsKICAgICAgNTg3ICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAvKiBzdG9yZSB3aWxsIGRvIGFwcHJvcHJpYXRlIGNoYXJhY3RlciBzZXQKICAgICAgNTg4ICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICBjb252ZXJzaW9uIGNoZWNrICovCiAgICAgIDU4OSAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgZmllbGRzW0lEWF9UUlhfUVVFUlldLT5zdG9yZSgK
ICAgICAgNTkwICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJvdy0+dHJ4X3F1
ZXJ5LCBzdHJsZW4ocm93LT50cnhfcXVlcnkpLAogICAgICA1OTEgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgcm93LT50cnhfcXVlcnlfY3MpOwogICAgICA1OTIgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgIGZpZWxkc1tJRFhfVFJYX1FVRVJZXS0+c2V0X25vdG51bGwoKTsK
ICAgICAgNTkzICAgICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgNTk0ICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICBmaWVsZHNbSURYX1RSWF9RVUVSWV0tPnNldF9udWxsKCk7CiAg
ICAgIDU5NSAgICAgICAgICAgICAgICAgICAgIH0KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFn
ZS9pbm5vZGJfcGx1Z2luL3RyeC90cngwaV9zLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv
aW5ub2Jhc2UvaW5jbHVkZS9zeW5jMGFyci5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1
ZGUvc3luYzBhcnIuaAlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMzI4MDgzNDEy
LW9kdXNyeTBya2JlZW5oZDEKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3N5bmMwYXJy
LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAzMzAxMTI1NTgtNXFsZWNsc2lq
cHFnNTJiZgpAQCAtOTMsMTAgKzkzLDEzIEBAIHN5bmNfYXJyX3dha2VfdGhyZWFkc19pZl9zZW1h
X2ZyZWUodm9pZCkKIFByaW50cyB3YXJuaW5ncyBvZiBsb25nIHNlbWFwaG9yZSB3YWl0cyB0byBz
dGRlcnIuICovCiAKIGlib29sCi1zeW5jX2FycmF5X3ByaW50X2xvbmdfd2FpdHModm9pZCk7Ci0v
Kj09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KLQkJCS8qIG91dDogVFJVRSBpZiBmYXRh
bCBzZW1hcGhvcmUgd2FpdCB0aHJlc2hvbGQKLQkJCXdhcyBleGNlZWRlZCAqLworc3luY19hcnJh
eV9wcmludF9sb25nX3dhaXRzKAorLyo9PT09PT09PT09PT09PT09PT09PT09PT0qLworCQkJCS8q
IG91dDogVFJVRSBpZiBmYXRhbCBzZW1hcGhvcmUgd2FpdCB0aHJlc2hvbGQKKwkJCQl3YXMgZXhj
ZWVkZWQgKi8KKwlvc190aHJlYWRfaWRfdCoJd2FpdGVyLAkvKiBvdXQ6IGxvbmdlc3Qgd2FpdGlu
ZyB0aHJlYWQgKi8KKwljb25zdCB2b2lkKioJc2VtYSkJLyogb3V0OiBsb25nZXN0LXdhaXRlZC1m
b3Igc2VtYXBob3JlICovCisJX19hdHRyaWJ1dGVfXygobm9ubnVsbCkpOwogLyoqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKgogVmFsaWRhdGVzIHRoZSBpbnRlZ3JpdHkgb2YgdGhlIHdhaXQgYXJyYXkuIENoZWNrcwog
dGhhdCB0aGUgbnVtYmVyIG9mIHJlc2VydmVkIGNlbGxzIGVxdWFscyB0aGUgY291bnQgdmFyaWFi
bGUuICovCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHNydi5j
JwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3J2LmMJcmV2aWQ6dmFzaWwuZGltb3ZA
b3JhY2xlLmNvbS0yMDExMDMyODA4MzQxMi1vZHVzcnkwcmtiZWVuaGQxCisrKyBiL3N0b3JhZ2Uv
aW5ub2Jhc2Uvc3J2L3NydjBzcnYuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEx
MDMzMDExMjU1OC01cWxlY2xzaWpwcWc1MmJmCkBAIC0yMTgwLDkgKzIxODAsMTUgQEAgc3J2X2Vy
cm9yX21vbml0b3JfdGhyZWFkKAogCQkJb3NfdGhyZWFkX2NyZWF0ZSAqLwogewogCS8qIG51bWJl
ciBvZiBzdWNjZXNzaXZlIGZhdGFsIHRpbWVvdXRzIG9ic2VydmVkICovCi0JdWxpbnQJZmF0YWxf
Y250CT0gMDsKLQlkdWxpbnQJb2xkX2xzbjsKLQlkdWxpbnQJbmV3X2xzbjsKKwl1bGludAkJZmF0
YWxfY250CT0gMDsKKwlkdWxpbnQJCW9sZF9sc247CisJZHVsaW50CQluZXdfbHNuOworCS8qIGxv
bmdlc3Qgd2FpdGluZyB0aHJlYWQgZm9yIGEgc2VtYXBob3JlICovCisJb3NfdGhyZWFkX2lkX3QJ
d2FpdGVyCQk9IG9zX3RocmVhZF9nZXRfY3Vycl9pZCgpOworCW9zX3RocmVhZF9pZF90CW9sZF93
YWl0ZXIJPSB3YWl0ZXI7CisJLyogdGhlIHNlbWFwaG9yZSB0aGF0IGlzIGJlaW5nIHdhaXRlZCBm
b3IgKi8KKwljb25zdCB2b2lkKglzZW1hCQk9IE5VTEw7CisJY29uc3Qgdm9pZCoJb2xkX3NlbWEJ
PSBOVUxMOwogCiAJb2xkX2xzbiA9IHNydl9zdGFydF9sc247CiAKQEAgLTIyMjQsMTAgKzIyMzAs
MTEgQEAgbG9vcDoKIAkvKiBJbiBjYXNlIG11dGV4X2V4aXQgaXMgbm90IGEgbWVtb3J5IGJhcnJp
ZXIsIGl0IGlzCiAJdGhlb3JldGljYWxseSBwb3NzaWJsZSBzb21lIHRocmVhZHMgYXJlIGxlZnQg
d2FpdGluZyB0aG91Z2gKIAl0aGUgc2VtYXBob3JlIGlzIGFscmVhZHkgcmVsZWFzZWQuIFdha2Ug
dXAgdGhvc2UgdGhyZWFkczogKi8KLQkKKwogCXN5bmNfYXJyX3dha2VfdGhyZWFkc19pZl9zZW1h
X2ZyZWUoKTsKIAotCWlmIChzeW5jX2FycmF5X3ByaW50X2xvbmdfd2FpdHMoKSkgeworCWlmIChz
eW5jX2FycmF5X3ByaW50X2xvbmdfd2FpdHMoJndhaXRlciwgJnNlbWEpCisJICAgICYmIHNlbWEg
PT0gb2xkX3NlbWEgJiYgb3NfdGhyZWFkX2VxKHdhaXRlciwgb2xkX3dhaXRlcikpIHsKIAkJZmF0
YWxfY250Kys7CiAJCWlmIChmYXRhbF9jbnQgPiAxMCkgewogCkBAIC0yMjQyLDYgKzIyNDksOCBA
QCBsb29wOgogCQl9CiAJfSBlbHNlIHsKIAkJZmF0YWxfY250ID0gMDsKKwkJb2xkX3dhaXRlciA9
IHdhaXRlcjsKKwkJb2xkX3NlbWEgPSBzZW1hOwogCX0KIAogCS8qIEZsdXNoIHN0ZGVyciBzbyB0
aGF0IGEgZGF0YWJhc2UgdXNlciBnZXRzIHRoZSBvdXRwdXQKCj09PSBtb2RpZmllZCBmaWxlICdz
dG9yYWdlL2lubm9iYXNlL3N5bmMvc3luYzBhcnIuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9z
eW5jL3N5bmMwYXJyLmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDExMDMyODA4MzQx
Mi1vZHVzcnkwcmtiZWVuaGQxCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvc3luYy9zeW5jMGFyci5j
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMzMwMTEyNTU4LTVxbGVjbHNpanBx
ZzUyYmYKQEAgLTkxNiwxMCArOTE2LDEyIEBAIHN5bmNfYXJyX3dha2VfdGhyZWFkc19pZl9zZW1h
X2ZyZWUodm9pZCkKIFByaW50cyB3YXJuaW5ncyBvZiBsb25nIHNlbWFwaG9yZSB3YWl0cyB0byBz
dGRlcnIuICovCiAKIGlib29sCi1zeW5jX2FycmF5X3ByaW50X2xvbmdfd2FpdHModm9pZCkKLS8q
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0qLwotCQkJLyogb3V0OiBUUlVFIGlmIGZhdGFs
IHNlbWFwaG9yZSB3YWl0IHRocmVzaG9sZAotCQkJd2FzIGV4Y2VlZGVkICovCitzeW5jX2FycmF5
X3ByaW50X2xvbmdfd2FpdHMoCisvKj09PT09PT09PT09PT09PT09PT09PT09PSovCisJCQkJLyog
b3V0OiBUUlVFIGlmIGZhdGFsIHNlbWFwaG9yZSB3YWl0IHRocmVzaG9sZAorCQkJCXdhcyBleGNl
ZWRlZCAqLworCW9zX3RocmVhZF9pZF90Kgl3YWl0ZXIsCS8qIG91dDogbG9uZ2VzdCB3YWl0aW5n
IHRocmVhZCAqLworCWNvbnN0IHZvaWQqKglzZW1hKQkvKiBvdXQ6IGxvbmdlc3Qtd2FpdGVkLWZv
ciBzZW1hcGhvcmUgKi8KIHsKIAlzeW5jX2NlbGxfdCoJY2VsbDsKIAlpYm9vbAkJb2xkX3ZhbDsK
QEAgLTkyNywyNCArOTI5LDQwIEBAIHN5bmNfYXJyYXlfcHJpbnRfbG9uZ193YWl0cyh2b2lkKQog
CXVsaW50CQlpOwogCXVsaW50CQlmYXRhbF90aW1lb3V0ID0gc3J2X2ZhdGFsX3NlbWFwaG9yZV93
YWl0X3RocmVzaG9sZDsKIAlpYm9vbAkJZmF0YWwgPSBGQUxTRTsKKwlkb3VibGUJCWxvbmdlc3Rf
ZGlmZiA9IDA7CiAKIAlmb3IgKGkgPSAwOyBpIDwgc3luY19wcmltYXJ5X3dhaXRfYXJyYXktPm5f
Y2VsbHM7IGkrKykgewogCisJCWRvdWJsZQlkaWZmOworCQl2b2lkKgl3YWl0X29iamVjdDsKKwog
CQljZWxsID0gc3luY19hcnJheV9nZXRfbnRoX2NlbGwoc3luY19wcmltYXJ5X3dhaXRfYXJyYXks
IGkpOwogCi0JCWlmIChjZWxsLT53YWl0X29iamVjdCAhPSBOVUxMICYmIGNlbGwtPndhaXRpbmcK
LQkJICAgICYmIGRpZmZ0aW1lKHRpbWUoTlVMTCksIGNlbGwtPnJlc2VydmF0aW9uX3RpbWUpID4g
MjQwKSB7CisJCXdhaXRfb2JqZWN0ID0gY2VsbC0+d2FpdF9vYmplY3Q7CisKKwkJaWYgKHdhaXRf
b2JqZWN0ID09IE5VTEwgfHwgIWNlbGwtPndhaXRpbmcpIHsKKworCQkJY29udGludWU7CisJCX0K
KworCQlkaWZmID0gZGlmZnRpbWUodGltZShOVUxMKSwgY2VsbC0+cmVzZXJ2YXRpb25fdGltZSk7
CisKKwkJaWYgKGRpZmYgPiAyNDApIHsKIAkJCWZwdXRzKCJJbm5vREI6IFdhcm5pbmc6IGEgbG9u
ZyBzZW1hcGhvcmUgd2FpdDpcbiIsCiAJCQkgICAgICBzdGRlcnIpOwogCQkJc3luY19hcnJheV9j
ZWxsX3ByaW50KHN0ZGVyciwgY2VsbCk7CiAJCQlub3RpY2VkID0gVFJVRTsKIAkJfQogCi0JCWlm
IChjZWxsLT53YWl0X29iamVjdCAhPSBOVUxMICYmIGNlbGwtPndhaXRpbmcKLQkJICAgICYmIGRp
ZmZ0aW1lKHRpbWUoTlVMTCksIGNlbGwtPnJlc2VydmF0aW9uX3RpbWUpCi0JCSAgICA+IGZhdGFs
X3RpbWVvdXQpIHsKKwkJaWYgKGRpZmYgPiBmYXRhbF90aW1lb3V0KSB7CiAJCQlmYXRhbCA9IFRS
VUU7CiAJCX0KKworCQlpZiAoZGlmZiA+IGxvbmdlc3RfZGlmZikgeworCQkJbG9uZ2VzdF9kaWZm
ID0gZGlmZjsKKwkJCSpzZW1hID0gd2FpdF9vYmplY3Q7CisJCQkqd2FpdGVyID0gY2VsbC0+dGhy
ZWFkOworCQl9CiAJfQogCiAJaWYgKG5vdGljZWQpIHsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4v
Q2hhbmdlTG9nCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTAzMjgwODM0MTItb2R1
c3J5MHJrYmVlbmhkMQorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMzMwMTEyNTU4LTVxbGVjbHNpanBxZzUyYmYK
QEAgLTEsMyArMSw4IEBACisyMDExLTAzLTMwCVRoZSBJbm5vREIgVGVhbQorCisJKiBzcnYvc3J2
MHNydi5jLCBzeW5jL3N5bmMwYXJyLmgsIHN5bmMvc3luYzBhcnIuYzoKKwlGaXggQnVnIzExODc3
MjE2IElubm9EQiB0b28gZWFnZXIgdG8gY29tbWl0IHN1aWNpZGUgb24gYSBidXN5IHNlcnZlcgor
CiAyMDExLTAzLTE1CVRoZSBJbm5vREIgVGVhbQogCiAJKiBidHIvYnRyMGN1ci5jLCBwYWdlL3Bh
Z2UwemlwLmM6Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1
ZGUvc3luYzBhcnIuaCcKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvc3luYzBh
cnIuaAlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMzI4MDgzNDEyLW9kdXNyeTBy
a2JlZW5oZDEKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvc3luYzBhcnIuaAly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDMzMDExMjU1OC01cWxlY2xzaWpwcWc1
MmJmCkBAIC0xMTUsOCArMTE1LDExIEBAIFByaW50cyB3YXJuaW5ncyBvZiBsb25nIHNlbWFwaG9y
ZSB3YWl0cwogQHJldHVybglUUlVFIGlmIGZhdGFsIHNlbWFwaG9yZSB3YWl0IHRocmVzaG9sZCB3
YXMgZXhjZWVkZWQgKi8KIFVOSVZfSU5URVJOCiBpYm9vbAotc3luY19hcnJheV9wcmludF9sb25n
X3dhaXRzKHZvaWQpOwotLyo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PSovCitzeW5jX2Fy
cmF5X3ByaW50X2xvbmdfd2FpdHMoCisvKj09PT09PT09PT09PT09PT09PT09PT09PSovCisJb3Nf
dGhyZWFkX2lkX3QqCXdhaXRlciwJLyohPCBvdXQ6IGxvbmdlc3Qgd2FpdGluZyB0aHJlYWQgKi8K
Kwljb25zdCB2b2lkKioJc2VtYSkJLyohPCBvdXQ6IGxvbmdlc3Qtd2FpdGVkLWZvciBzZW1hcGhv
cmUgKi8KKwlfX2F0dHJpYnV0ZV9fKChub25udWxsKSk7CiAvKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBWYWxp
ZGF0ZXMgdGhlIGludGVncml0eSBvZiB0aGUgd2FpdCBhcnJheS4gQ2hlY2tzCiB0aGF0IHRoZSBu
dW1iZXIgb2YgcmVzZXJ2ZWQgY2VsbHMgZXF1YWxzIHRoZSBjb3VudCB2YXJpYWJsZS4gKi8KCj09
PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vc3J2L3NydjBzcnYuYycKLS0t
IGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Nydi9zcnYwc3J2LmMJcmV2aWQ6dmFzaWwuZGltb3ZA
b3JhY2xlLmNvbS0yMDExMDMyODA4MzQxMi1vZHVzcnkwcmtiZWVuaGQxCisrKyBiL3N0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9zcnYvc3J2MHNydi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTEwMzMwMTEyNTU4LTVxbGVjbHNpanBxZzUyYmYKQEAgLTIyMzYsNiArMjIzNiwxMiBAQCBz
cnZfZXJyb3JfbW9uaXRvcl90aHJlYWQoCiAJdWxpbnQJCWZhdGFsX2NudAk9IDA7CiAJaWJfdWlu
dDY0X3QJb2xkX2xzbjsKIAlpYl91aW50NjRfdAluZXdfbHNuOworCS8qIGxvbmdlc3Qgd2FpdGlu
ZyB0aHJlYWQgZm9yIGEgc2VtYXBob3JlICovCisJb3NfdGhyZWFkX2lkX3QJd2FpdGVyCQk9IG9z
X3RocmVhZF9nZXRfY3Vycl9pZCgpOworCW9zX3RocmVhZF9pZF90CW9sZF93YWl0ZXIJPSB3YWl0
ZXI7CisJLyogdGhlIHNlbWFwaG9yZSB0aGF0IGlzIGJlaW5nIHdhaXRlZCBmb3IgKi8KKwljb25z
dCB2b2lkKglzZW1hCQk9IE5VTEw7CisJY29uc3Qgdm9pZCoJb2xkX3NlbWEJPSBOVUxMOwogCiAJ
b2xkX2xzbiA9IHNydl9zdGFydF9sc247CiAKQEAgLTIyODQsNyArMjI5MCw4IEBAIGxvb3A6CiAK
IAlzeW5jX2Fycl93YWtlX3RocmVhZHNfaWZfc2VtYV9mcmVlKCk7CiAKLQlpZiAoc3luY19hcnJh
eV9wcmludF9sb25nX3dhaXRzKCkpIHsKKwlpZiAoc3luY19hcnJheV9wcmludF9sb25nX3dhaXRz
KCZ3YWl0ZXIsICZzZW1hKQorCSAgICAmJiBzZW1hID09IG9sZF9zZW1hICYmIG9zX3RocmVhZF9l
cSh3YWl0ZXIsIG9sZF93YWl0ZXIpKSB7CiAJCWZhdGFsX2NudCsrOwogCQlpZiAoZmF0YWxfY250
ID4gMTApIHsKIApAQCAtMjI5OSw2ICsyMzA2LDggQEAgbG9vcDoKIAkJfQogCX0gZWxzZSB7CiAJ
CWZhdGFsX2NudCA9IDA7CisJCW9sZF93YWl0ZXIgPSB3YWl0ZXI7CisJCW9sZF9zZW1hID0gc2Vt
YTsKIAl9CiAKIAkvKiBGbHVzaCBzdGRlcnIgc28gdGhhdCBhIGRhdGFiYXNlIHVzZXIgZ2V0cyB0
aGUgb3V0cHV0Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3N5bmMv
c3luYzBhcnIuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3N5bmMvc3luYzBhcnIuYwly
ZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMzI4MDgzNDEyLW9kdXNyeTBya2JlZW5o
ZDEKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3N5bmMvc3luYzBhcnIuYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDMzMDExMjU1OC01cWxlY2xzaWpwcWc1MmJmCkBAIC05
MTQsOCArOTE0LDEwIEBAIFByaW50cyB3YXJuaW5ncyBvZiBsb25nIHNlbWFwaG9yZSB3YWl0cwog
QHJldHVybglUUlVFIGlmIGZhdGFsIHNlbWFwaG9yZSB3YWl0IHRocmVzaG9sZCB3YXMgZXhjZWVk
ZWQgKi8KIFVOSVZfSU5URVJOCiBpYm9vbAotc3luY19hcnJheV9wcmludF9sb25nX3dhaXRzKHZv
aWQpCi0vKj09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KK3N5bmNfYXJyYXlfcHJpbnRf
bG9uZ193YWl0cygKKy8qPT09PT09PT09PT09PT09PT09PT09PT09Ki8KKwlvc190aHJlYWRfaWRf
dCoJd2FpdGVyLAkvKiE8IG91dDogbG9uZ2VzdCB3YWl0aW5nIHRocmVhZCAqLworCWNvbnN0IHZv
aWQqKglzZW1hKQkvKiE8IG91dDogbG9uZ2VzdC13YWl0ZWQtZm9yIHNlbWFwaG9yZSAqLwogewog
CXN5bmNfY2VsbF90KgljZWxsOwogCWlib29sCQlvbGRfdmFsOwpAQCAtOTIzLDI0ICs5MjUsNDAg
QEAgc3luY19hcnJheV9wcmludF9sb25nX3dhaXRzKHZvaWQpCiAJdWxpbnQJCWk7CiAJdWxpbnQJ
CWZhdGFsX3RpbWVvdXQgPSBzcnZfZmF0YWxfc2VtYXBob3JlX3dhaXRfdGhyZXNob2xkOwogCWli
b29sCQlmYXRhbCA9IEZBTFNFOworCWRvdWJsZQkJbG9uZ2VzdF9kaWZmID0gMDsKIAogCWZvciAo
aSA9IDA7IGkgPCBzeW5jX3ByaW1hcnlfd2FpdF9hcnJheS0+bl9jZWxsczsgaSsrKSB7CiAKKwkJ
ZG91YmxlCWRpZmY7CisJCXZvaWQqCXdhaXRfb2JqZWN0OworCiAJCWNlbGwgPSBzeW5jX2FycmF5
X2dldF9udGhfY2VsbChzeW5jX3ByaW1hcnlfd2FpdF9hcnJheSwgaSk7CiAKLQkJaWYgKGNlbGwt
PndhaXRfb2JqZWN0ICE9IE5VTEwgJiYgY2VsbC0+d2FpdGluZwotCQkgICAgJiYgZGlmZnRpbWUo
dGltZShOVUxMKSwgY2VsbC0+cmVzZXJ2YXRpb25fdGltZSkgPiAyNDApIHsKKwkJd2FpdF9vYmpl
Y3QgPSBjZWxsLT53YWl0X29iamVjdDsKKworCQlpZiAod2FpdF9vYmplY3QgPT0gTlVMTCB8fCAh
Y2VsbC0+d2FpdGluZykgeworCisJCQljb250aW51ZTsKKwkJfQorCisJCWRpZmYgPSBkaWZmdGlt
ZSh0aW1lKE5VTEwpLCBjZWxsLT5yZXNlcnZhdGlvbl90aW1lKTsKKworCQlpZiAoZGlmZiA+IDI0
MCkgewogCQkJZnB1dHMoIklubm9EQjogV2FybmluZzogYSBsb25nIHNlbWFwaG9yZSB3YWl0Olxu
IiwKIAkJCSAgICAgIHN0ZGVycik7CiAJCQlzeW5jX2FycmF5X2NlbGxfcHJpbnQoc3RkZXJyLCBj
ZWxsKTsKIAkJCW5vdGljZWQgPSBUUlVFOwogCQl9CiAKLQkJaWYgKGNlbGwtPndhaXRfb2JqZWN0
ICE9IE5VTEwgJiYgY2VsbC0+d2FpdGluZwotCQkgICAgJiYgZGlmZnRpbWUodGltZShOVUxMKSwg
Y2VsbC0+cmVzZXJ2YXRpb25fdGltZSkKLQkJICAgID4gZmF0YWxfdGltZW91dCkgeworCQlpZiAo
ZGlmZiA+IGZhdGFsX3RpbWVvdXQpIHsKIAkJCWZhdGFsID0gVFJVRTsKIAkJfQorCisJCWlmIChk
aWZmID4gbG9uZ2VzdF9kaWZmKSB7CisJCQlsb25nZXN0X2RpZmYgPSBkaWZmOworCQkJKnNlbWEg
PSB3YWl0X29iamVjdDsKKwkJCSp3YWl0ZXIgPSBjZWxsLT50aHJlYWQ7CisJCX0KIAl9CiAKIAlp
ZiAobm90aWNlZCkgewoK

--===============1555348080==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marko.makela@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@stripped
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# testament_sha1: b759ae1c24721b02f00b5a6b41c518504a72c919
# timestamp: 2011-03-30 15:09:45 +0300
# base_revision_id: vasil.dimov@stripped\
#   odusry0rkbeenhd1
# 
# Begin bundle
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
1282pD5pdJ/9q/T+xdyRThQkDdR8CwA=


--===============1555348080==--