From: marko.makela
Date: June 29 2010 1:13pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3528 to 3532) Bug#54408
List-Archive: http://lists.mysql.com/commits/112469
X-Bug: 54408
Message-Id: <201006291313.o5TCfI7O019415@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0579333168=="

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

IDM1MzIgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0yOQogICAgICBDaGFuZ2VMb2cgZW50cnkgZm9y
IEJ1ZyAjNTQ0MDgKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0No
YW5nZUxvZwogMzUzMSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTI5CiAgICAgIEJ1ZyM1NDQwODog
dHhuIHJvbGxiYWNrIGFmdGVyIHJlY292ZXJ5OiByb3cwdW1vZC5jOjY3MwogICAgICBkaWN0X3Rh
YmxlX2dldF9mb3JtYXQoaW5kZXgtPnRhYmxlKQogICAgICAKICAgICAgVGhlIFJFRFVOREFOVCBh
bmQgQ09NUEFDVCBmb3JtYXRzIHN0b3JlIGEgbG9jYWwgNzY4LWJ5dGUgcHJlZml4IG9mCiAgICAg
IGVhY2ggZXh0ZXJuYWxseSBzdG9yZWQgY29sdW1uLiBObyByb3dfZXh0IGNhY2hlIGlzIG5lZWRl
ZCwgYnV0IHdlCiAgICAgIGluaXRpYWxpemVkIG9uZSBuZXZlcnRoZWxlc3MuIFdoZW4gdGhlIEJM
T0IgcG9pbnRlciB3YXMgemVybywgd2Ugd291bGQKICAgICAgaWdub3JlIHRoZSBsb2NhbGx5IHN0
b3JlZCBwcmVmaXggYXMgd2VsbC4gVGhpcyB0cmlnZ2VyZWQgYW4gYXNzZXJ0aW9uCiAgICAgIGZh
aWx1cmUgaW4gcm93X3VuZG9fbW9kX3VwZF9leGlzdF9zZWMoKS4KICAgICAgCiAgICAgIHJvd19i
dWlsZCgpOiBBbGxvdyBleHQ9PU5VTEwgd2hlbiBhIFJFRFVOREFOVCBvciBDT01QQUNUIHRhYmxl
CiAgICAgIGNvbnRhaW5zIGV4dGVybmFsbHkgc3RvcmVkIGNvbHVtbnMuCiAgICAgIAogICAgICBy
b3dfdW5kb19zZWFyY2hfY2x1c3RfdG9fcGN1cigpLCByb3dfdXBkX3N0b3JlX3JvdygpOiBJbnZv
a2UKICAgICAgcm93X2J1aWxkKCkgd2l0aCBleHQ9PU5VTEwgb24gUkVEVU5EQU5UIGFuZCBDT01Q
QUNUIHRhYmxlcy4KICAgICAgCiAgICAgIHJiOi8vMzgyIGFwcHJvdmVkIGJ5IEppbW15IFlhbmcK
CiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwcm93LmMK
ICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwdW5kby5jCiAgICAgIHN0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9yb3cvcm93MHVwZC5jCiAzNTMwIE1hcmtvIE3DpGtlbMOkCTIwMTAtMDYt
MjkKICAgICAgQ2hhbmdlTG9nIGVudHJ5IGZvciBCdWcgIzU0MzU4CgogICAgbW9kaWZpZWQ6CiAg
ICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cKIDM1MjkgTWFya28gTcOka2Vsw6QJ
MjAxMC0wNi0yOQogICAgICBCdWcjNTQzNTg6IFJFQUQgVU5DT01NSVRURUQgYWNjZXNzIGZhaWx1
cmUgb2Ygb2ZmLXBhZ2UgRFlOQU1JQyBvciBDT01QUkVTU0VECiAgICAgIGNvbHVtbnMKICAgICAg
CiAgICAgIFdoZW4gdGhlIHNlcnZlciBjcmFzaGVzIGFmdGVyIGEgcmVjb3JkIHN0dWIgaGFzIGJl
ZW4gaW5zZXJ0ZWQgYW5kCiAgICAgIGJlZm9yZSBhbGwgaXRzIG9mZi1wYWdlIGNvbHVtbnMgaGF2
ZSBiZWVuIHdyaXR0ZW4sIHRoZSByZWNvcmQgd2lsbAogICAgICBjb250YWluIGluY29tcGxldGUg
b2ZmLXBhZ2UgY29sdW1ucyBhZnRlciBjcmFzaCByZWNvdmVyeS4gU3VjaCByZWNvcmRzCiAgICAg
IG1heSBvbmx5IGJlIGFjY2Vzc2VkIGF0IHRoZSBSRUFEIFVOQ09NTUlUVEVEIGlzb2xhdGlvbiBs
ZXZlbCBvciB3aGVuCiAgICAgIHJvbGxpbmcgYmFjayBhIHJlY292ZXJlZCB0cmFuc2FjdGlvbiBp
biByZWN2X3JlY292ZXJ5X3JvbGxiYWNrX2FjdGl2ZSgpLgogICAgICBTa2lwIHRoZXNlIHJlY29y
ZHMgYXQgdGhlIFJFQUQgVU5DT01NSVRURUQgaXNvbGF0aW9uIGxldmVsLgogICAgICAKICAgICAg
VE9ETzogQWRkIGFzc2VydGlvbnMgZm9yIGNoZWNraW5nIHRoZSBhYm92ZSBhc3N1bXB0aW9ucyBo
b2xkIHdoZW4gYW4KICAgICAgaW5jb21wbGV0ZSBCTE9CIGlzIGVuY291bnRlcmVkLgogICAgICAK
ICAgICAgYnRyX3JlY19jb3B5X2V4dGVybmFsbHlfc3RvcmVkX2ZpZWxkKCk6IFJldHVybiBOVUxM
IGlmIHRoZSBmaWVsZCBpcwogICAgICBpbmNvbXBsZXRlLgogICAgICAKICAgICAgcm93X3ByZWJ1
aWx0X3Q6OnRlbXBsX2NvbnRhaW5zX2Jsb2I6IENsYXJpZnkgd2hhdCAiQkxPQiIgbWVhbnMgaW4g
dGhpcwogICAgICBjb250ZXh0LiBIaW50OiBNeVNRTCBCTE9CcyBhcmUgbm90IHRoZSBzYW1lIGFz
IElubm9EQiBCTE9Ccy4KICAgICAgCiAgICAgIHJvd19zZWxfc3RvcmVfbXlzcWxfcmVjKCk6IFJl
dHVybiBGQUxTRSBpZiBub3QgYWxsIGNvbHVtbnMgY291bGQgYmUKICAgICAgcmV0cmlldmVkLiBQ
cmV2aW91c2x5IHRoaXMgZnVuY3Rpb24gYWx3YXlzIHJldHVybmVkIFRSVUUuICBBc3NlcnQgdGhh
dAogICAgICB0aGUgcmVjb3JkIGlzIG5vdCBkZWxldGUtbWFya2VkLgogICAgICAKICAgICAgcm93
X3NlbF9wdXNoX2NhY2hlX3Jvd19mb3JfbXlzcWwoKTogUmV0dXJuIEZBTFNFIGlmIG5vdCBhbGwg
Y29sdW1ucwogICAgICBjb3VsZCBiZSByZXRyaWV2ZWQuCiAgICAgIAogICAgICByb3dfc2VhcmNo
X2Zvcl9teXNxbCgpOiBTa2lwIHJlY29yZHMgY29udGFpbmluZyBpbmNvbXBsZXRlIG9mZi1wYWdl
CiAgICAgIGNvbHVtbnMuIEFzc2VydCB0aGF0IHRoZSB0cmFuc2FjdGlvbiBpc29sYXRpb24gbGV2
ZWwgaXMgUkVBRAogICAgICBVTkNPTU1JVFRFRC4KICAgICAgCiAgICAgIHJiOi8vMzgwIGFwcHJv
dmVkIGJ5IEppbW15IFlhbmcKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1
Z2luL2J0ci9idHIwY3VyLmMKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvYnRy
MGN1ci5oCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3JvdzBteXNxbC5oCiAg
ICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MG1lcmdlLmMKICAgICAgc3RvcmFnZS9p
bm5vZGJfcGx1Z2luL3Jvdy9yb3cwc2VsLmMKIDM1MjggSmltbXkgWWFuZwkyMDEwLTA2LTI4CiAg
ICAgIENoZWNrIGluIGZpeCBmb3IgYnVnICM1Mzc1NjogIkFMVEVSIFRBQkxFIEFERCBQUklNQVJZ
IEtFWSBhZmZlY3RzCiAgICAgIGNyYXNoIHJlY292ZXJ5IgogICAgICAKICAgICAgcmI6Ly8zNjkg
YXBwcm92ZWQgYnkgTWFya28KCiAgICBhZGRlZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5v
ZGIvci9pbm5vZGJfYnVnNTM3NTYucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2Ri
L3QvaW5ub2RiX2J1ZzUzNzU2LnRlc3QKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9i
YXNlL2RpY3QvZGljdDBsb2FkLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi9DaGFuZ2VMb2cnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJcmV2
aWQ6amltbXkueWFuZ0BvcmFjbGUuY29tLTIwMTAwNjI5MDI0MTM3LTY5MHNhY201c29ncnV6dmIK
KysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwlyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDEwMDYyOTEzMTIxOS1wamJrcGs1cnNxenRtdzI3CkBAIC0xLDMgKzEsMTUg
QEAKKzIwMTAtMDYtMjkJVGhlIElubm9EQiBUZWFtCisJKiByb3cvcm93MHJvdy5jLCByb3cvcm93
MHVuZG8uYywgcm93L3JvdzB1cGQuYzoKKwlGaXggQnVnIzU0NDA4IHR4biByb2xsYmFjayBhZnRl
ciByZWNvdmVyeTogcm93MHVtb2QuYzo2NzMKKwlkaWN0X3RhYmxlX2dldF9mb3JtYXQoaW5kZXgt
PnRhYmxlKQorCisyMDEwLTA2LTI5CVRoZSBJbm5vREIgVGVhbQorCisJKiBidHIvYnRyMGN1ci5j
LCBpbmNsdWRlL2J0cjBjdXIuaCwKKwlpbmNsdWRlL3JvdzBteXNxbC5oLCByb3cvcm93MG1lcmdl
LmMsIHJvdy9yb3cwc2VsLmM6CisJRml4IEJ1ZyM1NDM1OCBSRUFEIFVOQ09NTUlUVEVEIGFjY2Vz
cyBmYWlsdXJlIG9mIG9mZi1wYWdlIERZTkFNSUMKKwlvciBDT01QUkVTU0VEIGNvbHVtbnMKKwog
MjAxMC0wNi0yNAlUaGUgSW5ub0RCIFRlYW0KIAogCSogaGFuZGxlci9oYV9pbm5vZGIuY2M6Cgo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwY3VyLmMnCi0t
LSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGN1ci5jCXJldmlkOmppbW15LnlhbmdA
b3JhY2xlLmNvbS0yMDEwMDYyOTAyNDEzNy02OTBzYWNtNXNvZ3J1enZiCisrKyBiL3N0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9idHIvYnRyMGN1ci5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTAwNjI5MTMxMjE5LXBqYmtwazVyc3F6dG13MjcKQEAgLTQ4MTQsNyArNDgxNCw3IEBAIGJ0
cl9jb3B5X2V4dGVybmFsbHlfc3RvcmVkX2ZpZWxkKAogCiAvKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIENvcGll
cyBhbiBleHRlcm5hbGx5IHN0b3JlZCBmaWVsZCBvZiBhIHJlY29yZCB0byBtZW0gaGVhcC4KLUBy
ZXR1cm4JdGhlIGZpZWxkIGNvcGllZCB0byBoZWFwICovCitAcmV0dXJuCXRoZSBmaWVsZCBjb3Bp
ZWQgdG8gaGVhcCwgb3IgTlVMTCBpZiB0aGUgZmllbGQgaXMgaW5jb21wbGV0ZSAqLwogVU5JVl9J
TlRFUk4KIGJ5dGUqCiBidHJfcmVjX2NvcHlfZXh0ZXJuYWxseV9zdG9yZWRfZmllbGQoCkBAIC00
ODQ0LDYgKzQ4NDQsMjggQEAgYnRyX3JlY19jb3B5X2V4dGVybmFsbHlfc3RvcmVkX2ZpZWxkKAog
CiAJZGF0YSA9IHJlY19nZXRfbnRoX2ZpZWxkKHJlYywgb2Zmc2V0cywgbm8sICZsb2NhbF9sZW4p
OwogCisJdXRfYShsb2NhbF9sZW4gPj0gQlRSX0VYVEVSTl9GSUVMRF9SRUZfU0laRSk7CisKKwlp
ZiAoVU5JVl9VTkxJS0VMWQorCSAgICAoIW1lbWNtcChkYXRhICsgbG9jYWxfbGVuIC0gQlRSX0VY
VEVSTl9GSUVMRF9SRUZfU0laRSwKKwkJICAgICBmaWVsZF9yZWZfemVybywgQlRSX0VYVEVSTl9G
SUVMRF9SRUZfU0laRSkpKSB7CisJCS8qIFRoZSBleHRlcm5hbGx5IHN0b3JlZCBmaWVsZCB3YXMg
bm90IHdyaXR0ZW4KKwkJeWV0LiBUaGlzIGlzIG9ubHkgYSB2YWxpZCBjb25kaXRpb24gd2hlbiB0
aGUgc2VydmVyCisJCWNyYXNoZWQgYWZ0ZXIgdGhlIHRpbWUgYSByZWNvcmQgc3R1YiB3YXMgZnJl
c2hseQorCQlpbnNlcnRlZCBidXQgYmVmb3JlIGFsbCBpdHMgY29sdW1ucyB3ZXJlIHdyaXR0ZW4u
IFRoaXMKKwkJcmVjb3JkIHNob3VsZCBvbmx5IGJlIHNlZW4gYnkKKwkJcmVjdl9yZWNvdmVyeV9y
b2xsYmFja19hY3RpdmUoKSBvciBhbnkKKwkJVFJYX0lTT19SRUFEX1VOQ09NTUlUVEVEIHRyYW5z
YWN0aW9ucy4gKi8KKworCQkvKiBUT0RPOiBhc3NlcnQgdGhhdCB0aGVyZSBpcyBhbiBvd25lcl90
cnggd2l0aAorCQlvd25lcl90cngtPmlkID09IERCX1RSWF9JRCBhbmQgb3duZXJfdHJ4LT5pc19y
ZWNvdmVyZWQgKi8KKworCQkvKiBUT0RPOiBhc3NlcnQgdGhhdCBmb3IgdGhlIGN1cnJlbnQgdHJh
bnNhY3Rpb24gdHJ4LAorCQllaXRoZXIgKHRyeCA9PSBvd25lcl90cnggJiYgdHJ4X2lzX3JlY3Yo
dHJ4KSkgb3IKKwkJdHJ4LT5pc29sYXRpb25fbGV2ZWwgPT0gVFJYX0lTT19SRUFEX1VOQ09NTUlU
VEVELiAqLworCQlyZXR1cm4oTlVMTCk7CisJfQorCiAJcmV0dXJuKGJ0cl9jb3B5X2V4dGVybmFs
bHlfc3RvcmVkX2ZpZWxkKGxlbiwgZGF0YSwKIAkJCQkJCXppcF9zaXplLCBsb2NhbF9sZW4sIGhl
YXApKTsKIH0KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVk
ZS9idHIwY3VyLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2J0cjBjdXIu
aAlyZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMDA2MjkwMjQxMzctNjkwc2FjbTVzb2dy
dXp2YgorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9idHIwY3VyLmgJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MjkxMzEyMTktcGpia3BrNXJzcXp0bXcyNwpA
QCAtNTcwLDcgKzU3MCw3IEBAIGJ0cl9jb3B5X2V4dGVybmFsbHlfc3RvcmVkX2ZpZWxkX3ByZWZp
eCgKIAl1bGludAkJbG9jYWxfbGVuKTsvKiE8IGluOiBsZW5ndGggb2YgZGF0YSwgaW4gYnl0ZXMg
Ki8KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqLy8qKgogQ29waWVzIGFuIGV4dGVybmFsbHkgc3RvcmVkIGZpZWxkIG9m
IGEgcmVjb3JkIHRvIG1lbSBoZWFwLgotQHJldHVybgl0aGUgZmllbGQgY29waWVkIHRvIGhlYXAg
Ki8KK0ByZXR1cm4JdGhlIGZpZWxkIGNvcGllZCB0byBoZWFwLCBvciBOVUxMIGlmIHRoZSBmaWVs
ZCBpcyBpbmNvbXBsZXRlICovCiBVTklWX0lOVEVSTgogYnl0ZSoKIGJ0cl9yZWNfY29weV9leHRl
cm5hbGx5X3N0b3JlZF9maWVsZCgKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9w
bHVnaW4vaW5jbHVkZS9yb3cwbXlzcWwuaCcKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2lu
Y2x1ZGUvcm93MG15c3FsLmgJcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUuY29tLTIwMTAwNjI5MDI0
MTM3LTY5MHNhY201c29ncnV6dmIKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUv
cm93MG15c3FsLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MjkxMzEyMTkt
cGpia3BrNXJzcXp0bXcyNwpAQCAtNjIyLDcgKzYyMiwxMSBAQCBzdHJ1Y3Qgcm93X3ByZWJ1aWx0
X3N0cnVjdCB7CiAJCQkJCXRoZSBzZWNvbmRhcnkgaW5kZXgsIHRoZW4gdGhpcyBpcwogCQkJCQlz
ZXQgdG8gVFJVRSAqLwogCXVuc2lnbmVkCXRlbXBsX2NvbnRhaW5zX2Jsb2I6MTsvKiE8IFRSVUUg
aWYgdGhlIHRlbXBsYXRlIGNvbnRhaW5zCi0JCQkJCUJMT0IgY29sdW1uKHMpICovCisJCQkJCWEg
Y29sdW1uIHdpdGggREFUQV9CTE9CID09CisJCQkJCWdldF9pbm5vYmFzZV90eXBlX2Zyb21fbXlz
cWxfdHlwZSgpOworCQkJCQlub3QgdG8gYmUgY29uZnVzZWQgd2l0aCBJbm5vREIKKwkJCQkJZXh0
ZXJuYWxseSBzdG9yZWQgY29sdW1ucworCQkJCQkoVkFSQ0hBUiBjYW4gYmUgb2ZmLXBhZ2UgdG9v
KSAqLwogCW15c3FsX3Jvd190ZW1wbF90KiBteXNxbF90ZW1wbGF0ZTsvKiE8IHRlbXBsYXRlIHVz
ZWQgdG8gdHJhbnNmb3JtCiAJCQkJCXJvd3MgZmFzdCBiZXR3ZWVuIE15U1FMIGFuZCBJbm5vYmFz
ZQogCQkJCQlmb3JtYXRzOyBtZW1vcnkgZm9yIHRoaXMgdGVtcGxhdGUKCj09PSBtb2RpZmllZCBm
aWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBtZXJnZS5jJwotLS0gYS9zdG9yYWdl
L2lubm9kYl9wbHVnaW4vcm93L3JvdzBtZXJnZS5jCXJldmlkOmppbW15LnlhbmdAb3JhY2xlLmNv
bS0yMDEwMDYyOTAyNDEzNy02OTBzYWNtNXNvZ3J1enZiCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi9yb3cvcm93MG1lcmdlLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2
MjkxMzEyMTktcGpia3BrNXJzcXp0bXcyNwpAQCAtMTc4MCw2ICsxNzgwLDExIEBAIHJvd19tZXJn
ZV9jb3B5X2Jsb2JzKAogCQkoYmVsb3cpLiAqLwogCQlkYXRhID0gYnRyX3JlY19jb3B5X2V4dGVy
bmFsbHlfc3RvcmVkX2ZpZWxkKAogCQkJbXJlYywgb2Zmc2V0cywgemlwX3NpemUsIGksICZsZW4s
IGhlYXApOworCQkvKiBCZWNhdXNlIHdlIGhhdmUgbG9ja2VkIHRoZSB0YWJsZSwgYW55IHJlY29y
ZHMKKwkJd3JpdHRlbiBieSBpbmNvbXBsZXRlIHRyYW5zYWN0aW9ucyBtdXN0IGhhdmUgYmVlbgor
CQlyb2xsZWQgYmFjayBhbHJlYWR5LiBUaGVyZSBtdXN0IG5vdCBiZSBhbnkgaW5jb21wbGV0ZQor
CQlCTE9CIGNvbHVtbnMuICovCisJCXV0X2EoZGF0YSk7CiAKIAkJZGZpZWxkX3NldF9kYXRhKGZp
ZWxkLCBkYXRhLCBsZW4pOwogCX0KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9w
bHVnaW4vcm93L3JvdzByb3cuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cw
cm93LmMJcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUuY29tLTIwMTAwNjI5MDI0MTM3LTY5MHNhY201
c29ncnV6dmIKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwcm93LmMJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MjkxMzEyMTktcGpia3BrNXJzcXp0bXcyNwpA
QCAtMjk0LDcgKzI5NCwxMyBAQCByb3dfYnVpbGQoCiAKIAl1dF9hZChkdHVwbGVfY2hlY2tfdHlw
ZWQocm93KSk7CiAKLQlpZiAoaikgeworCWlmICghZXh0KSB7CisJCS8qIFJFRFVOREFOVCBhbmQg
Q09NUEFDVCBmb3JtYXRzIHN0b3JlIGEgbG9jYWwKKwkJNzY4LWJ5dGUgcHJlZml4IG9mIGVhY2gg
ZXh0ZXJuYWxseSBzdG9yZWQKKwkJY29sdW1uLiBObyBjYWNoZSBpcyBuZWVkZWQuICovCisJCXV0
X2FkKGRpY3RfdGFibGVfZ2V0X2Zvcm1hdChpbmRleC0+dGFibGUpCisJCSAgICAgIDwgRElDVF9U
Rl9GT1JNQVRfWklQKTsKKwl9IGVsc2UgaWYgKGopIHsKIAkJKmV4dCA9IHJvd19leHRfY3JlYXRl
KGosIGV4dF9jb2xzLCByb3csCiAJCQkJICAgICAgZGljdF90YWJsZV96aXBfc2l6ZShpbmRleC0+
dGFibGUpLAogCQkJCSAgICAgIGhlYXApOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9yb3cvcm93MHNlbC5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93
L3JvdzBzZWwuYwlyZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMDA2MjkwMjQxMzctNjkw
c2FjbTVzb2dydXp2YgorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBzZWwuYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyOTEzMTIxOS1wamJrcGs1cnNxenRt
dzI3CkBAIC00MTYsNyArNDE2LDcgQEAgcm93X3NlbF9mZXRjaF9jb2x1bW5zKAogCQkJCQkJCSAg
ICAgIGZpZWxkX25vKSkpIHsKIAogCQkJCS8qIENvcHkgYW4gZXh0ZXJuYWxseSBzdG9yZWQgZmll
bGQgdG8gdGhlCi0JCQkJdGVtcG9yYXJ5IGhlYXAgKi8KKwkJCQl0ZW1wb3JhcnkgaGVhcCwgaWYg
cG9zc2libGUuICovCiAKIAkJCQloZWFwID0gbWVtX2hlYXBfY3JlYXRlKDEpOwogCkBAIC00MjUs
NiArNDI1LDIxIEBAIHJvd19zZWxfZmV0Y2hfY29sdW1ucygKIAkJCQkJZGljdF90YWJsZV96aXBf
c2l6ZShpbmRleC0+dGFibGUpLAogCQkJCQlmaWVsZF9ubywgJmxlbiwgaGVhcCk7CiAKKwkJCQkv
KiBkYXRhID09IE5VTEwgbWVhbnMgdGhhdCB0aGUKKwkJCQlleHRlcm5hbGx5IHN0b3JlZCBmaWVs
ZCB3YXMgbm90CisJCQkJd3JpdHRlbiB5ZXQuIFRoaXMgaXMgb25seSBhIHZhbGlkCisJCQkJY29u
ZGl0aW9uIHdoZW4gdGhlIHNlcnZlciBjcmFzaGVkCisJCQkJYWZ0ZXIgdGhlIHRpbWUgYSByZWNv
cmQgc3R1YiB3YXMKKwkJCQlmcmVzaGx5IGluc2VydGVkIGJ1dCBiZWZvcmUgYWxsIGl0cworCQkJ
CWNvbHVtbnMgd2VyZSB3cml0dGVuLiBUaGlzIHJlY29yZAorCQkJCXNob3VsZCBvbmx5IGJlIHNl
ZW4gYnkKKwkJCQlyZWN2X3JlY292ZXJ5X3JvbGxiYWNrX2FjdGl2ZSgpIG9yIGFueQorCQkJCVRS
WF9JU09fUkVBRF9VTkNPTU1JVFRFRAorCQkJCXRyYW5zYWN0aW9ucy4gVGhlIElubm9EQiBTUUwg
cGFyc2VyCisJCQkJKHRoZSBzb2xlIGNhbGxlciBvZiB0aGlzIGZ1bmN0aW9uKQorCQkJCWRvZXMg
bm90IGltcGxlbWVudCBSRUFEIFVOQ09NTUlUVEVELAorCQkJCWFuZCBpdCBpcyBub3QgaW52b2x2
ZWQgZHVyaW5nIHJvbGxiYWNrLiAqLworCQkJCXV0X2EoZGF0YSk7CiAJCQkJdXRfYShsZW4gIT0g
VU5JVl9TUUxfTlVMTCk7CiAKIAkJCQluZWVkc19jb3B5ID0gVFJVRTsKQEAgLTkyNiw2ICs5NDEs
NyBAQCByb3dfc2VsX2dldF9jbHVzdF9yZWMoCiAJd2hlbiBwbGFuLT5jbHVzdF9wY3VyIHdhcyBw
b3NpdGlvbmVkLiAgVGhlIGxhdGNoIHdpbGwgbm90IGJlCiAJcmVsZWFzZWQgdW50aWwgbXRyX2Nv
bW1pdChtdHIpLiAqLwogCisJdXRfYWQoIXJlY19nZXRfZGVsZXRlZF9mbGFnKGNsdXN0X3JlYywg
cmVjX29mZnNfY29tcChvZmZzZXRzKSkpOwogCXJvd19zZWxfZmV0Y2hfY29sdW1ucyhpbmRleCwg
Y2x1c3RfcmVjLCBvZmZzZXRzLAogCQkJICAgICAgVVRfTElTVF9HRVRfRklSU1QocGxhbi0+Y29s
dW1ucykpOwogCSpvdXRfcmVjID0gY2x1c3RfcmVjOwpAQCAtMTYyOCw2ICsxNjQ0LDEzIEBAIHNr
aXBfbG9jazoKIAkJCQl9CiAKIAkJCQlpZiAob2xkX3ZlcnMgPT0gTlVMTCkgeworCQkJCQkvKiBU
aGUgcmVjb3JkIGRvZXMgbm90IGV4aXN0CisJCQkJCWluIG91ciByZWFkIHZpZXcuIFNraXAgaXQs
IGJ1dAorCQkJCQlmaXJzdCBhdHRlbXB0IHRvIGRldGVybWluZQorCQkJCQl3aGV0aGVyIHRoZSBp
bmRleCBzZWdtZW50IHdlCisJCQkJCWFyZSBzZWFyY2hpbmcgdGhyb3VnaCBoYXMgYmVlbgorCQkJ
CQlleGhhdXN0ZWQuICovCisKIAkJCQkJb2Zmc2V0cyA9IHJlY19nZXRfb2Zmc2V0cygKIAkJCQkJ
CXJlYywgaW5kZXgsIG9mZnNldHMsCiAJCQkJCQlVTElOVF9VTkRFRklORUQsICZoZWFwKTsKQEAg
LTI2NDcsOSArMjY3MCw4IEBAIENvbnZlcnQgYSByb3cgaW4gdGhlIElubm9iYXNlIGZvcm1hdCB0
bwogTm90ZSB0aGF0IHRoZSB0ZW1wbGF0ZSBpbiBwcmVidWlsdCBtYXkgYWR2aXNlIHVzIHRvIGNv
cHkgb25seSBhIGZldwogY29sdW1ucyB0byBteXNxbF9yZWMsIG90aGVyIGNvbHVtbnMgYXJlIGxl
ZnQgYmxhbmsuIEFsbCBjb2x1bW5zIG1heSBub3QKIGJlIG5lZWRlZCBpbiB0aGUgcXVlcnkuCi1A
cmV0dXJuIFRSVUUgaWYgc3VjY2VzcywgRkFMU0UgaWYgY291bGQgbm90IGFsbG9jYXRlIG1lbW9y
eSBmb3IgYSBCTE9CCi0odGhvdWdoIHdlIG1heSBhbHNvIGFzc2VydCBpbiB0aGF0IGNhc2UpICov
Ci1zdGF0aWMKK0ByZXR1cm4gVFJVRSBvbiBzdWNjZXNzLCBGQUxTRSBpZiBub3QgYWxsIGNvbHVt
bnMgY291bGQgYmUgcmV0cmlldmVkICovCitzdGF0aWMgX19hdHRyaWJ1dGVfXygod2Fybl91bnVz
ZWRfcmVzdWx0KSkKIGlib29sCiByb3dfc2VsX3N0b3JlX215c3FsX3JlYygKIC8qPT09PT09PT09
PT09PT09PT09PT0qLwpAQCAtMjY3Miw2ICsyNjk0LDcgQEAgcm93X3NlbF9zdG9yZV9teXNxbF9y
ZWMoCiAJdXRfYWQocHJlYnVpbHQtPm15c3FsX3RlbXBsYXRlKTsKIAl1dF9hZChwcmVidWlsdC0+
ZGVmYXVsdF9yZWMpOwogCXV0X2FkKHJlY19vZmZzX3ZhbGlkYXRlKHJlYywgTlVMTCwgb2Zmc2V0
cykpOworCXV0X2FkKCFyZWNfZ2V0X2RlbGV0ZWRfZmxhZyhyZWMsIHJlY19vZmZzX2NvbXAob2Zm
c2V0cykpKTsKIAogCWlmIChVTklWX0xJS0VMWV9OVUxMKHByZWJ1aWx0LT5ibG9iX2hlYXApKSB7
CiAJCW1lbV9oZWFwX2ZyZWUocHJlYnVpbHQtPmJsb2JfaGVhcCk7CkBAIC0yNzE5LDYgKzI3NDIs
MjYgQEAgcm93X3NlbF9zdG9yZV9teXNxbF9yZWMoCiAJCQkJZGljdF90YWJsZV96aXBfc2l6ZShw
cmVidWlsdC0+dGFibGUpLAogCQkJCXRlbXBsLT5yZWNfZmllbGRfbm8sICZsZW4sIGhlYXApOwog
CisJCQlpZiAoVU5JVl9VTkxJS0VMWSghZGF0YSkpIHsKKwkJCQkvKiBUaGUgZXh0ZXJuYWxseSBz
dG9yZWQgZmllbGQKKwkJCQl3YXMgbm90IHdyaXR0ZW4geWV0LiBUaGlzIGlzCisJCQkJb25seSBh
IHZhbGlkIGNvbmRpdGlvbiB3aGVuCisJCQkJdGhlIHNlcnZlciBjcmFzaGVkIGFmdGVyIHRoZQor
CQkJCXRpbWUgYSByZWNvcmQgc3R1YiB3YXMgZnJlc2hseQorCQkJCWluc2VydGVkIGJ1dCBiZWZv
cmUgYWxsIGl0cworCQkJCWNvbHVtbnMgd2VyZSB3cml0dGVuLiBUaGlzCisJCQkJcmVjb3JkIHNo
b3VsZCBvbmx5IGJlIHNlZW4gYnkKKwkJCQlyZWN2X3JlY292ZXJ5X3JvbGxiYWNrX2FjdGl2ZSgp
CisJCQkJb3IgYW55IFRSWF9JU09fUkVBRF9VTkNPTU1JVFRFRAorCQkJCXRyYW5zYWN0aW9ucy4g
Ki8KKworCQkJCWlmIChleHRlcm5fZmllbGRfaGVhcCkgeworCQkJCQltZW1faGVhcF9mcmVlKGV4
dGVybl9maWVsZF9oZWFwKTsKKwkJCQl9CisKKwkJCQlyZXR1cm4oRkFMU0UpOworCQkJfQorCiAJ
CQl1dF9hKGxlbiAhPSBVTklWX1NRTF9OVUxMKTsKIAkJfSBlbHNlIHsKIAkJCS8qIEZpZWxkIGlz
IHN0b3JlZCBpbiB0aGUgcm93LiAqLwpAQCAtMzEzNiw5ICszMTc5LDEwIEBAIHJvd19zZWxfcG9w
X2NhY2hlZF9yb3dfZm9yX215c3FsKAogfQogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCi1QdXNoZXMgYSBy
b3cgZm9yIE15U1FMIHRvIHRoZSBmZXRjaCBjYWNoZS4gKi8KLVVOSVZfSU5MSU5FCi12b2lkCitQ
dXNoZXMgYSByb3cgZm9yIE15U1FMIHRvIHRoZSBmZXRjaCBjYWNoZS4KK0ByZXR1cm4gVFJVRSBv
biBzdWNjZXNzLCBGQUxTRSBpZiB0aGUgcmVjb3JkIGNvbnRhaW5zIGluY29tcGxldGUgQkxPQnMg
Ki8KK1VOSVZfSU5MSU5FIF9fYXR0cmlidXRlX18oKHdhcm5fdW51c2VkX3Jlc3VsdCkpCitpYm9v
bAogcm93X3NlbF9wdXNoX2NhY2hlX3Jvd19mb3JfbXlzcWwoCiAvKj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ki8KIAlyb3dfcHJlYnVpbHRfdCoJcHJlYnVpbHQsCS8qITwgaW46IHByZWJ1
aWx0IHN0cnVjdCAqLwpAQCAtMzE4MCwxMCArMzIyNCwxMSBAQCByb3dfc2VsX3B1c2hfY2FjaGVf
cm93X2Zvcl9teXNxbCgKIAkJCQkgIHByZWJ1aWx0LT5mZXRjaF9jYWNoZVsKIAkJCQkJICBwcmVi
dWlsdC0+bl9mZXRjaF9jYWNoZWRdLAogCQkJCSAgcHJlYnVpbHQsIHJlYywgb2Zmc2V0cykpKSB7
Ci0JCXV0X2Vycm9yOworCQlyZXR1cm4oRkFMU0UpOwogCX0KIAogCXByZWJ1aWx0LT5uX2ZldGNo
X2NhY2hlZCsrOworCXJldHVybihUUlVFKTsKIH0KIAogLyoqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKQEAgLTM1
NzgsNiArMzYyMywyNCBAQCByb3dfc2VhcmNoX2Zvcl9teXNxbCgKIAogCQkJCWlmICghcm93X3Nl
bF9zdG9yZV9teXNxbF9yZWMoYnVmLCBwcmVidWlsdCwKIAkJCQkJCQkgICAgIHJlYywgb2Zmc2V0
cykpIHsKKwkJCQkJLyogT25seSBmcmVzaCBpbnNlcnRzIGF0CisJCQkJCXNlcnZlciBjcmFzaCB0
aW1lIG1heSBjb250YWluCisJCQkJCWluY29tcGxldGUgZXh0ZXJuYWxseSBzdG9yZWQKKwkJCQkJ
Y29sdW1ucy4gUHJldGVuZCB0aGF0IHN1Y2gKKwkJCQkJcmVjb3JkcyBkbyBub3QgZXhpc3QuIFN1
Y2gKKwkJCQkJcmVjb3JkcyBtYXkgb25seSBiZSBhY2Nlc3NlZAorCQkJCQlhdCB0aGUgUkVBRCBV
TkNPTU1JVFRFRAorCQkJCQlpc29sYXRpb24gbGV2ZWwgb3Igd2hlbgorCQkJCQlyb2xsaW5nIGJh
Y2sgYSByZWNvdmVyZWQKKwkJCQkJdHJhbnNhY3Rpb24uIFJvbGxiYWNrIGhhcHBlbnMKKwkJCQkJ
YXQgYSBsb3dlciBsZXZlbCwgbm90IGhlcmUuICovCisJCQkJCXV0X2EodHJ4LT5pc29sYXRpb25f
bGV2ZWwKKwkJCQkJICAgICA9PSBUUlhfSVNPX1JFQURfVU5DT01NSVRURUQpOworCQkJCQkvKiBU
T0RPOiBhc3NlcnQgdGhhdCB0aGVyZSBpcworCQkJCQlhbiBvd25lcl90cnggd2l0aAorCQkJCQlv
d25lcl90cngtPmlkID09IERCX1RSWF9JRCBhbmQKKwkJCQkJb3duZXJfdHJ4LT5pc19yZWNvdmVy
ZWQgKi8KKwogCQkJCQllcnIgPSBEQl9UT09fQklHX1JFQ09SRDsKIAogCQkJCQkvKiBXZSBsZXQg
dGhlIG1haW4gbG9vcCB0byBkbyB0aGUKQEAgLTQzNTcsOSArNDQyMCwyMCBAQCByZXF1aXJlc19j
bHVzdF9yZWM6CiAJCW5vdCBjYWNoZSByb3dzIGJlY2F1c2UgdGhlcmUgdGhlIGN1cnNvciBpcyBh
IHNjcm9sbGFibGUKIAkJY3Vyc29yLiAqLwogCi0JCXJvd19zZWxfcHVzaF9jYWNoZV9yb3dfZm9y
X215c3FsKHByZWJ1aWx0LCByZXN1bHRfcmVjLAotCQkJCQkJIG9mZnNldHMpOwotCQlpZiAocHJl
YnVpbHQtPm5fZmV0Y2hfY2FjaGVkID09IE1ZU1FMX0ZFVENIX0NBQ0hFX1NJWkUpIHsKKwkJaWYg
KCFyb3dfc2VsX3B1c2hfY2FjaGVfcm93X2Zvcl9teXNxbChwcmVidWlsdCwgcmVzdWx0X3JlYywK
KwkJCQkJCSAgICAgIG9mZnNldHMpKSB7CisJCQkvKiBPbmx5IGZyZXNoIGluc2VydHMgYXQgc2Vy
dmVyIGNyYXNoIHRpbWUgbWF5IGNvbnRhaW4KKwkJCWluY29tcGxldGUgZXh0ZXJuYWxseSBzdG9y
ZWQgY29sdW1ucy4gUHJldGVuZCB0aGF0CisJCQlzdWNoIHJlY29yZHMgZG8gbm90IGV4aXN0LiBT
dWNoIHJlY29yZHMgbWF5IG9ubHkgYmUKKwkJCWFjY2Vzc2VkIGF0IHRoZSBSRUFEIFVOQ09NTUlU
VEVEIGlzb2xhdGlvbiBsZXZlbCBvcgorCQkJd2hlbiByb2xsaW5nIGJhY2sgYSByZWNvdmVyZWQg
dHJhbnNhY3Rpb24uIFJvbGxiYWNrCisJCQloYXBwZW5zIGF0IGEgbG93ZXIgbGV2ZWwsIG5vdCBo
ZXJlLiAqLworCQkJdXRfYSh0cngtPmlzb2xhdGlvbl9sZXZlbCA9PSBUUlhfSVNPX1JFQURfVU5D
T01NSVRURUQpOworCQkJLyogVE9ETzogYXNzZXJ0IHRoYXQgdGhlcmUgaXMgYW4gb3duZXJfdHJ4
CisJCQl3aXRoIG93bmVyX3RyeC0+aWQgPT0gREJfVFJYX0lEIGFuZAorCQkJb3duZXJfdHJ4LT5p
c19yZWNvdmVyZWQgKi8KKwkJfSBlbHNlIGlmIChwcmVidWlsdC0+bl9mZXRjaF9jYWNoZWQKKwkJ
CSAgID09IE1ZU1FMX0ZFVENIX0NBQ0hFX1NJWkUpIHsKIAogCQkJZ290byBnb3Rfcm93OwogCQl9
CkBAIC00Mzc1LDkgKzQ0NDksMjAgQEAgcmVxdWlyZXNfY2x1c3RfcmVjOgogCQl9IGVsc2Ugewog
CQkJaWYgKCFyb3dfc2VsX3N0b3JlX215c3FsX3JlYyhidWYsIHByZWJ1aWx0LAogCQkJCQkJICAg
ICByZXN1bHRfcmVjLCBvZmZzZXRzKSkgewotCQkJCWVyciA9IERCX1RPT19CSUdfUkVDT1JEOwot
Ci0JCQkJZ290byBsb2NrX3dhaXRfb3JfZXJyb3I7CisJCQkJLyogT25seSBmcmVzaCBpbnNlcnRz
IGF0IHNlcnZlciBjcmFzaAorCQkJCXRpbWUgbWF5IGNvbnRhaW4gaW5jb21wbGV0ZSBleHRlcm5h
bGx5CisJCQkJc3RvcmVkIGNvbHVtbnMuIFByZXRlbmQgdGhhdCBzdWNoCisJCQkJcmVjb3JkcyBk
byBub3QgZXhpc3QuIFN1Y2ggcmVjb3JkcyBtYXkKKwkJCQlvbmx5IGJlIGFjY2Vzc2VkIGF0IHRo
ZSBSRUFEIFVOQ09NTUlUVEVECisJCQkJaXNvbGF0aW9uIGxldmVsIG9yIHdoZW4gcm9sbGluZyBi
YWNrIGEKKwkJCQlyZWNvdmVyZWQgdHJhbnNhY3Rpb24uIFJvbGxiYWNrIGhhcHBlbnMKKwkJCQlh
dCBhIGxvd2VyIGxldmVsLCBub3QgaGVyZS4gKi8KKwkJCQl1dF9hKHRyeC0+aXNvbGF0aW9uX2xl
dmVsCisJCQkJICAgICA9PSBUUlhfSVNPX1JFQURfVU5DT01NSVRURUQpOworCQkJCS8qIFRPRE86
IGFzc2VydCB0aGF0IHRoZXJlIGlzIGFuIG93bmVyX3RyeAorCQkJCXdpdGggb3duZXJfdHJ4LT5p
ZCA9PSBEQl9UUlhfSUQgYW5kCisJCQkJb3duZXJfdHJ4LT5pc19yZWNvdmVyZWQgKi8KKwkJCQln
b3RvIG5leHRfcmVjOwogCQkJfQogCQl9CiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lu
bm9kYl9wbHVnaW4vcm93L3JvdzB1bmRvLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9y
b3cvcm93MHVuZG8uYwlyZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMDA2MjkwMjQxMzct
Njkwc2FjbTVzb2dydXp2YgorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzB1bmRv
LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MjkxMzEyMTktcGpia3BrNXJz
cXp0bXcyNwpAQCAtMTk5LDggKzE5OSwyNCBAQCByb3dfdW5kb19zZWFyY2hfY2x1c3RfdG9fcGN1
cigKIAogCQlyZXQgPSBGQUxTRTsKIAl9IGVsc2UgeworCQlyb3dfZXh0X3QqKglleHQ7CisKKwkJ
aWYgKGRpY3RfdGFibGVfZ2V0X2Zvcm1hdChub2RlLT50YWJsZSkgPj0gRElDVF9URl9GT1JNQVRf
WklQKSB7CisJCQkvKiBJbiBEWU5BTUlDIG9yIENPTVBSRVNTRUQgZm9ybWF0LCB0aGVyZSBpcwor
CQkJbm8gcHJlZml4IG9mIGV4dGVybmFsbHkgc3RvcmVkIGNvbHVtbnMgaW4gdGhlCisJCQljbHVz
dGVyZWQgaW5kZXggcmVjb3JkLiBCdWlsZCBhIGNhY2hlIG9mCisJCQljb2x1bW4gcHJlZml4ZXMu
ICovCisJCQlleHQgPSAmbm9kZS0+ZXh0OworCQl9IGVsc2UgeworCQkJLyogUkVEVU5EQU5UIGFu
ZCBDT01QQUNUIGZvcm1hdHMgc3RvcmUgYSBsb2NhbAorCQkJNzY4LWJ5dGUgcHJlZml4IG9mIGVh
Y2ggZXh0ZXJuYWxseSBzdG9yZWQKKwkJCWNvbHVtbi4gTm8gY2FjaGUgaXMgbmVlZGVkLiAqLwor
CQkJZXh0ID0gTlVMTDsKKwkJCW5vZGUtPmV4dCA9IE5VTEw7CisJCX0KKwogCQlub2RlLT5yb3cg
PSByb3dfYnVpbGQoUk9XX0NPUFlfREFUQSwgY2x1c3RfaW5kZXgsIHJlYywKLQkJCQkgICAgICBv
ZmZzZXRzLCBOVUxMLCAmbm9kZS0+ZXh0LCBub2RlLT5oZWFwKTsKKwkJCQkgICAgICBvZmZzZXRz
LCBOVUxMLCBleHQsIG5vZGUtPmhlYXApOwogCQlpZiAobm9kZS0+dXBkYXRlKSB7CiAJCQlub2Rl
LT51bmRvX3JvdyA9IGR0dXBsZV9jb3B5KG5vZGUtPnJvdywgbm9kZS0+aGVhcCk7CiAJCQlyb3df
dXBkX3JlcGxhY2Uobm9kZS0+dW5kb19yb3csICZub2RlLT51bmRvX2V4dCwKCj09PSBtb2RpZmll
ZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzB1cGQuYycKLS0tIGEvc3RvcmFn
ZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwdXBkLmMJcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUuY29t
LTIwMTAwNjI5MDI0MTM3LTY5MHNhY201c29ncnV6dmIKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1
Z2luL3Jvdy9yb3cwdXBkLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2Mjkx
MzEyMTktcGpia3BrNXJzcXp0bXcyNwpAQCAtMTM5OCw2ICsxMzk4LDcgQEAgcm93X3VwZF9zdG9y
ZV9yb3coCiAJZGljdF9pbmRleF90KgljbHVzdF9pbmRleDsKIAlyZWNfdCoJCXJlYzsKIAltZW1f
aGVhcF90KgloZWFwCQk9IE5VTEw7CisJcm93X2V4dF90KioJZXh0OwogCXVsaW50CQlvZmZzZXRz
X1tSRUNfT0ZGU19OT1JNQUxfU0laRV07CiAJY29uc3QgdWxpbnQqCW9mZnNldHM7CiAJcmVjX29m
ZnNfaW5pdChvZmZzZXRzXyk7CkBAIC0xNDE0LDggKzE0MTUsMjIgQEAgcm93X3VwZF9zdG9yZV9y
b3coCiAKIAlvZmZzZXRzID0gcmVjX2dldF9vZmZzZXRzKHJlYywgY2x1c3RfaW5kZXgsIG9mZnNl
dHNfLAogCQkJCSAgVUxJTlRfVU5ERUZJTkVELCAmaGVhcCk7CisKKwlpZiAoZGljdF90YWJsZV9n
ZXRfZm9ybWF0KG5vZGUtPnRhYmxlKSA+PSBESUNUX1RGX0ZPUk1BVF9aSVApIHsKKwkJLyogSW4g
RFlOQU1JQyBvciBDT01QUkVTU0VEIGZvcm1hdCwgdGhlcmUgaXMgbm8gcHJlZml4CisJCW9mIGV4
dGVybmFsbHkgc3RvcmVkIGNvbHVtbnMgaW4gdGhlIGNsdXN0ZXJlZCBpbmRleAorCQlyZWNvcmQu
IEJ1aWxkIGEgY2FjaGUgb2YgY29sdW1uIHByZWZpeGVzLiAqLworCQlleHQgPSAmbm9kZS0+ZXh0
OworCX0gZWxzZSB7CisJCS8qIFJFRFVOREFOVCBhbmQgQ09NUEFDVCBmb3JtYXRzIHN0b3JlIGEg
bG9jYWwKKwkJNzY4LWJ5dGUgcHJlZml4IG9mIGVhY2ggZXh0ZXJuYWxseSBzdG9yZWQgY29sdW1u
LgorCQlObyBjYWNoZSBpcyBuZWVkZWQuICovCisJCWV4dCA9IE5VTEw7CisJCW5vZGUtPmV4dCA9
IE5VTEw7CisJfQorCiAJbm9kZS0+cm93ID0gcm93X2J1aWxkKFJPV19DT1BZX0RBVEEsIGNsdXN0
X2luZGV4LCByZWMsIG9mZnNldHMsCi0JCQkgICAgICBOVUxMLCAmbm9kZS0+ZXh0LCBub2RlLT5o
ZWFwKTsKKwkJCSAgICAgIE5VTEwsIGV4dCwgbm9kZS0+aGVhcCk7CiAJaWYgKG5vZGUtPmlzX2Rl
bGV0ZSkgewogCQlub2RlLT51cGRfcm93ID0gTlVMTDsKIAkJbm9kZS0+dXBkX2V4dCA9IE5VTEw7
Cgo=

--===============0579333168==
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: 4a68a0a02ad5971ccb0bde8706b657c5743310a2
# timestamp: 2010-06-29 16:13:44 +0300
# base_revision_id: jimmy.yang@stripped\
#   690sacm5sogruzvb
# 
# Begin bundle
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


--===============0579333168==--