From: marko.makela
Date: May 24 2010 11:05am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3478 to 3479) Bug#53578
List-Archive: http://lists.mysql.com/commits/109038
X-Bug: 53578
Message-Id: <201005241106.o4OAxwMo014295@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2018165134=="

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

IDM0NzkgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0yNAogICAgICBCdWcjNTM1Nzg6IGFzc2VydCBv
biBpbnZhbGlkIHBhZ2UgYWNjZXNzLCBpbiBmaWxfaW8oKQogICAgICAKICAgICAgU3RvcmUgdGhl
IG1heF9zcGFjZV9pZCBpbiB0aGUgZGF0YSBkaWN0aW9uYXJ5IGhlYWRlciBpbiBvcmRlciB0byBh
dm9pZAogICAgICBzcGFjZV9pZCByZXVzZS4KICAgICAgCiAgICAgIERJQ1RfSERSX01JWF9JRDog
UmVuYW1lZCB0byBESUNUX0hEUl9NQVhfU1BBQ0VfSUQsIERJQ1RfSERSX01JWF9JRF9MT1cuCiAg
ICAgIAogICAgICBkaWN0X2hkcl9nZXRfbmV3X2lkKCk6IFJldHVybiB0YWJsZV9pZCwgaW5kZXhf
aWQsIHNwYWNlX2lkIG9yIGEgc3Vic2V0IG9mIHRoZW0uCiAgICAgIAogICAgICBmaWxfc3lzdGVt
X3Q6IEFkZCBpYm9vbCBzcGFjZV9pZF9yZXVzZV93YXJuZWQuCiAgICAgIAogICAgICBmaWxfY3Jl
YXRlX25ld19zaW5nbGVfdGFibGVfdGFibGVzcGFjZSgpOiBHZXQgdGhlIHNwYWNlX2lkIGZyb20g
dGhlIGNhbGxlci4KICAgICAgCiAgICAgIGZpbF9zcGFjZV9jcmVhdGUoKTogSXNzdWUgYSB3YXJu
aW5nIGlmIHRoZSBmaWxfc3lzdGVtLT5tYXhfYXNzaWduZWRfaWQKICAgICAgaXMgZXhjZWVkZWQu
CiAgICAgIAogICAgICBmaWxfYXNzaWduX25ld19zcGFjZV9pZCgpOiBSZXR1cm4gVFJVRS9GQUxT
RSBhbmQgdGFrZSBhIHBvaW50ZXIgdG8gdGhlCiAgICAgIHNwYWNlX2lkIGFzIGEgcGFyYW1ldGVy
LiBNYWtlIHRoZSBmdW5jdGlvbiBwdWJsaWMuCiAgICAgIAogICAgICBmaWxfaW5pdCgpOiBJbml0
aWFsaXplIGFsbCBmaWxfc3lzdGVtIGZpZWxkcyBieSBtZW1femFsbG9jKCkuIFJlbW92ZQogICAg
ICBleHBsaWNpdCBpbml0aWFsaXphdGlvbnMgb2YgY2VydGFpbiBmaWVsZHMgdG8gMCBvciBOVUxM
LgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vZGljdC9kaWN0MGJv
b3QuYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vZGljdC9kaWN0MGNyZWEuYwogICAgICBz
dG9yYWdlL2lubm9kYl9wbHVnaW4vZmlsL2ZpbDBmaWwuYwogICAgICBzdG9yYWdlL2lubm9kYl9w
bHVnaW4vaW5jbHVkZS9kaWN0MGJvb3QuaAogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5j
bHVkZS9maWwwZmlsLmgKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwbXlzcWwu
YwogMzQ3OCBWYXNpbCBEaW1vdgkyMDEwLTA1LTIwIFttZXJnZV0KICAgICAgTWVyZ2UgbXlzcWwt
NS4xLWlubm9kYiBmcm9tIGJrLWludGVybmFsIGludG8gbXkgbG9jYWwgdHJlZQoKICAgIG1vZGlm
aWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBscnUuYwogICAgICBzdG9y
YWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9idWYwbHJ1LmgKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9kaWN0L2RpY3QwYm9vdC5jJwotLS0gYS9zdG9yYWdlL2lubm9k
Yl9wbHVnaW4vZGljdC9kaWN0MGJvb3QuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIw
MTAwNTIwMTMzMTU3LTQydWs1cTNwcDB2c2luYWMKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L2RpY3QvZGljdDBib290LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MjQx
MTA0MzktZmF6aTcwcmxtdDA3dHpkOQpAQCAtNjIsMzIgKzYyLDQ3IEBAIGRpY3RfaGRyX2dldCgK
IH0KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKiovLyoqCi1SZXR1cm5zIGEgbmV3IHRhYmxlLCBpbmRleCwgb3Ig
dHJlZSBpZC4KLUByZXR1cm4JdGhlIG5ldyBpZCAqLworUmV0dXJucyBhIG5ldyB0YWJsZSwgaW5k
ZXgsIG9yIHNwYWNlIGlkLiAqLwogVU5JVl9JTlRFUk4KLWR1bGludAordm9pZAogZGljdF9oZHJf
Z2V0X25ld19pZCgKIC8qPT09PT09PT09PT09PT09PSovCi0JdWxpbnQJdHlwZSkJLyohPCBpbjog
RElDVF9IRFJfUk9XX0lELCAuLi4gKi8KKwlkdWxpbnQqCXRhYmxlX2lkLAkvKiE8IG91dDogdGFi
bGUgaWQgKG5vdCBhc3NpZ25lZCBpZiBOVUxMKSAqLworCWR1bGludCoJaW5kZXhfaWQsCS8qITwg
b3V0OiBpbmRleCBpZCAobm90IGFzc2lnbmVkIGlmIE5VTEwpICovCisJdWxpbnQqCXNwYWNlX2lk
KQkvKiE8IG91dDogc3BhY2UgaWQgKG5vdCBhc3NpZ25lZCBpZiBOVUxMKSAqLwogewogCWRpY3Rf
aGRyX3QqCWRpY3RfaGRyOwogCWR1bGludAkJaWQ7CiAJbXRyX3QJCW10cjsKIAotCXV0X2FkKCh0
eXBlID09IERJQ1RfSERSX1RBQkxFX0lEKSB8fCAodHlwZSA9PSBESUNUX0hEUl9JTkRFWF9JRCkp
OwotCiAJbXRyX3N0YXJ0KCZtdHIpOwogCiAJZGljdF9oZHIgPSBkaWN0X2hkcl9nZXQoJm10cik7
CiAKLQlpZCA9IG10cl9yZWFkX2R1bGludChkaWN0X2hkciArIHR5cGUsICZtdHIpOwotCWlkID0g
dXRfZHVsaW50X2FkZChpZCwgMSk7Ci0KLQltbG9nX3dyaXRlX2R1bGludChkaWN0X2hkciArIHR5
cGUsIGlkLCAmbXRyKTsKKwlpZiAodGFibGVfaWQpIHsKKwkJaWQgPSBtdHJfcmVhZF9kdWxpbnQo
ZGljdF9oZHIgKyBESUNUX0hEUl9UQUJMRV9JRCwgJm10cik7CisJCWlkID0gdXRfZHVsaW50X2Fk
ZChpZCwgMSk7CisJCW1sb2dfd3JpdGVfZHVsaW50KGRpY3RfaGRyICsgRElDVF9IRFJfVEFCTEVf
SUQsIGlkLCAmbXRyKTsKKwkJKnRhYmxlX2lkID0gaWQ7CisJfQorCisJaWYgKGluZGV4X2lkKSB7
CisJCWlkID0gbXRyX3JlYWRfZHVsaW50KGRpY3RfaGRyICsgRElDVF9IRFJfSU5ERVhfSUQsICZt
dHIpOworCQlpZCA9IHV0X2R1bGludF9hZGQoaWQsIDEpOworCQltbG9nX3dyaXRlX2R1bGludChk
aWN0X2hkciArIERJQ1RfSERSX0lOREVYX0lELCBpZCwgJm10cik7CisJCSppbmRleF9pZCA9IGlk
OworCX0KKworCWlmIChzcGFjZV9pZCkgeworCQkqc3BhY2VfaWQgPSBtdHJfcmVhZF91bGludChk
aWN0X2hkciArIERJQ1RfSERSX01BWF9TUEFDRV9JRCwKKwkJCQkJICAgTUxPR180QllURVMsICZt
dHIpOworCQlpZiAoZmlsX2Fzc2lnbl9uZXdfc3BhY2VfaWQoc3BhY2VfaWQpKSB7CisJCQltbG9n
X3dyaXRlX3VsaW50KGRpY3RfaGRyICsgRElDVF9IRFJfTUFYX1NQQUNFX0lELAorCQkJCQkgKnNw
YWNlX2lkLCBNTE9HXzRCWVRFUywgJm10cik7CisJCX0KKwl9CiAKIAltdHJfY29tbWl0KCZtdHIp
OwotCi0JcmV0dXJuKGlkKTsKIH0KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCkBAIC0xNTEsOSArMTY2
LDEyIEBAIGRpY3RfaGRyX2NyZWF0ZSgKIAltbG9nX3dyaXRlX2R1bGludChkaWN0X2hlYWRlciAr
IERJQ1RfSERSX0lOREVYX0lELAogCQkJICB1dF9kdWxpbnRfY3JlYXRlKDAsIERJQ1RfSERSX0ZJ
UlNUX0lEKSwgbXRyKTsKIAotCS8qIE9ic29sZXRlLCBidXQgd2UgbXVzdCBpbml0aWFsaXplIGl0
IHRvIDAgYW55d2F5LiAqLwotCW1sb2dfd3JpdGVfZHVsaW50KGRpY3RfaGVhZGVyICsgRElDVF9I
RFJfTUlYX0lELAotCQkJICB1dF9kdWxpbnRfY3JlYXRlKDAsIERJQ1RfSERSX0ZJUlNUX0lEKSwg
bXRyKTsKKwltbG9nX3dyaXRlX3VsaW50KGRpY3RfaGVhZGVyICsgRElDVF9IRFJfTUFYX1NQQUNF
X0lELAorCQkJIDAsIE1MT0dfNEJZVEVTLCBtdHIpOworCisJLyogT2Jzb2xldGUsIGJ1dCB3ZSBt
dXN0IGluaXRpYWxpemUgaXQgYW55d2F5LiAqLworCW1sb2dfd3JpdGVfdWxpbnQoZGljdF9oZWFk
ZXIgKyBESUNUX0hEUl9NSVhfSURfTE9XLAorCQkJIERJQ1RfSERSX0ZJUlNUX0lELCBNTE9HXzRC
WVRFUywgbXRyKTsKIAogCS8qIENyZWF0ZSB0aGUgQi10cmVlIHJvb3RzIGZvciB0aGUgY2x1c3Rl
cmVkIGluZGV4ZXMgb2YgdGhlIGJhc2ljCiAJc3lzdGVtIHRhYmxlcyAqLwoKPT09IG1vZGlmaWVk
IGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9kaWN0L2RpY3QwY3JlYS5jJwotLS0gYS9zdG9y
YWdlL2lubm9kYl9wbHVnaW4vZGljdC9kaWN0MGNyZWEuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFj
bGUuY29tLTIwMTAwNTIwMTMzMTU3LTQydWs1cTNwcDB2c2luYWMKKysrIGIvc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL2RpY3QvZGljdDBjcmVhLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMDA1MjQxMTA0MzktZmF6aTcwcmxtdDA3dHpkOQpAQCAtMjM5LDE2ICsyMzksMjIgQEAgZGlj
dF9idWlsZF90YWJsZV9kZWZfc3RlcCgKIAljb25zdCBjaGFyKglwYXRoX29yX25hbWU7CiAJaWJv
b2wJCWlzX3BhdGg7CiAJbXRyX3QJCW10cjsKKwl1bGludAkJc3BhY2UgPSAwOwogCiAJdXRfYWQo
bXV0ZXhfb3duKCYoZGljdF9zeXMtPm11dGV4KSkpOwogCiAJdGFibGUgPSBub2RlLT50YWJsZTsK
IAotCXRhYmxlLT5pZCA9IGRpY3RfaGRyX2dldF9uZXdfaWQoRElDVF9IRFJfVEFCTEVfSUQpOwor
CWRpY3RfaGRyX2dldF9uZXdfaWQoJnRhYmxlLT5pZCwgTlVMTCwKKwkJCSAgICBzcnZfZmlsZV9w
ZXJfdGFibGUgPyAmc3BhY2UgOiBOVUxMKTsKIAogCXRocl9nZXRfdHJ4KHRociktPnRhYmxlX2lk
ID0gdGFibGUtPmlkOwogCiAJaWYgKHNydl9maWxlX3Blcl90YWJsZSkgeworCQlpZiAoVU5JVl9V
TkxJS0VMWShzcGFjZSA9PSBVTElOVF9VTkRFRklORUQpKSB7CisJCQlyZXR1cm4oREJfRVJST1Ip
OworCQl9CisKIAkJLyogV2UgY3JlYXRlIGEgbmV3IHNpbmdsZS10YWJsZSB0YWJsZXNwYWNlIGZv
ciB0aGUgdGFibGUuCiAJCVdlIGluaXRpYWxseSBsZXQgaXQgYmUgNCBwYWdlczoKIAkJLSBwYWdl
IDAgaXMgdGhlIGZzcCBoZWFkZXIgYW5kIGFuIGV4dGVudCBkZXNjcmlwdG9yIHBhZ2UsCkBAIC0y
NTcsOCArMjYzLDYgQEAgZGljdF9idWlsZF90YWJsZV9kZWZfc3RlcCgKIAkJLSBwYWdlIDMgd2ls
bCBjb250YWluIHRoZSByb290IG9mIHRoZSBjbHVzdGVyZWQgaW5kZXggb2YgdGhlCiAJCXRhYmxl
IHdlIGNyZWF0ZSBoZXJlLiAqLwogCi0JCXVsaW50CXNwYWNlID0gMDsJLyogcmVzZXQgdG8gemVy
byBmb3IgdGhlIGNhbGwgYmVsb3cgKi8KLQogCQlpZiAodGFibGUtPmRpcl9wYXRoX29mX3RlbXBf
dGFibGUpIHsKIAkJCS8qIFdlIHBsYWNlIHRhYmxlcyBjcmVhdGVkIHdpdGggQ1JFQVRFIFRFTVBP
UkFSWQogCQkJVEFCTEUgaW4gdGhlIHRtcCBkaXIgb2YgbXlzcWxkIHNlcnZlciAqLwpAQCAtMjc2
LDcgKzI4MCw3IEBAIGRpY3RfYnVpbGRfdGFibGVfZGVmX3N0ZXAoCiAKIAkJZmxhZ3MgPSB0YWJs
ZS0+ZmxhZ3MgJiB+KH4wIDw8IERJQ1RfVEZfQklUUyk7CiAJCWVycm9yID0gZmlsX2NyZWF0ZV9u
ZXdfc2luZ2xlX3RhYmxlX3RhYmxlc3BhY2UoCi0JCQkmc3BhY2UsIHBhdGhfb3JfbmFtZSwgaXNf
cGF0aCwKKwkJCXNwYWNlLCBwYXRoX29yX25hbWUsIGlzX3BhdGgsCiAJCQlmbGFncyA9PSBESUNU
X1RGX0NPTVBBQ1QgPyAwIDogZmxhZ3MsCiAJCQlGSUxfSUJEX0ZJTEVfSU5JVElBTF9TSVpFKTsK
IAkJdGFibGUtPnNwYWNlID0gKHVuc2lnbmVkIGludCkgc3BhY2U7CkBAIC01NjEsNyArNTY1LDcg
QEAgZGljdF9idWlsZF9pbmRleF9kZWZfc3RlcCgKIAl1dF9hZCgoVVRfTElTVF9HRVRfTEVOKHRh
YmxlLT5pbmRleGVzKSA+IDApCiAJICAgICAgfHwgZGljdF9pbmRleF9pc19jbHVzdChpbmRleCkp
OwogCi0JaW5kZXgtPmlkID0gZGljdF9oZHJfZ2V0X25ld19pZChESUNUX0hEUl9JTkRFWF9JRCk7
CisJZGljdF9oZHJfZ2V0X25ld19pZChOVUxMLCAmaW5kZXgtPmlkLCBOVUxMKTsKIAogCS8qIElu
aGVyaXQgdGhlIHNwYWNlIGlkIGZyb20gdGhlIHRhYmxlOyB3ZSBzdG9yZSBhbGwgaW5kZXhlcyBv
ZiBhCiAJdGFibGUgaW4gdGhlIHNhbWUgdGFibGVzcGFjZSAqLwoKPT09IG1vZGlmaWVkIGZpbGUg
J3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9maWwvZmlsMGZpbC5jJwotLS0gYS9zdG9yYWdlL2lubm9k
Yl9wbHVnaW4vZmlsL2ZpbDBmaWwuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAw
NTIwMTMzMTU3LTQydWs1cTNwcDB2c2luYWMKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2Zp
bC9maWwwZmlsLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MjQxMTA0Mzkt
ZmF6aTcwcmxtdDA3dHpkOQpAQCAtMjc5LDYgKzI3OSwxMCBAQCBzdHJ1Y3QgZmlsX3N5c3RlbV9z
dHJ1Y3QgewogCQkJCQlyZXF1ZXN0ICovCiAJVVRfTElTVF9CQVNFX05PREVfVChmaWxfc3BhY2Vf
dCkgc3BhY2VfbGlzdDsKIAkJCQkJLyohPCBsaXN0IG9mIGFsbCBmaWxlIHNwYWNlcyAqLworCWli
b29sCQlzcGFjZV9pZF9yZXVzZV93YXJuZWQ7CisJCQkJCS8qICE8IFRSVUUgaWYgZmlsX3NwYWNl
X2NyZWF0ZSgpCisJCQkJCWhhcyBpc3N1ZWQgYSB3YXJuaW5nIGFib3V0CisJCQkJCXBvdGVudGlh
bCBzcGFjZV9pZCByZXVzZSAqLwogfTsKIAogLyoqIFRoZSB0YWJsZXNwYWNlIG1lbW9yeSBjYWNo
ZS4gVGhpcyB2YXJpYWJsZSBpcyBOVUxMIGJlZm9yZSB0aGUgbW9kdWxlIGlzCkBAIC0xMTkzLDcg
KzExOTcsMTkgQEAgdHJ5X2FnYWluOgogCXNwYWNlLT50YWJsZXNwYWNlX3ZlcnNpb24gPSBmaWxf
c3lzdGVtLT50YWJsZXNwYWNlX3ZlcnNpb247CiAJc3BhY2UtPm1hcmsgPSBGQUxTRTsKIAotCWlm
IChwdXJwb3NlID09IEZJTF9UQUJMRVNQQUNFICYmIGlkID4gZmlsX3N5c3RlbS0+bWF4X2Fzc2ln
bmVkX2lkKSB7CisJaWYgKFVOSVZfTElLRUxZKHB1cnBvc2UgPT0gRklMX1RBQkxFU1BBQ0UpCisJ
ICAgICYmIFVOSVZfVU5MSUtFTFkoaWQgPiBmaWxfc3lzdGVtLT5tYXhfYXNzaWduZWRfaWQpKSB7
CisJCWlmICghZmlsX3N5c3RlbS0+c3BhY2VfaWRfcmV1c2Vfd2FybmVkKSB7CisJCQlmaWxfc3lz
dGVtLT5zcGFjZV9pZF9yZXVzZV93YXJuZWQgPSBUUlVFOworCisJCQl1dF9wcmludF90aW1lc3Rh
bXAoc3RkZXJyKTsKKwkJCWZwcmludGYoc3RkZXJyLAorCQkJCSIgIElubm9EQjogV2FybmluZzog
YWxsb2NhdGVkIHRhYmxlc3BhY2UgJWx1LCIKKwkJCQkiIG9sZCBtYXhpbXVtIHdhcyAlbHVcbiIs
CisJCQkJKHVsb25nKSBpZCwKKwkJCQkodWxvbmcpIGZpbF9zeXN0ZW0tPm1heF9hc3NpZ25lZF9p
ZCk7CisJCX0KKwogCQlmaWxfc3lzdGVtLT5tYXhfYXNzaWduZWRfaWQgPSBpZDsKIAl9CiAKQEAg
LTEyMzEsMTkgKzEyNDcsMjUgQEAgdHJ5X2FnYWluOgogQXNzaWducyBhIG5ldyBzcGFjZSBpZCBm
b3IgYSBuZXcgc2luZ2xlLXRhYmxlIHRhYmxlc3BhY2UuIFRoaXMgd29ya3Mgc2ltcGx5IGJ5CiBp
bmNyZW1lbnRpbmcgdGhlIGdsb2JhbCBjb3VudGVyLiBJZiA0IGJpbGxpb24gaWQncyBpcyBub3Qg
ZW5vdWdoLCB3ZSBtYXkgbmVlZAogdG8gcmVjeWNsZSBpZCdzLgotQHJldHVybgluZXcgdGFibGVz
cGFjZSBpZDsgVUxJTlRfVU5ERUZJTkVEIGlmIGNvdWxkIG5vdCBhc3NpZ24gYW4gaWQgKi8KLXN0
YXRpYwotdWxpbnQKLWZpbF9hc3NpZ25fbmV3X3NwYWNlX2lkKHZvaWQpCi0vKj09PT09PT09PT09
PT09PT09PT09PT09PT0qLworQHJldHVybglUUlVFIGlmIGFzc2lnbmVkLCBGQUxTRSBpZiBub3Qg
Ki8KK1VOSVZfSU5URVJOCitpYm9vbAorZmlsX2Fzc2lnbl9uZXdfc3BhY2VfaWQoCisvKj09PT09
PT09PT09PT09PT09PT09Ki8KKwl1bGludCoJc3BhY2VfaWQpCS8qITwgaW4vb3V0OiBzcGFjZSBp
ZCAqLwogewotCXVsaW50CQlpZDsKKwl1bGludAlpZDsKKwlpYm9vbAlzdWNjZXNzOwogCiAJbXV0
ZXhfZW50ZXIoJmZpbF9zeXN0ZW0tPm11dGV4KTsKIAotCWZpbF9zeXN0ZW0tPm1heF9hc3NpZ25l
ZF9pZCsrOworCWlkID0gKnNwYWNlX2lkOwogCi0JaWQgPSBmaWxfc3lzdGVtLT5tYXhfYXNzaWdu
ZWRfaWQ7CisJaWYgKGlkIDwgZmlsX3N5c3RlbS0+bWF4X2Fzc2lnbmVkX2lkKSB7CisJCWlkID0g
ZmlsX3N5c3RlbS0+bWF4X2Fzc2lnbmVkX2lkOworCX0KKworCWlkKys7CiAKIAlpZiAoaWQgPiAo
U1JWX0xPR19TUEFDRV9GSVJTVF9JRCAvIDIpICYmIChpZCAlIDEwMDAwMDBVTCA9PSAwKSkgewog
CQl1dF9wcmludF90aW1lc3RhbXAoc3RkZXJyKTsKQEAgLTEyNTksNyArMTI4MSwxMSBAQCBmaWxf
YXNzaWduX25ld19zcGFjZV9pZCh2b2lkKQogCQkJKHVsb25nKSBTUlZfTE9HX1NQQUNFX0ZJUlNU
X0lEKTsKIAl9CiAKLQlpZiAoaWQgPj0gU1JWX0xPR19TUEFDRV9GSVJTVF9JRCkgeworCXN1Y2Nl
c3MgPSAoaWQgPCBTUlZfTE9HX1NQQUNFX0ZJUlNUX0lEKTsKKworCWlmIChzdWNjZXNzKSB7CisJ
CSpzcGFjZV9pZCA9IGZpbF9zeXN0ZW0tPm1heF9hc3NpZ25lZF9pZCA9IGlkOworCX0gZWxzZSB7
CiAJCXV0X3ByaW50X3RpbWVzdGFtcChzdGRlcnIpOwogCQlmcHJpbnRmKHN0ZGVyciwKIAkJCSJJ
bm5vREI6IFlvdSBoYXZlIHJ1biBvdXQgb2Ygc2luZ2xlLXRhYmxlIgpAQCAtMTI2OSwxNCArMTI5
NSwxMiBAQCBmaWxfYXNzaWduX25ld19zcGFjZV9pZCh2b2lkKQogCQkJIiBoYXZlIHRvIGR1bXAg
YWxsIHlvdXIgdGFibGVzIGFuZFxuIgogCQkJIklubm9EQjogcmVjcmVhdGUgdGhlIHdob2xlIElu
bm9EQiBpbnN0YWxsYXRpb24uXG4iLAogCQkJKHVsb25nKSBpZCk7Ci0JCWZpbF9zeXN0ZW0tPm1h
eF9hc3NpZ25lZF9pZC0tOwotCi0JCWlkID0gVUxJTlRfVU5ERUZJTkVEOworCQkqc3BhY2VfaWQg
PSBVTElOVF9VTkRFRklORUQ7CiAJfQogCiAJbXV0ZXhfZXhpdCgmZmlsX3N5c3RlbS0+bXV0ZXgp
OwogCi0JcmV0dXJuKGlkKTsKKwlyZXR1cm4oc3VjY2Vzcyk7CiB9CiAKIC8qKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8q
KgpAQCAtMTUxMiw3ICsxNTM2LDcgQEAgZmlsX2luaXQoCiAJdXRfYShoYXNoX3NpemUgPiAwKTsK
IAl1dF9hKG1heF9uX29wZW4gPiAwKTsKIAotCWZpbF9zeXN0ZW0gPSBtZW1fYWxsb2Moc2l6ZW9m
KGZpbF9zeXN0ZW1fdCkpOworCWZpbF9zeXN0ZW0gPSBtZW1femFsbG9jKHNpemVvZihmaWxfc3lz
dGVtX3QpKTsKIAogCW11dGV4X2NyZWF0ZSgmZmlsX3N5c3RlbS0+bXV0ZXgsIFNZTkNfQU5ZX0xB
VENIKTsKIApAQCAtMTUyMSwxNiArMTU0NSw3IEBAIGZpbF9pbml0KAogCiAJVVRfTElTVF9JTklU
KGZpbF9zeXN0ZW0tPkxSVSk7CiAKLQlmaWxfc3lzdGVtLT5uX29wZW4gPSAwOwogCWZpbF9zeXN0
ZW0tPm1heF9uX29wZW4gPSBtYXhfbl9vcGVuOwotCi0JZmlsX3N5c3RlbS0+bW9kaWZpY2F0aW9u
X2NvdW50ZXIgPSAwOwotCWZpbF9zeXN0ZW0tPm1heF9hc3NpZ25lZF9pZCA9IDA7Ci0KLQlmaWxf
c3lzdGVtLT50YWJsZXNwYWNlX3ZlcnNpb24gPSAwOwotCi0JVVRfTElTVF9JTklUKGZpbF9zeXN0
ZW0tPnVuZmx1c2hlZF9zcGFjZXMpOwotCVVUX0xJU1RfSU5JVChmaWxfc3lzdGVtLT5zcGFjZV9s
aXN0KTsKIH0KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKiovLyoqCkBAIC0yMTE1LDcgKzIxMzAsNyBAQCBmaWxfb3Bf
bG9nX3BhcnNlX29yX3JlcGxheSgKIAkJCWZpbF9jcmVhdGVfZGlyZWN0b3J5X2Zvcl90YWJsZW5h
bWUobmFtZSk7CiAKIAkJCWlmIChmaWxfY3JlYXRlX25ld19zaW5nbGVfdGFibGVfdGFibGVzcGFj
ZSgKLQkJCQkgICAgJnNwYWNlX2lkLCBuYW1lLCBGQUxTRSwgZmxhZ3MsCisJCQkJICAgIHNwYWNl
X2lkLCBuYW1lLCBGQUxTRSwgZmxhZ3MsCiAJCQkJICAgIEZJTF9JQkRfRklMRV9JTklUSUFMX1NJ
WkUpICE9IERCX1NVQ0NFU1MpIHsKIAkJCQl1dF9lcnJvcjsKIAkJCX0KQEAgLTI1NjIsOSArMjU3
Nyw3IEBAIFVOSVZfSU5URVJOCiB1bGludAogZmlsX2NyZWF0ZV9uZXdfc2luZ2xlX3RhYmxlX3Rh
Ymxlc3BhY2UoCiAvKj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KLQl1bGlu
dCoJCXNwYWNlX2lkLAkvKiE8IGluL291dDogc3BhY2UgaWQ7IGlmIHRoaXMgaXMgIT0gMCwKLQkJ
CQkJdGhlbiB0aGlzIGlzIGFuIGlucHV0IHBhcmFtZXRlciwKLQkJCQkJb3RoZXJ3aXNlIG91dHB1
dCAqLworCXVsaW50CQlzcGFjZV9pZCwJLyohPCBpbjogc3BhY2UgaWQgKi8KIAljb25zdCBjaGFy
Kgl0YWJsZW5hbWUsCS8qITwgaW46IHRoZSB0YWJsZSBuYW1lIGluIHRoZSB1c3VhbAogCQkJCQlk
YXRhYmFzZW5hbWUvdGFibGVuYW1lIGZvcm1hdAogCQkJCQlvZiBJbm5vREIsIG9yIGEgZGlyIHBh
dGggdG8gYSB0ZW1wCkBAIC0yNTg0LDYgKzI1OTcsOCBAQCBmaWxfY3JlYXRlX25ld19zaW5nbGVf
dGFibGVfdGFibGVzcGFjZSgKIAlpYm9vbAkJc3VjY2VzczsKIAljaGFyKgkJcGF0aDsKIAorCXV0
X2Eoc3BhY2VfaWQgPiAwKTsKKwl1dF9hKHNwYWNlX2lkIDwgU1JWX0xPR19TUEFDRV9GSVJTVF9J
RCk7CiAJdXRfYShzaXplID49IEZJTF9JQkRfRklMRV9JTklUSUFMX1NJWkUpOwogCS8qIFRoZSB0
YWJsZXNwYWNlIGZsYWdzIChGU1BfU1BBQ0VfRkxBR1MpIHNob3VsZCBiZSAwIGZvcgogCVJPV19G
T1JNQVQ9Q09NUEFDVApAQCAtMjY0MCwzOCArMjY1NSwyMSBAQCBmaWxfY3JlYXRlX25ld19zaW5n
bGVfdGFibGVfdGFibGVzcGFjZSgKIAkJcmV0dXJuKERCX0VSUk9SKTsKIAl9CiAKLQlidWYyID0g
dXRfbWFsbG9jKDMgKiBVTklWX1BBR0VfU0laRSk7Ci0JLyogQWxpZ24gdGhlIG1lbW9yeSBmb3Ig
ZmlsZSBpL28gaWYgd2UgbWlnaHQgaGF2ZSBPX0RJUkVDVCBzZXQgKi8KLQlwYWdlID0gdXRfYWxp
Z24oYnVmMiwgVU5JVl9QQUdFX1NJWkUpOwotCiAJcmV0ID0gb3NfZmlsZV9zZXRfc2l6ZShwYXRo
LCBmaWxlLCBzaXplICogVU5JVl9QQUdFX1NJWkUsIDApOwogCiAJaWYgKCFyZXQpIHsKLQkJdXRf
ZnJlZShidWYyKTsKLQkJb3NfZmlsZV9jbG9zZShmaWxlKTsKLQkJb3NfZmlsZV9kZWxldGUocGF0
aCk7Ci0KLQkJbWVtX2ZyZWUocGF0aCk7Ci0JCXJldHVybihEQl9PVVRfT0ZfRklMRV9TUEFDRSk7
Ci0JfQotCi0JaWYgKCpzcGFjZV9pZCA9PSAwKSB7Ci0JCSpzcGFjZV9pZCA9IGZpbF9hc3NpZ25f
bmV3X3NwYWNlX2lkKCk7Ci0JfQotCi0JLyogcHJpbnRmKCJDcmVhdGluZyB0YWJsZXNwYWNlICVz
IGlkICVsdVxuIiwgcGF0aCwgKnNwYWNlX2lkKTsgKi8KLQotCWlmICgqc3BhY2VfaWQgPT0gVUxJ
TlRfVU5ERUZJTkVEKSB7Ci0JCXV0X2ZyZWUoYnVmMik7CisJCWVyciA9IERCX09VVF9PRl9GSUxF
X1NQQUNFOwogZXJyb3JfZXhpdDoKIAkJb3NfZmlsZV9jbG9zZShmaWxlKTsKIGVycm9yX2V4aXQy
OgogCQlvc19maWxlX2RlbGV0ZShwYXRoKTsKIAogCQltZW1fZnJlZShwYXRoKTsKLQkJcmV0dXJu
KERCX0VSUk9SKTsKKwkJcmV0dXJuKGVycik7CiAJfQogCisJLyogcHJpbnRmKCJDcmVhdGluZyB0
YWJsZXNwYWNlICVzIGlkICVsdVxuIiwgcGF0aCwgc3BhY2VfaWQpOyAqLworCiAJLyogV2UgaGF2
ZSB0byB3cml0ZSB0aGUgc3BhY2UgaWQgdG8gdGhlIGZpbGUgaW1tZWRpYXRlbHkgYW5kIGZsdXNo
IHRoZQogCWZpbGUgdG8gZGlzay4gVGhpcyBpcyBiZWNhdXNlIGluIGNyYXNoIHJlY292ZXJ5IHdl
IG11c3QgYmUgYXdhcmUgd2hhdAogCXRhYmxlc3BhY2VzIGV4aXN0IGFuZCB3aGF0IGFyZSB0aGVp
ciBzcGFjZSBpZCdzLCBzbyB0aGF0IHdlIGNhbiBhcHBseQpAQCAtMjY4MSwxMCArMjY3OSwxNCBA
QCBlcnJvcl9leGl0MjoKIAl3aXRoIHplcm9zIGZyb20gdGhlIGNhbGwgb2Ygb3NfZmlsZV9zZXRf
c2l6ZSgpLCB1bnRpbCBhIGJ1ZmZlciBwb29sCiAJZmx1c2ggd291bGQgd3JpdGUgdG8gaXQuICov
CiAKKwlidWYyID0gdXRfbWFsbG9jKDMgKiBVTklWX1BBR0VfU0laRSk7CisJLyogQWxpZ24gdGhl
IG1lbW9yeSBmb3IgZmlsZSBpL28gaWYgd2UgbWlnaHQgaGF2ZSBPX0RJUkVDVCBzZXQgKi8KKwlw
YWdlID0gdXRfYWxpZ24oYnVmMiwgVU5JVl9QQUdFX1NJWkUpOworCiAJbWVtc2V0KHBhZ2UsICdc
MCcsIFVOSVZfUEFHRV9TSVpFKTsKIAotCWZzcF9oZWFkZXJfaW5pdF9maWVsZHMocGFnZSwgKnNw
YWNlX2lkLCBmbGFncyk7Ci0JbWFjaF93cml0ZV90b180KHBhZ2UgKyBGSUxfUEFHRV9BUkNIX0xP
R19OT19PUl9TUEFDRV9JRCwgKnNwYWNlX2lkKTsKKwlmc3BfaGVhZGVyX2luaXRfZmllbGRzKHBh
Z2UsIHNwYWNlX2lkLCBmbGFncyk7CisJbWFjaF93cml0ZV90b180KHBhZ2UgKyBGSUxfUEFHRV9B
UkNIX0xPR19OT19PUl9TUEFDRV9JRCwgc3BhY2VfaWQpOwogCiAJaWYgKCEoZmxhZ3MgJiBESUNU
X1RGX1pTU0laRV9NQVNLKSkgewogCQlidWZfZmx1c2hfaW5pdF9mb3Jfd3JpdGluZyhwYWdlLCBO
VUxMLCAwKTsKQEAgLTI3MTUsNiArMjcxNyw3IEBAIGVycm9yX2V4aXQyOgogCQkgICAgICAiIHRv
IHRhYmxlc3BhY2UgIiwgc3RkZXJyKTsKIAkJdXRfcHJpbnRfZmlsZW5hbWUoc3RkZXJyLCBwYXRo
KTsKIAkJcHV0YygnXG4nLCBzdGRlcnIpOworCQllcnIgPSBEQl9FUlJPUjsKIAkJZ290byBlcnJv
cl9leGl0OwogCX0KIApAQCAtMjcyNCwyMiArMjcyNywyMCBAQCBlcnJvcl9leGl0MjoKIAkJZnB1
dHMoIklubm9EQjogRXJyb3I6IGZpbGUgZmx1c2ggb2YgdGFibGVzcGFjZSAiLCBzdGRlcnIpOwog
CQl1dF9wcmludF9maWxlbmFtZShzdGRlcnIsIHBhdGgpOwogCQlmcHV0cygiIGZhaWxlZFxuIiwg
c3RkZXJyKTsKKwkJZXJyID0gREJfRVJST1I7CiAJCWdvdG8gZXJyb3JfZXhpdDsKIAl9CiAKIAlv
c19maWxlX2Nsb3NlKGZpbGUpOwogCi0JaWYgKCpzcGFjZV9pZCA9PSBVTElOVF9VTkRFRklORUQp
IHsKLQkJZ290byBlcnJvcl9leGl0MjsKLQl9Ci0KLQlzdWNjZXNzID0gZmlsX3NwYWNlX2NyZWF0
ZShwYXRoLCAqc3BhY2VfaWQsIGZsYWdzLCBGSUxfVEFCTEVTUEFDRSk7CisJc3VjY2VzcyA9IGZp
bF9zcGFjZV9jcmVhdGUocGF0aCwgc3BhY2VfaWQsIGZsYWdzLCBGSUxfVEFCTEVTUEFDRSk7CiAK
IAlpZiAoIXN1Y2Nlc3MpIHsKKwkJZXJyID0gREJfRVJST1I7CiAJCWdvdG8gZXJyb3JfZXhpdDI7
CiAJfQogCi0JZmlsX25vZGVfY3JlYXRlKHBhdGgsIHNpemUsICpzcGFjZV9pZCwgRkFMU0UpOwor
CWZpbF9ub2RlX2NyZWF0ZShwYXRoLCBzaXplLCBzcGFjZV9pZCwgRkFMU0UpOwogCiAjaWZuZGVm
IFVOSVZfSE9UQkFDS1VQCiAJewpAQCAtMjc1MCw3ICsyNzUxLDcgQEAgZXJyb3JfZXhpdDI6CiAJ
CWZpbF9vcF93cml0ZV9sb2coZmxhZ3MKIAkJCQkgPyBNTE9HX0ZJTEVfQ1JFQVRFMgogCQkJCSA6
IE1MT0dfRklMRV9DUkVBVEUsCi0JCQkJICpzcGFjZV9pZCwKKwkJCQkgc3BhY2VfaWQsCiAJCQkJ
IGlzX3RlbXAgPyBNTE9HX0ZJTEVfRkxBR19URU1QIDogMCwKIAkJCQkgZmxhZ3MsCiAJCQkJIHRh
YmxlbmFtZSwgTlVMTCwgJm10cik7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJf
cGx1Z2luL2luY2x1ZGUvZGljdDBib290LmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9p
bmNsdWRlL2RpY3QwYm9vdC5oCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMDA1MjAx
MzMxNTctNDJ1azVxM3BwMHZzaW5hYworKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVk
ZS9kaWN0MGJvb3QuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyNDExMDQz
OS1mYXppNzBybG10MDd0emQ5CkBAIC00NiwxMyArNDYsMTQgQEAgZGljdF9oZHJfZ2V0KAogLyo9
PT09PT09PT0qLwogCW10cl90KgltdHIpOwkvKiE8IGluOiBtdHIgKi8KIC8qKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ly8qKgotUmV0dXJucyBhIG5ldyByb3csIHRhYmxlLCBpbmRleCwgb3IgdHJlZSBpZC4KLUByZXR1
cm4JdGhlIG5ldyBpZCAqLworUmV0dXJucyBhIG5ldyB0YWJsZSwgaW5kZXgsIG9yIHNwYWNlIGlk
LiAqLwogVU5JVl9JTlRFUk4KLWR1bGludAordm9pZAogZGljdF9oZHJfZ2V0X25ld19pZCgKIC8q
PT09PT09PT09PT09PT09PSovCi0JdWxpbnQJdHlwZSk7CS8qITwgaW46IERJQ1RfSERSX1JPV19J
RCwgLi4uICovCisJZHVsaW50Kgl0YWJsZV9pZCwJLyohPCBvdXQ6IHRhYmxlIGlkIChub3QgYXNz
aWduZWQgaWYgTlVMTCkgKi8KKwlkdWxpbnQqCWluZGV4X2lkLAkvKiE8IG91dDogaW5kZXggaWQg
KG5vdCBhc3NpZ25lZCBpZiBOVUxMKSAqLworCXVsaW50KglzcGFjZV9pZCk7CS8qITwgb3V0OiBz
cGFjZSBpZCAobm90IGFzc2lnbmVkIGlmIE5VTEwpICovCiAvKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFJl
dHVybnMgYSBuZXcgcm93IGlkLgogQHJldHVybgl0aGUgbmV3IGlkICovCkBAIC0xMTksNyArMTIw
LDggQEAgZGljdF9jcmVhdGUodm9pZCk7CiAjZGVmaW5lIERJQ1RfSERSX1JPV19JRAkJMAkvKiBU
aGUgbGF0ZXN0IGFzc2lnbmVkIHJvdyBpZCAqLwogI2RlZmluZQlESUNUX0hEUl9UQUJMRV9JRAk4
CS8qIFRoZSBsYXRlc3QgYXNzaWduZWQgdGFibGUgaWQgKi8KICNkZWZpbmUJRElDVF9IRFJfSU5E
RVhfSUQJMTYJLyogVGhlIGxhdGVzdCBhc3NpZ25lZCBpbmRleCBpZCAqLwotI2RlZmluZQlESUNU
X0hEUl9NSVhfSUQJCTI0CS8qIE9ic29sZXRlLCBhbHdheXMgMC4gKi8KKyNkZWZpbmUgRElDVF9I
RFJfTUFYX1NQQUNFX0lECTI0CS8qIFRoZSBsYXRlc3QgYXNzaWduZWQgc3BhY2UgaWQsIG9yIDAq
LworI2RlZmluZQlESUNUX0hEUl9NSVhfSURfTE9XCTI4CS8qIE9ic29sZXRlLGFsd2F5cyBESUNU
X0hEUl9GSVJTVF9JRCAqLwogI2RlZmluZQlESUNUX0hEUl9UQUJMRVMJCTMyCS8qIFJvb3Qgb2Yg
dGhlIHRhYmxlIGluZGV4IHRyZWUgKi8KICNkZWZpbmUJRElDVF9IRFJfVEFCTEVfSURTCTM2CS8q
IFJvb3Qgb2YgdGhlIHRhYmxlIGluZGV4IHRyZWUgKi8KICNkZWZpbmUJRElDVF9IRFJfQ09MVU1O
Uwk0MAkvKiBSb290IG9mIHRoZSBjb2x1bW4gaW5kZXggdHJlZSAqLwoKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2ZpbDBmaWwuaCcKLS0tIGEvc3RvcmFn
ZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvZmlsMGZpbC5oCXJldmlkOnZhc2lsLmRpbW92QG9yYWNs
ZS5jb20tMjAxMDA1MjAxMzMxNTctNDJ1azVxM3BwMHZzaW5hYworKysgYi9zdG9yYWdlL2lubm9k
Yl9wbHVnaW4vaW5jbHVkZS9maWwwZmlsLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMDA1MjQxMTA0MzktZmF6aTcwcmxtdDA3dHpkOQpAQCAtMjI1LDYgKzIyNSwxNiBAQCBmaWxf
c3BhY2VfY3JlYXRlKAogCQkJCTAgZm9yIHVuY29tcHJlc3NlZCB0YWJsZXNwYWNlcyAqLwogCXVs
aW50CQlwdXJwb3NlKTsvKiE8IGluOiBGSUxfVEFCTEVTUEFDRSwgb3IgRklMX0xPRyBpZiBsb2cg
Ki8KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqLy8qKgorQXNzaWducyBhIG5ldyBzcGFjZSBpZCBmb3IgYSBuZXcgc2lu
Z2xlLXRhYmxlIHRhYmxlc3BhY2UuIFRoaXMgd29ya3Mgc2ltcGx5IGJ5CitpbmNyZW1lbnRpbmcg
dGhlIGdsb2JhbCBjb3VudGVyLiBJZiA0IGJpbGxpb24gaWQncyBpcyBub3QgZW5vdWdoLCB3ZSBt
YXkgbmVlZAordG8gcmVjeWNsZSBpZCdzLgorQHJldHVybglUUlVFIGlmIGFzc2lnbmVkLCBGQUxT
RSBpZiBub3QgKi8KK1VOSVZfSU5URVJOCitpYm9vbAorZmlsX2Fzc2lnbl9uZXdfc3BhY2VfaWQo
CisvKj09PT09PT09PT09PT09PT09PT09Ki8KKwl1bGludCoJc3BhY2VfaWQpOwkvKiE8IGluL291
dDogc3BhY2UgaWQgKi8KKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogUmV0dXJucyB0aGUgc2l6ZSBvZiB0aGUg
c3BhY2UgaW4gcGFnZXMuIFRoZSB0YWJsZXNwYWNlIG11c3QgYmUgY2FjaGVkIGluIHRoZQogbWVt
b3J5IGNhY2hlLgogQHJldHVybglzcGFjZSBzaXplLCAwIGlmIHNwYWNlIG5vdCBmb3VuZCAqLwpA
QCAtNDI3LDkgKzQzNyw3IEBAIFVOSVZfSU5URVJOCiB1bGludAogZmlsX2NyZWF0ZV9uZXdfc2lu
Z2xlX3RhYmxlX3RhYmxlc3BhY2UoCiAvKj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09Ki8KLQl1bGludCoJCXNwYWNlX2lkLAkvKiE8IGluL291dDogc3BhY2UgaWQ7IGlmIHRoaXMg
aXMgIT0gMCwKLQkJCQkJdGhlbiB0aGlzIGlzIGFuIGlucHV0IHBhcmFtZXRlciwKLQkJCQkJb3Ro
ZXJ3aXNlIG91dHB1dCAqLworCXVsaW50CQlzcGFjZV9pZCwJLyohPCBpbjogc3BhY2UgaWQgKi8K
IAljb25zdCBjaGFyKgl0YWJsZW5hbWUsCS8qITwgaW46IHRoZSB0YWJsZSBuYW1lIGluIHRoZSB1
c3VhbAogCQkJCQlkYXRhYmFzZW5hbWUvdGFibGVuYW1lIGZvcm1hdAogCQkJCQlvZiBJbm5vREIs
IG9yIGEgZGlyIHBhdGggdG8gYSB0ZW1wCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL3Jvdy9yb3cwbXlzcWwuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jv
dy9yb3cwbXlzcWwuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwNTIwMTMzMTU3
LTQydWs1cTNwcDB2c2luYWMKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwbXlz
cWwuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyNDExMDQzOS1mYXppNzBy
bG10MDd0emQ5CkBAIC0yNDI3LDcgKzI0MjcsNyBAQCByb3dfZGlzY2FyZF90YWJsZXNwYWNlX2Zv
cl9teXNxbCgKIAkJZ290byBmdW5jdF9leGl0OwogCX0KIAotCW5ld19pZCA9IGRpY3RfaGRyX2dl
dF9uZXdfaWQoRElDVF9IRFJfVEFCTEVfSUQpOworCWRpY3RfaGRyX2dldF9uZXdfaWQoJm5ld19p
ZCwgTlVMTCwgTlVMTCk7CiAKIAkvKiBSZW1vdmUgYWxsIGxvY2tzIGV4Y2VwdCB0aGUgdGFibGUt
bGV2ZWwgUyBhbmQgWCBsb2Nrcy4gKi8KIAlsb2NrX3JlbW92ZV9hbGxfb25fdGFibGUodGFibGUs
IEZBTFNFKTsKQEAgLTI3ODksMTAgKzI3ODksMTEgQEAgcm93X3RydW5jYXRlX3RhYmxlX2Zvcl9t
eXNxbCgKIAogCQkJZGljdF9pbmRleF90KglpbmRleDsKIAotCQkJc3BhY2UgPSAwOworCQkJZGlj
dF9oZHJfZ2V0X25ld19pZChOVUxMLCBOVUxMLCAmc3BhY2UpOwogCi0JCQlpZiAoZmlsX2NyZWF0
ZV9uZXdfc2luZ2xlX3RhYmxlX3RhYmxlc3BhY2UoCi0JCQkJICAgICZzcGFjZSwgdGFibGUtPm5h
bWUsIEZBTFNFLCBmbGFncywKKwkJCWlmIChzcGFjZSA9PSBVTElOVF9VTkRFRklORUQKKwkJCSAg
ICB8fCBmaWxfY3JlYXRlX25ld19zaW5nbGVfdGFibGVfdGFibGVzcGFjZSgKKwkJCQkgICAgc3Bh
Y2UsIHRhYmxlLT5uYW1lLCBGQUxTRSwgZmxhZ3MsCiAJCQkJICAgIEZJTF9JQkRfRklMRV9JTklU
SUFMX1NJWkUpICE9IERCX1NVQ0NFU1MpIHsKIAkJCQl1dF9wcmludF90aW1lc3RhbXAoc3RkZXJy
KTsKIAkJCQlmcHJpbnRmKHN0ZGVyciwKQEAgLTI4OTcsNyArMjg5OCw3IEBAIG5leHRfcmVjOgog
CiAJbWVtX2hlYXBfZnJlZShoZWFwKTsKIAotCW5ld19pZCA9IGRpY3RfaGRyX2dldF9uZXdfaWQo
RElDVF9IRFJfVEFCTEVfSUQpOworCWRpY3RfaGRyX2dldF9uZXdfaWQoJm5ld19pZCwgTlVMTCwg
TlVMTCk7CiAKIAlpbmZvID0gcGFyc19pbmZvX2NyZWF0ZSgpOwogCgo=

--===============2018165134==
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: 4bc2c159e2fe60273a90407b4cede7853727ccd9
# timestamp: 2010-05-24 14:05:41 +0300
# base_revision_id: vasil.dimov@stripped\
#   42uk5q3pp0vsinac
# 
# Begin bundle
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


--===============2018165134==--