From: marko.makela
Date: May 14 2010 1:08pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3466) Bug#48024
 Bug#53644
List-Archive: http://lists.mysql.com/commits/108329
X-Bug: 48024,53644
Message-Id: <201005141308.o4EC4HOi023954@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0011904476=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwtNS4xLWlubm9kYjIvIGJh
c2VkIG9uIHJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE0MTMwMjI4LW4zbjQy
bnc3aHQ3OGswd24KCiAzNDY2IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMTQKICAgICAgTWFrZSB0
aGUgSW5ub0RCIEZPUkVJR04gS0VZIHBhcnNlciB1bmRlcnN0YW5kIG11bHRpLXN0YXRlbWVudHMu
IChCdWcgIzQ4MDI0KQogICAgICBBbHNvIG1ha2UgSW5ub0RCIHRoaW5rcyB0aGF0IC8qLyBvbmx5
IHN0YXJ0cyBhIGNvbW1lbnQuIChCdWcgIzUzNjQ0KS4KICAgICAgCiAgICAgIFRoaXMgZml4ZXMg
dGhlIGJ1Z3MgaW4gdGhlIElubm9EQiBQbHVnaW4uCiAgICAgIAogICAgICBoYV9pbm5vZGIuaDog
VXNlIHRyeF9xdWVyeV9zdHJpbmcoKSBpbnN0ZWFkIG9mIHRyeF9xdWVyeSgpIHdoZW4KICAgICAg
YXZhaWxhYmxlIChNeVNRTCA1LjEuNDIgb3IgbGF0ZXIpLgogICAgICAKICAgICAgaW5ub2Jhc2Vf
Z2V0X3N0bXQoKTogTmV3IGZ1bmN0aW9uLCB0byByZXRyaWV2ZSB0aGUgY3VycmVudGx5IHJ1bm5p
bmcKICAgICAgU1FMIHN0YXRlbWVudC4KICAgICAgCiAgICAgIHN0cnVjdCB0cnhfc3RydWN0OiBS
ZW1vdmUgbXlzcWxfcXVlcnlfc3RyLiBVc2UgaW5ub2Jhc2VfZ2V0X3N0bXQoKSBpbnN0ZWFkLgog
ICAgICAKICAgICAgZGljdF9zdHJpcF9jb21tZW50cygpOiBBZGQgYW5kIG9ic2VydmUgdGhlIHBh
cmFtZXRlciBzcWxfbGVuZ3RoLiBUcmVhdAogICAgICAvKi8gYXMgdGhlIHN0YXJ0IG9mIGEgY29t
bWVudC4KICAgICAgCiAgICAgIGRpY3RfY3JlYXRlX2ZvcmVpZ25fY29uc3RyYWludHMoKSwgcm93
X3RhYmxlX2FkZF9mb3JlaWduX2NvbnN0cmFpbnRzKCk6CiAgICAgIEFkZCB0aGUgcGFyYW1ldGVy
IHNxbF9sZW5ndGguCgogICAgYWRkZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3Bs
dWdpbi9yL2lubm9kYl9idWc0ODAyNC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5v
ZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzQ4MDI0LnRlc3QKICAgIG1vZGlmaWVkOgogICAgICBzdG9y
YWdlL2lubm9kYl9wbHVnaW4vZGljdC9kaWN0MGRpY3QuYwogICAgICBzdG9yYWdlL2lubm9kYl9w
bHVnaW4vaGFuZGxlci9oYV9pbm5vZGIuY2MKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2hh
bmRsZXIvaGFfaW5ub2RiLmgKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvZGlj
dDBkaWN0LmgKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvaGFfcHJvdG90eXBl
cy5oCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3JvdzBteXNxbC5oCiAgICAg
IHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3RyeDB0cnguaAogICAgICBzdG9yYWdlL2lu
bm9kYl9wbHVnaW4vcm93L3JvdzBteXNxbC5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi90
cngvdHJ4MGlfcy5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi90cngvdHJ4MHRyeC5jCj09
PSBhZGRlZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGJfYnVn
NDgwMjQucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5v
ZGJfYnVnNDgwMjQucmVzdWx0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysrIGIvbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiX2J1ZzQ4MDI0LnJlc3VsdAlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxNDEzMDgxNS15bTdqN2NmdTg4cm82a200CkBA
IC0wLDAgKzEsMTAgQEAKK0NSRUFURSBUQUJMRSBidWc0ODAyNChhIGludCBQUklNQVJZIEtFWSxi
IGludCBOT1QgTlVMTCxLRVkoYikpIEVOR0lORT1Jbm5vREI7CitDUkVBVEUgVEFCTEUgYnVnNDgw
MjRfYihiIGludCBQUklNQVJZIEtFWSkgRU5HSU5FPUlubm9EQjsKK0FMVEVSIFRBQkxFIGJ1ZzQ4
MDI0IC8qL0FERCBDT05TVFJBSU5UIEZPUkVJR04gS0VZKGMpIFJFRkVSRU5DRVMoYSksLyovCitB
REQgQ09OU1RSQUlOVCBGT1JFSUdOIEtFWShiKSBSRUZFUkVOQ0VTIGJ1ZzQ4MDI0X2IoYik7CitE
Uk9QIFRBQkxFIGJ1ZzQ4MDI0LGJ1ZzQ4MDI0X2I7CitDUkVBVEUgVEFCTEUgYnVnNDgwMjQoYSBp
bnQgUFJJTUFSWSBLRVksYiBpbnQgTk9UIE5VTEwsS0VZKGIpKSBFTkdJTkU9SW5ub0RCOworQ1JF
QVRFIFRBQkxFIGJ1ZzQ4MDI0X2IoYiBpbnQgUFJJTUFSWSBLRVkpIEVOR0lORT1Jbm5vREI7CitB
TFRFUiBUQUJMRSBidWc0ODAyNCAvKi9BREQgQ09OU1RSQUlOVCBGT1JFSUdOIEtFWShjKSBSRUZF
UkVOQ0VTKGEpLC8qLworQUREIENPTlNUUkFJTlQgRk9SRUlHTiBLRVkoYikgUkVGRVJFTkNFUyBi
dWc0ODAyNF9iKGIpfAorRFJPUCBUQUJMRSBidWc0ODAyNCxidWc0ODAyNF9iOwoKPT09IGFkZGVk
IGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYl9idWc0ODAyNC50
ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVnNDgw
MjQudGVzdAkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUv
aW5ub2RiX3BsdWdpbi90L2lubm9kYl9idWc0ODAyNC50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTAwNTE0MTMwODE1LXltN2o3Y2Z1ODhybzZrbTQKQEAgLTAsMCArMSwyMCBA
QAorIyBCdWcgIzQ4MDI0IElubm9kYiBkb2Vzbid0IHdvcmsgd2l0aCBtdWx0aS1zdGF0ZW1lbnRz
CisKKy0tc291cmNlIGluY2x1ZGUvaGF2ZV9pbm5vZGJfcGx1Z2luLmluYworCitDUkVBVEUgVEFC
TEUgYnVnNDgwMjQoYSBpbnQgUFJJTUFSWSBLRVksYiBpbnQgTk9UIE5VTEwsS0VZKGIpKSBFTkdJ
TkU9SW5ub0RCOworQ1JFQVRFIFRBQkxFIGJ1ZzQ4MDI0X2IoYiBpbnQgUFJJTUFSWSBLRVkpIEVO
R0lORT1Jbm5vREI7CisjIEJ1ZyAjNTM2NDQgSW5ub0RCIHRoaW5rcyB0aGF0IC8qLyBzdGFydHMg
YW5kIGVuZHMgYSBjb21tZW50CitBTFRFUiBUQUJMRSBidWc0ODAyNCAvKi9BREQgQ09OU1RSQUlO
VCBGT1JFSUdOIEtFWShjKSBSRUZFUkVOQ0VTKGEpLC8qLworQUREIENPTlNUUkFJTlQgRk9SRUlH
TiBLRVkoYikgUkVGRVJFTkNFUyBidWc0ODAyNF9iKGIpOworCitEUk9QIFRBQkxFIGJ1ZzQ4MDI0
LGJ1ZzQ4MDI0X2I7CisKK2RlbGltaXRlciB8OworQ1JFQVRFIFRBQkxFIGJ1ZzQ4MDI0KGEgaW50
IFBSSU1BUlkgS0VZLGIgaW50IE5PVCBOVUxMLEtFWShiKSkgRU5HSU5FPUlubm9EQjsKK0NSRUFU
RSBUQUJMRSBidWc0ODAyNF9iKGIgaW50IFBSSU1BUlkgS0VZKSBFTkdJTkU9SW5ub0RCOworQUxU
RVIgVEFCTEUgYnVnNDgwMjQgLyovQUREIENPTlNUUkFJTlQgRk9SRUlHTiBLRVkoYykgUkVGRVJF
TkNFUyhhKSwvKi8KK0FERCBDT05TVFJBSU5UIEZPUkVJR04gS0VZKGIpIFJFRkVSRU5DRVMgYnVn
NDgwMjRfYihiKXwKK2RlbGltaXRlciA7fAorCitEUk9QIFRBQkxFIGJ1ZzQ4MDI0LGJ1ZzQ4MDI0
X2I7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2RpY3QvZGljdDBk
aWN0LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9kaWN0L2RpY3QwZGljdC5jCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE0MTMwMjI4LW4zbjQybnc3aHQ3OGswd24K
KysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2RpY3QvZGljdDBkaWN0LmMJcmV2aWQ6bWFya28u
bWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTQxMzA4MTUteW03ajdjZnU4OHJvNmttNApAQCAtMzAw
OCwyNSArMzAwOCwyOCBAQCBzdGF0aWMKIGNoYXIqCiBkaWN0X3N0cmlwX2NvbW1lbnRzKAogLyo9
PT09PT09PT09PT09PT09Ki8KLQljb25zdCBjaGFyKglzcWxfc3RyaW5nKQkvKiE8IGluOiBTUUwg
c3RyaW5nICovCisJY29uc3QgY2hhcioJc3FsX3N0cmluZywJLyohPCBpbjogU1FMIHN0cmluZyAq
LworCXNpemVfdAkJc3FsX2xlbmd0aCkJLyohPCBpbjogbGVuZ3RoIG9mIHNxbF9zdHJpbmcgKi8K
IHsKIAljaGFyKgkJc3RyOwogCWNvbnN0IGNoYXIqCXNwdHI7CisJY29uc3QgY2hhcioJZXB0cgk9
IHNxbF9zdHJpbmcgKyBzcWxfbGVuZ3RoOwogCWNoYXIqCQlwdHI7CiAJLyogdW5jbG9zZWQgcXVv
dGUgY2hhcmFjdGVyICgwIGlmIG5vbmUpICovCiAJY2hhcgkJcXVvdGUJPSAwOwogCi0Jc3RyID0g
bWVtX2FsbG9jKHN0cmxlbihzcWxfc3RyaW5nKSArIDEpOworCXN0ciA9IG1lbV9hbGxvYyhzcWxf
bGVuZ3RoICsgMSk7CiAKIAlzcHRyID0gc3FsX3N0cmluZzsKIAlwdHIgPSBzdHI7CiAKIAlmb3Ig
KDs7KSB7CiBzY2FuX21vcmU6Ci0JCWlmICgqc3B0ciA9PSAnXDAnKSB7CisJCWlmIChzcHRyID49
IGVwdHIgfHwgKnNwdHIgPT0gJ1wwJykgeworZW5kX29mX3N0cmluZzoKIAkJCSpwdHIgPSAnXDAn
OwogCi0JCQl1dF9hKHB0ciA8PSBzdHIgKyBzdHJsZW4oc3FsX3N0cmluZykpOworCQkJdXRfYShw
dHIgPD0gc3RyICsgc3FsX2xlbmd0aCk7CiAKIAkJCXJldHVybihzdHIpOwogCQl9CkBAIC0zMDQ1
LDMwICszMDQ4LDM1IEBAIHNjYW5fbW9yZToKIAkJCSAgIHx8IChzcHRyWzBdID09ICctJyAmJiBz
cHRyWzFdID09ICctJwogCQkJICAgICAgICYmIHNwdHJbMl0gPT0gJyAnKSkgewogCQkJZm9yICg7
OykgeworCQkJCWlmICgrK3NwdHIgPj0gZXB0cikgeworCQkJCQlnb3RvIGVuZF9vZl9zdHJpbmc7
CisJCQkJfQorCiAJCQkJLyogSW4gVW5peCBhIG5ld2xpbmUgaXMgMHgwQSB3aGlsZSBpbiBXaW5k
b3dzCiAJCQkJaXQgaXMgMHgwRCBmb2xsb3dlZCBieSAweDBBICovCiAKLQkJCQlpZiAoKnNwdHIg
PT0gKGNoYXIpMHgwQQotCQkJCSAgICB8fCAqc3B0ciA9PSAoY2hhcikweDBECi0JCQkJICAgIHx8
ICpzcHRyID09ICdcMCcpIHsKLQorCQkJCXN3aXRjaCAoKnNwdHIpIHsKKwkJCQljYXNlIChjaGFy
KSAwWDBBOgorCQkJCWNhc2UgKGNoYXIpIDB4MEQ6CisJCQkJY2FzZSAnXDAnOgogCQkJCQlnb3Rv
IHNjYW5fbW9yZTsKIAkJCQl9Ci0KLQkJCQlzcHRyKys7CiAJCQl9CiAJCX0gZWxzZSBpZiAoIXF1
b3RlICYmICpzcHRyID09ICcvJyAmJiAqKHNwdHIgKyAxKSA9PSAnKicpIHsKKwkJCXNwdHIgKz0g
MjsKIAkJCWZvciAoOzspIHsKLQkJCQlpZiAoKnNwdHIgPT0gJyonICYmICooc3B0ciArIDEpID09
ICcvJykgewotCi0JCQkJCXNwdHIgKz0gMjsKLQotCQkJCQlnb3RvIHNjYW5fbW9yZTsKKwkJCQlp
ZiAoc3B0ciA+PSBlcHRyKSB7CisJCQkJCWdvdG8gZW5kX29mX3N0cmluZzsKIAkJCQl9CiAKLQkJ
CQlpZiAoKnNwdHIgPT0gJ1wwJykgewotCisJCQkJc3dpdGNoICgqc3B0cikgeworCQkJCWNhc2Ug
J1wwJzoKIAkJCQkJZ290byBzY2FuX21vcmU7CisJCQkJY2FzZSAnKic6CisJCQkJCWlmIChzcHRy
WzFdID09ICcvJykgeworCQkJCQkJc3B0ciArPSAyOworCQkJCQkJZ290byBzY2FuX21vcmU7CisJ
CQkJCX0KIAkJCQl9CiAKIAkJCQlzcHRyKys7CkBAIC0zNzQ5LDYgKzM3NTcsNyBAQCBkaWN0X2Ny
ZWF0ZV9mb3JlaWduX2NvbnN0cmFpbnRzKAogCQkJCQluYW1lIGJlZm9yZSBpdDogdGVzdC50YWJs
ZTI7IHRoZQogCQkJCQlkZWZhdWx0IGRhdGFiYXNlIGlkIHRoZSBkYXRhYmFzZSBvZgogCQkJCQlw
YXJhbWV0ZXIgbmFtZSAqLworCXNpemVfdAkJc3FsX2xlbmd0aCwJLyohPCBpbjogbGVuZ3RoIG9m
IHNxbF9zdHJpbmcgKi8KIAljb25zdCBjaGFyKgluYW1lLAkJLyohPCBpbjogdGFibGUgZnVsbCBu
YW1lIGluIHRoZQogCQkJCQlub3JtYWxpemVkIGZvcm0KIAkJCQkJZGF0YWJhc2VfbmFtZS90YWJs
ZV9uYW1lICovCkBAIC0zNzYzLDcgKzM3NzIsNyBAQCBkaWN0X2NyZWF0ZV9mb3JlaWduX2NvbnN0
cmFpbnRzKAogCXV0X2EodHJ4KTsKIAl1dF9hKHRyeC0+bXlzcWxfdGhkKTsKIAotCXN0ciA9IGRp
Y3Rfc3RyaXBfY29tbWVudHMoc3FsX3N0cmluZyk7CisJc3RyID0gZGljdF9zdHJpcF9jb21tZW50
cyhzcWxfc3RyaW5nLCBzcWxfbGVuZ3RoKTsKIAloZWFwID0gbWVtX2hlYXBfY3JlYXRlKDEwMDAw
KTsKIAogCWVyciA9IGRpY3RfY3JlYXRlX2ZvcmVpZ25fY29uc3RyYWludHNfbG93KApAQCAtMzc5
Niw2ICszODA1LDcgQEAgZGljdF9mb3JlaWduX3BhcnNlX2Ryb3BfY29uc3RyYWludHMoCiAJZGlj
dF9mb3JlaWduX3QqCQlmb3JlaWduOwogCWlib29sCQkJc3VjY2VzczsKIAljaGFyKgkJCXN0cjsK
KwlzaXplX3QJCQlsZW47CiAJY29uc3QgY2hhcioJCXB0cjsKIAljb25zdCBjaGFyKgkJaWQ7CiAJ
RklMRSoJCQllZgk9IGRpY3RfZm9yZWlnbl9lcnJfZmlsZTsKQEAgLTM4MTAsNyArMzgyMCwxMCBA
QCBkaWN0X2ZvcmVpZ25fcGFyc2VfZHJvcF9jb25zdHJhaW50cygKIAogCSpjb25zdHJhaW50c190
b19kcm9wID0gbWVtX2hlYXBfYWxsb2MoaGVhcCwgMTAwMCAqIHNpemVvZihjaGFyKikpOwogCi0J
c3RyID0gZGljdF9zdHJpcF9jb21tZW50cygqKHRyeC0+bXlzcWxfcXVlcnlfc3RyKSk7CisJcHRy
ID0gaW5ub2Jhc2VfZ2V0X3N0bXQodHJ4LT5teXNxbF90aGQsICZsZW4pOworCisJc3RyID0gZGlj
dF9zdHJpcF9jb21tZW50cyhwdHIsIGxlbik7CisKIAlwdHIgPSBzdHI7CiAKIAl1dF9hZChtdXRl
eF9vd24oJihkaWN0X3N5cy0+bXV0ZXgpKSk7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9p
bm5vZGJfcGx1Z2luL2hhbmRsZXIvaGFfaW5ub2RiLmNjJwotLS0gYS9zdG9yYWdlL2lubm9kYl9w
bHVnaW4vaGFuZGxlci9oYV9pbm5vZGIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMDA1MTQxMzAyMjgtbjNuNDJudzdodDc4azB3bgorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVn
aW4vaGFuZGxlci9oYV9pbm5vZGIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MDA1MTQxMzA4MTUteW03ajdjZnU4OHJvNmttNApAQCAtMTAwNCw2ICsxMDA0LDI5IEBAIGlubm9i
YXNlX2dldF9jaGFyc2V0KAogCXJldHVybih0aGRfY2hhcnNldCgoVEhEKikgbXlzcWxfdGhkKSk7
CiB9CiAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqLy8qKgorRGV0ZXJtaW5lcyB0aGUgY3VycmVudCBTUUwgc3Rh
dGVtZW50LgorQHJldHVybglTUUwgc3RhdGVtZW50IHN0cmluZyAqLworZXh0ZXJuICJDIiBVTklW
X0lOVEVSTgorY29uc3QgY2hhcioKK2lubm9iYXNlX2dldF9zdG10KAorLyo9PT09PT09PT09PT09
PSovCisJdm9pZCoJbXlzcWxfdGhkLAkvKiE8IGluOiBNeVNRTCB0aHJlYWQgaGFuZGxlICovCisJ
c2l6ZV90KglsZW5ndGgpCQkvKiE8IG91dDogbGVuZ3RoIG9mIHRoZSBTUUwgc3RhdGVtZW50ICov
Cit7CisjaWYgTVlTUUxfVkVSU0lPTl9JRCA+PSA1MDE0MgorCUxFWF9TVFJJTkcqIHN0bXQ7CisK
KwlzdG10ID0gdGhkX3F1ZXJ5X3N0cmluZygoVEhEKikgbXlzcWxfdGhkKTsKKwkqbGVuZ3RoID0g
c3RtdC0+bGVuZ3RoOworCXJldHVybihzdG10LT5zdHIpOworI2Vsc2UKKwljb25zdCBjaGFyKglz
dG10X3N0ciA9IHRoZF9xdWVyeSgoVEhEKikgbXlzcWxfdGhkKTsKKwkqbGVuZ3RoID0gc3RybGVu
KHN0bXRfc3RyKTsKKwlyZXR1cm4oc3RtdF9zdHIpOworI2VuZGlmCit9CisKICNpZiBkZWZpbmVk
IChfX1dJTl9fKSAmJiBkZWZpbmVkIChNWVNRTF9EWU5BTUlDX1BMVUdJTikKIGV4dGVybiBNWVNR
TF9QTFVHSU5fSU1QT1JUIE1ZX1RNUERJUiBteXNxbF90bXBkaXJfbGlzdDsKIC8qKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ly8qKgpAQCAtMTMxNCw3ICsxMzM3LDYgQEAgaW5ub2Jhc2VfdHJ4X2FsbG9jYXRlKAogCXRyeCA9
IHRyeF9hbGxvY2F0ZV9mb3JfbXlzcWwoKTsKIAogCXRyeC0+bXlzcWxfdGhkID0gdGhkOwotCXRy
eC0+bXlzcWxfcXVlcnlfc3RyID0gdGhkX3F1ZXJ5KHRoZCk7CiAKIAlpbm5vYmFzZV90cnhfaW5p
dCh0aGQsIHRyeCk7CiAKQEAgLTY0MzMsNiArNjQ1NSw4IEBAIGhhX2lubm9iYXNlOjpjcmVhdGUo
CiAJLyogQ2FjaGUgdGhlIHZhbHVlIG9mIGlubm9kYl9maWxlX2Zvcm1hdCwgaW4gY2FzZSBpdCBp
cwogCW1vZGlmaWVkIGJ5IGFub3RoZXIgdGhyZWFkIHdoaWxlIHRoZSB0YWJsZSBpcyBiZWluZyBj
cmVhdGVkLiAqLwogCWNvbnN0IHVsaW50CWZpbGVfZm9ybWF0ID0gc3J2X2ZpbGVfZm9ybWF0Owor
CWNvbnN0IGNoYXIqCXN0bXQ7CisJc2l6ZV90CQlzdG10X2xlbjsKIAogCURCVUdfRU5URVIoImhh
X2lubm9iYXNlOjpjcmVhdGUiKTsKIApAQCAtNjcwOSw5ICs2NzMzLDExIEBAIGhhX2lubm9iYXNl
OjpjcmVhdGUoCiAJCX0KIAl9CiAKLQlpZiAoKnRyeC0+bXlzcWxfcXVlcnlfc3RyKSB7Ci0JCWVy
cm9yID0gcm93X3RhYmxlX2FkZF9mb3JlaWduX2NvbnN0cmFpbnRzKHRyeCwKLQkJCSp0cngtPm15
c3FsX3F1ZXJ5X3N0ciwgbm9ybV9uYW1lLAorCXN0bXQgPSBpbm5vYmFzZV9nZXRfc3RtdCh0aGQs
ICZzdG10X2xlbik7CisKKwlpZiAoc3RtdCkgeworCQllcnJvciA9IHJvd190YWJsZV9hZGRfZm9y
ZWlnbl9jb25zdHJhaW50cygKKwkJCXRyeCwgc3RtdCwgc3RtdF9sZW4sIG5vcm1fbmFtZSwKIAkJ
CWNyZWF0ZV9pbmZvLT5vcHRpb25zICYgSEFfTEVYX0NSRUFURV9UTVBfVEFCTEUpOwogCiAJCWVy
cm9yID0gY29udmVydF9lcnJvcl9jb2RlX3RvX215c3FsKGVycm9yLCBmbGFncywgTlVMTCk7CkBA
IC02OTk2LDcgKzcwMjIsNiBAQCBpbm5vYmFzZV9kcm9wX2RhdGFiYXNlKAogCS8qIEluIHRoZSBX
aW5kb3dzIHBsdWdpbiwgdGhkID0gY3VycmVudF90aGQgaXMgYWx3YXlzIE5VTEwgKi8KIAl0cngg
PSB0cnhfYWxsb2NhdGVfZm9yX215c3FsKCk7CiAJdHJ4LT5teXNxbF90aGQgPSBOVUxMOwotCXRy
eC0+bXlzcWxfcXVlcnlfc3RyID0gTlVMTDsKICNlbHNlCiAJdHJ4ID0gaW5ub2Jhc2VfdHJ4X2Fs
bG9jYXRlKHRoZCk7CiAjZW5kaWYKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9w
bHVnaW4vaGFuZGxlci9oYV9pbm5vZGIuaCcKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2hh
bmRsZXIvaGFfaW5ub2RiLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTQx
MzAyMjgtbjNuNDJudzdodDc4azB3bgorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaGFuZGxl
ci9oYV9pbm5vZGIuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxNDEzMDgx
NS15bTdqN2NmdTg4cm82a200CkBAIC0yMzEsNyArMjMxLDExIEBAIHRoZSBkZWZpbml0aW9ucyBh
cmUgYnJhY2tldGVkIHdpdGggI2lmZGUKIAogZXh0ZXJuICJDIiB7CiBzdHJ1Y3QgY2hhcnNldF9p
bmZvX3N0ICp0aGRfY2hhcnNldChNWVNRTF9USEQgdGhkKTsKKyNpZiBNWVNRTF9WRVJTSU9OX0lE
ID49IDUwMTQyCitMRVhfU1RSSU5HICp0aGRfcXVlcnlfc3RyaW5nKE1ZU1FMX1RIRCB0aGQpOwor
I2Vsc2UKIGNoYXIgKip0aGRfcXVlcnkoTVlTUUxfVEhEIHRoZCk7CisjZW5kaWYKIAogLyoqIEdl
dCB0aGUgZmlsZSBuYW1lIG9mIHRoZSBNeVNRTCBiaW5sb2cuCiAgKiBAcmV0dXJuIHRoZSBuYW1l
IG9mIHRoZSBiaW5sb2cgZmlsZQoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi9pbmNsdWRlL2RpY3QwZGljdC5oJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5j
bHVkZS9kaWN0MGRpY3QuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxNDEz
MDIyOC1uM240Mm53N2h0NzhrMHduCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRl
L2RpY3QwZGljdC5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE0MTMwODE1
LXltN2o3Y2Z1ODhybzZrbTQKQEAgLTM1Miw2ICszNTIsNyBAQCBkaWN0X2NyZWF0ZV9mb3JlaWdu
X2NvbnN0cmFpbnRzKAogCQkJCQluYW1lIGJlZm9yZSBpdDogdGVzdC50YWJsZTI7IHRoZQogCQkJ
CQlkZWZhdWx0IGRhdGFiYXNlIGlkIHRoZSBkYXRhYmFzZSBvZgogCQkJCQlwYXJhbWV0ZXIgbmFt
ZSAqLworCXNpemVfdAkJc3FsX2xlbmd0aCwJLyohPCBpbjogbGVuZ3RoIG9mIHNxbF9zdHJpbmcg
Ki8KIAljb25zdCBjaGFyKgluYW1lLAkJLyohPCBpbjogdGFibGUgZnVsbCBuYW1lIGluIHRoZQog
CQkJCQlub3JtYWxpemVkIGZvcm0KIAkJCQkJZGF0YWJhc2VfbmFtZS90YWJsZV9uYW1lICovCgo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvaGFfcHJvdG90
eXBlcy5oJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9oYV9wcm90b3R5cGVz
LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTQxMzAyMjgtbjNuNDJudzdo
dDc4azB3bgorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9oYV9wcm90b3R5cGVz
LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTQxMzA4MTUteW03ajdjZnU4
OHJvNmttNApAQCAtMjE1LDExICsyMTUsMjEgQEAgaW5ub2Jhc2VfY2FzZWRuX3N0cigKIC8qKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqLy8qKgogRGV0ZXJtaW5lcyB0aGUgY29ubmVjdGlvbiBjaGFyYWN0ZXIgc2V0Lgog
QHJldHVybgljb25uZWN0aW9uIGNoYXJhY3RlciBzZXQgKi8KK1VOSVZfSU5URVJOCiBzdHJ1Y3Qg
Y2hhcnNldF9pbmZvX3N0KgogaW5ub2Jhc2VfZ2V0X2NoYXJzZXQoCiAvKj09PT09PT09PT09PT09
PT09Ki8KIAl2b2lkKglteXNxbF90aGQpOwkvKiE8IGluOiBNeVNRTCB0aHJlYWQgaGFuZGxlICov
Ci0KKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqLy8qKgorRGV0ZXJtaW5lcyB0aGUgY3VycmVudCBTUUwgc3RhdGVt
ZW50LgorQHJldHVybglTUUwgc3RhdGVtZW50IHN0cmluZyAqLworVU5JVl9JTlRFUk4KK2NvbnN0
IGNoYXIqCitpbm5vYmFzZV9nZXRfc3RtdCgKKy8qPT09PT09PT09PT09PT0qLworCXZvaWQqCW15
c3FsX3RoZCwJLyohPCBpbjogTXlTUUwgdGhyZWFkIGhhbmRsZSAqLworCXNpemVfdCoJbGVuZ3Ro
KQkJLyohPCBvdXQ6IGxlbmd0aCBvZiB0aGUgU1FMIHN0YXRlbWVudCAqLworCV9fYXR0cmlidXRl
X18oKG5vbm51bGwpKTsKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBUaGlzIGZ1bmN0aW9uIGlzIHVzZWQgdG8g
ZmluZCB0aGUgc3RvcmFnZSBsZW5ndGggaW4gYnl0ZXMgb2YgdGhlIGZpcnN0IG4KIGNoYXJhY3Rl
cnMgZm9yIHByZWZpeCBpbmRleGVzIHVzaW5nIGEgbXVsdGlieXRlIGNoYXJhY3RlciBzZXQuIFRo
ZSBmdW5jdGlvbgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNs
dWRlL3JvdzBteXNxbC5oJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9yb3cw
bXlzcWwuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxNDEzMDIyOC1uM240
Mm53N2h0NzhrMHduCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3JvdzBteXNx
bC5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE0MTMwODE1LXltN2o3Y2Z1
ODhybzZrbTQKQEAgLTQwMyw2ICs0MDMsNyBAQCByb3dfdGFibGVfYWRkX2ZvcmVpZ25fY29uc3Ry
YWludHMoCiAJCQkJRk9SRUlHTiBLRVkgKGEsIGIpIFJFRkVSRU5DRVMgdGFibGUyKGMsIGQpLAog
CQkJCQl0YWJsZTIgY2FuIGJlIHdyaXR0ZW4gYWxzbyB3aXRoIHRoZQogCQkJCQlkYXRhYmFzZSBu
YW1lIGJlZm9yZSBpdDogdGVzdC50YWJsZTIgKi8KKwlzaXplX3QJCXNxbF9sZW5ndGgsCS8qITwg
aW46IGxlbmd0aCBvZiBzcWxfc3RyaW5nICovCiAJY29uc3QgY2hhcioJbmFtZSwJCS8qITwgaW46
IHRhYmxlIGZ1bGwgbmFtZSBpbiB0aGUKIAkJCQkJbm9ybWFsaXplZCBmb3JtCiAJCQkJCWRhdGFi
YXNlX25hbWUvdGFibGVfbmFtZSAqLwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9pbmNsdWRlL3RyeDB0cnguaCcKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2lu
Y2x1ZGUvdHJ4MHRyeC5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE0MTMw
MjI4LW4zbjQybnc3aHQ3OGswd24KKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUv
dHJ4MHRyeC5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE0MTMwODE1LXlt
N2o3Y2Z1ODhybzZrbTQKQEAgLTU2MCw5ICs1NjAsNiBAQCBzdHJ1Y3QgdHJ4X3N0cnVjdHsKIAkv
Ki0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSovCiAJdm9pZCoJCW15c3FsX3RoZDsJLyoh
PCBNeVNRTCB0aHJlYWQgaGFuZGxlIGNvcnJlc3BvbmRpbmcKIAkJCQkJdG8gdGhpcyB0cngsIG9y
IE5VTEwgKi8KLQljaGFyKioJCW15c3FsX3F1ZXJ5X3N0cjsvKiBwb2ludGVyIHRvIHRoZSBmaWVs
ZCBpbiBteXNxbGRfdGhkCi0JCQkJCXdoaWNoIGNvbnRhaW5zIHRoZSBwb2ludGVyIHRvIHRoZQot
CQkJCQljdXJyZW50IFNRTCBxdWVyeSBzdHJpbmcgKi8KIAljb25zdCBjaGFyKglteXNxbF9sb2df
ZmlsZV9uYW1lOwogCQkJCQkvKiBpZiBNeVNRTCBiaW5sb2cgaXMgdXNlZCwgdGhpcyBmaWVsZAog
CQkJCQljb250YWlucyBhIHBvaW50ZXIgdG8gdGhlIGxhdGVzdCBmaWxlCgo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwbXlzcWwuYycKLS0tIGEvc3RvcmFn
ZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwbXlzcWwuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEwMDUxNDEzMDIyOC1uM240Mm53N2h0NzhrMHduCisrKyBiL3N0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9yb3cvcm93MG15c3FsLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MDA1MTQxMzA4MTUteW03ajdjZnU4OHJvNmttNApAQCAtMjA1OSw2ICsyMDU5LDcgQEAgcm93X3Rh
YmxlX2FkZF9mb3JlaWduX2NvbnN0cmFpbnRzKAogCQkJCUZPUkVJR04gS0VZIChhLCBiKSBSRUZF
UkVOQ0VTIHRhYmxlMihjLCBkKSwKIAkJCQkJdGFibGUyIGNhbiBiZSB3cml0dGVuIGFsc28gd2l0
aCB0aGUKIAkJCQkJZGF0YWJhc2UgbmFtZSBiZWZvcmUgaXQ6IHRlc3QudGFibGUyICovCisJc2l6
ZV90CQlzcWxfbGVuZ3RoLAkvKiE8IGluOiBsZW5ndGggb2Ygc3FsX3N0cmluZyAqLwogCWNvbnN0
IGNoYXIqCW5hbWUsCQkvKiE8IGluOiB0YWJsZSBmdWxsIG5hbWUgaW4gdGhlCiAJCQkJCW5vcm1h
bGl6ZWQgZm9ybQogCQkJCQlkYXRhYmFzZV9uYW1lL3RhYmxlX25hbWUgKi8KQEAgLTIwODAsOCAr
MjA4MSw4IEBAIHJvd190YWJsZV9hZGRfZm9yZWlnbl9jb25zdHJhaW50cygKIAogCXRyeF9zZXRf
ZGljdF9vcGVyYXRpb24odHJ4LCBUUlhfRElDVF9PUF9UQUJMRSk7CiAKLQllcnIgPSBkaWN0X2Ny
ZWF0ZV9mb3JlaWduX2NvbnN0cmFpbnRzKHRyeCwgc3FsX3N0cmluZywgbmFtZSwKLQkJCQkJICAg
ICAgcmVqZWN0X2Zrcyk7CisJZXJyID0gZGljdF9jcmVhdGVfZm9yZWlnbl9jb25zdHJhaW50cyh0
cngsIHNxbF9zdHJpbmcsIHNxbF9sZW5ndGgsCisJCQkJCSAgICAgIG5hbWUsIHJlamVjdF9ma3Mp
OwogCWlmIChlcnIgPT0gREJfU1VDQ0VTUykgewogCQkvKiBDaGVjayB0aGF0IGFsc28gcmVmZXJl
bmNpbmcgY29uc3RyYWludHMgYXJlIG9rICovCiAJCWVyciA9IGRpY3RfbG9hZF9mb3JlaWducyhu
YW1lLCBUUlVFKTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vdHJ4
L3RyeDBpX3MuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3RyeC90cngwaV9zLmMJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTQxMzAyMjgtbjNuNDJudzdodDc4azB3
bgorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vdHJ4L3RyeDBpX3MuYwlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxNDEzMDgxNS15bTdqN2NmdTg4cm82a200CkBAIC00Mjks
NiArNDI5LDkgQEAgZmlsbF90cnhfcm93KAogCQkJCQkJd2hpY2ggdG8gY29weSB2b2xhdGlsZQog
CQkJCQkJc3RyaW5ncyAqLwogeworCWNvbnN0IGNoYXIqCXN0bXQ7CisJc2l6ZV90CQlzdG10X2xl
bjsKKwogCXJvdy0+dHJ4X2lkID0gdHJ4X2dldF9pZCh0cngpOwogCXJvdy0+dHJ4X3N0YXJ0ZWQg
PSAoaWJfdGltZV90KSB0cngtPnN0YXJ0X3RpbWU7CiAJcm93LT50cnhfc3RhdGUgPSB0cnhfZ2V0
X3F1ZV9zdGF0ZV9zdHIodHJ4KTsKQEAgLTQ0OSwzOCArNDUyLDMzIEBAIGZpbGxfdHJ4X3JvdygK
IAogCXJvdy0+dHJ4X3dlaWdodCA9ICh1bGxpbnQpIHV0X2NvbnZfZHVsaW50X3RvX2xvbmdsb25n
KFRSWF9XRUlHSFQodHJ4KSk7CiAKLQlpZiAodHJ4LT5teXNxbF90aGQgIT0gTlVMTCkgewotCQly
b3ctPnRyeF9teXNxbF90aHJlYWRfaWQKLQkJCT0gdGhkX2dldF90aHJlYWRfaWQodHJ4LT5teXNx
bF90aGQpOwotCX0gZWxzZSB7CisJaWYgKHRyeC0+bXlzcWxfdGhkID09IE5VTEwpIHsKIAkJLyog
Rm9yIGludGVybmFsIHRyYW5zYWN0aW9ucyBlLmcuLCBwdXJnZSBhbmQgdHJhbnNhY3Rpb25zCiAJ
CWJlaW5nIHJlY292ZXJlZCBhdCBzdGFydHVwIHRoZXJlIGlzIG5vIGFzc29jaWF0ZWQgTXlTUUwK
IAkJdGhyZWFkIGRhdGEgc3RydWN0dXJlLiAqLwogCQlyb3ctPnRyeF9teXNxbF90aHJlYWRfaWQg
PSAwOworCQlyb3ctPnRyeF9xdWVyeSA9IE5VTEw7CisJCXJldHVybihUUlVFKTsKIAl9CiAKLQlp
ZiAodHJ4LT5teXNxbF9xdWVyeV9zdHIgIT0gTlVMTCAmJiAqdHJ4LT5teXNxbF9xdWVyeV9zdHIg
IT0gTlVMTCkgeworCXJvdy0+dHJ4X215c3FsX3RocmVhZF9pZCA9IHRoZF9nZXRfdGhyZWFkX2lk
KHRyeC0+bXlzcWxfdGhkKTsKKwlzdG10ID0gaW5ub2Jhc2VfZ2V0X3N0bXQodHJ4LT5teXNxbF90
aGQsICZzdG10X2xlbik7CiAKLQkJaWYgKHN0cmxlbigqdHJ4LT5teXNxbF9xdWVyeV9zdHIpCi0J
CSAgICA+IFRSWF9JX1NfVFJYX1FVRVJZX01BWF9MRU4pIHsKKwlpZiAoc3RtdCAhPSBOVUxMKSB7
CiAKLQkJCWNoYXIJcXVlcnlbVFJYX0lfU19UUlhfUVVFUllfTUFYX0xFTiArIDFdOworCQljaGFy
CXF1ZXJ5W1RSWF9JX1NfVFJYX1FVRVJZX01BWF9MRU4gKyAxXTsKIAotCQkJbWVtY3B5KHF1ZXJ5
LCAqdHJ4LT5teXNxbF9xdWVyeV9zdHIsCi0JCQkgICAgICAgVFJYX0lfU19UUlhfUVVFUllfTUFY
X0xFTik7Ci0JCQlxdWVyeVtUUlhfSV9TX1RSWF9RVUVSWV9NQVhfTEVOXSA9ICdcMCc7Ci0KLQkJ
CXJvdy0+dHJ4X3F1ZXJ5ID0gaGFfc3RvcmFnZV9wdXRfbWVtbGltKAotCQkJCWNhY2hlLT5zdG9y
YWdlLCBxdWVyeSwKLQkJCQlUUlhfSV9TX1RSWF9RVUVSWV9NQVhfTEVOICsgMSwKLQkJCQlNQVhf
QUxMT1dFRF9GT1JfU1RPUkFHRShjYWNoZSkpOwotCQl9IGVsc2UgewotCi0JCQlyb3ctPnRyeF9x
dWVyeSA9IGhhX3N0b3JhZ2VfcHV0X3N0cl9tZW1saW0oCi0JCQkJY2FjaGUtPnN0b3JhZ2UsICp0
cngtPm15c3FsX3F1ZXJ5X3N0ciwKLQkJCQlNQVhfQUxMT1dFRF9GT1JfU1RPUkFHRShjYWNoZSkp
OworCQlpZiAoc3RtdF9sZW4gPiBUUlhfSV9TX1RSWF9RVUVSWV9NQVhfTEVOKSB7CisJCQlzdG10
X2xlbiA9IFRSWF9JX1NfVFJYX1FVRVJZX01BWF9MRU47CiAJCX0KIAorCQltZW1jcHkocXVlcnks
IHN0bXQsIHN0bXRfbGVuKTsKKwkJcXVlcnlbc3RtdF9sZW5dID0gJ1wwJzsKKworCQlyb3ctPnRy
eF9xdWVyeSA9IGhhX3N0b3JhZ2VfcHV0X21lbWxpbSgKKwkJCWNhY2hlLT5zdG9yYWdlLCBzdG10
LCBzdG10X2xlbiArIDEsCisJCQlNQVhfQUxMT1dFRF9GT1JfU1RPUkFHRShjYWNoZSkpOworCiAJ
CWlmIChyb3ctPnRyeF9xdWVyeSA9PSBOVUxMKSB7CiAKIAkJCXJldHVybihGQUxTRSk7Cgo9PT0g
bW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3RyeC90cngwdHJ4LmMnCi0tLSBh
L3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi90cngvdHJ4MHRyeC5jCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTAwNTE0MTMwMjI4LW4zbjQybnc3aHQ3OGswd24KKysrIGIvc3RvcmFnZS9p
bm5vZGJfcGx1Z2luL3RyeC90cngwdHJ4LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMDA1MTQxMzA4MTUteW03ajdjZnU4OHJvNmttNApAQCAtMTE5LDcgKzExOSw2IEBAIHRyeF9j
cmVhdGUoCiAJdHJ4LT50YWJsZV9pZCA9IHV0X2R1bGludF96ZXJvOwogCiAJdHJ4LT5teXNxbF90
aGQgPSBOVUxMOwotCXRyeC0+bXlzcWxfcXVlcnlfc3RyID0gTlVMTDsKIAl0cngtPmFjdGl2ZV90
cmFucyA9IDA7CiAJdHJ4LT5kdXBsaWNhdGVzID0gMDsKIApAQCAtOTQwLDcgKzkzOSw2IEBAIHRy
eF9jb21taXRfb2ZmX2tlcm5lbCgKIAl0cngtPnJzZWcgPSBOVUxMOwogCXRyeC0+dW5kb19ubyA9
IHV0X2R1bGludF96ZXJvOwogCXRyeC0+bGFzdF9zcWxfc3RhdF9zdGFydC5sZWFzdF91bmRvX25v
ID0gdXRfZHVsaW50X3plcm87Ci0JdHJ4LT5teXNxbF9xdWVyeV9zdHIgPSBOVUxMOwogCiAJdXRf
YWQoVVRfTElTVF9HRVRfTEVOKHRyeC0+d2FpdF90aHJzKSA9PSAwKTsKIAl1dF9hZChVVF9MSVNU
X0dFVF9MRU4odHJ4LT50cnhfbG9ja3MpID09IDApOwoK

--===============0011904476==
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/mysql-5.1-innodb2/
# testament_sha1: 01499d87058dc1ace88e835337e41f7c36a83124
# timestamp: 2010-05-14 16:08:25 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   n3n42nw7ht78k0wn
# 
# Begin bundle
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


--===============0011904476==--