From: marko.makela
Date: May 14 2010 1:32pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3095 to 3096)
List-Archive: http://lists.mysql.com/commits/108339
Message-Id: <201005141332.o4ECkT1W005764@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0861510209=="

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

IDMwOTYgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xNAogICAgICBNZXJnZSBmcm9tIG15c3FsLTUu
MS1pbm5vZGI6CiAgICAgIAogICAgICBQb3N0LW1lcmdlIGZpeGVzOiBSZW1vdmUgdGhlIE1ZU1FM
X1ZFUlNJT05fSUQgY2hlY2tzLCBiZWNhdXNlIHRoZXkgb25seQogICAgICBhcHBseSB0byB0aGUg
SW5ub0RCIFBsdWdpbi4gRml4IHBvdGVudGlhbCByYWNlIGNvbmRpdGlvbiBhY2Nlc3NpbmcKICAg
ICAgdHJ4LT5vcF9pbmZvIGFuZCB0cngtPmRldGFpbGVkX2Vycm9yLgogICAgICAtLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAg
cmV2bm86IDM0NjYKICAgICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTAwNTE0MTMwODE1LXltN2o3Y2Z1ODhybzZrbTQKICAgICAgcGFyZW50OiBtYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDEwMDUxNDEzMDIyOC1uM240Mm53N2h0NzhrMHduCiAgICAgIGNvbW1pdHRl
cjogTWFya28gTcOka2Vsw6QgPG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tPgogICAgICBicmFuY2gg
bmljazogbXlzcWwtNS4xLWlubm9kYjIKICAgICAgdGltZXN0YW1wOiBGcmkgMjAxMC0wNS0xNCAx
NjowODoxNSArMDMwMAogICAgICBtZXNzYWdlOgogICAgICAgIE1ha2UgdGhlIElubm9EQiBGT1JF
SUdOIEtFWSBwYXJzZXIgdW5kZXJzdGFuZCBtdWx0aS1zdGF0ZW1lbnRzLiAoQnVnICM0ODAyNCkK
ICAgICAgICBBbHNvIG1ha2UgSW5ub0RCIHRoaW5rcyB0aGF0IC8qLyBvbmx5IHN0YXJ0cyBhIGNv
bW1lbnQuIChCdWcgIzUzNjQ0KS4KICAgICAgCiAgICAgICAgVGhpcyBmaXhlcyB0aGUgYnVncyBp
biB0aGUgSW5ub0RCIFBsdWdpbi4KICAgICAgCiAgICAgICAgaGFfaW5ub2RiLmg6IFVzZSB0cnhf
cXVlcnlfc3RyaW5nKCkgaW5zdGVhZCBvZiB0cnhfcXVlcnkoKSB3aGVuCiAgICAgICAgYXZhaWxh
YmxlIChNeVNRTCA1LjEuNDIgb3IgbGF0ZXIpLgogICAgICAKICAgICAgICBpbm5vYmFzZV9nZXRf
c3RtdCgpOiBOZXcgZnVuY3Rpb24sIHRvIHJldHJpZXZlIHRoZSBjdXJyZW50bHkgcnVubmluZwog
ICAgICAgIFNRTCBzdGF0ZW1lbnQuCiAgICAgIAogICAgICAgIHN0cnVjdCB0cnhfc3RydWN0OiBS
ZW1vdmUgbXlzcWxfcXVlcnlfc3RyLiBVc2UgaW5ub2Jhc2VfZ2V0X3N0bXQoKSBpbnN0ZWFkLgog
ICAgICAKICAgICAgICBkaWN0X3N0cmlwX2NvbW1lbnRzKCk6IEFkZCBhbmQgb2JzZXJ2ZSB0aGUg
cGFyYW1ldGVyIHNxbF9sZW5ndGguIFRyZWF0CiAgICAgICAgLyovIGFzIHRoZSBzdGFydCBvZiBh
IGNvbW1lbnQuCiAgICAgIAogICAgICAgIGRpY3RfY3JlYXRlX2ZvcmVpZ25fY29uc3RyYWludHMo
KSwgcm93X3RhYmxlX2FkZF9mb3JlaWduX2NvbnN0cmFpbnRzKCk6CiAgICAgICAgQWRkIHRoZSBw
YXJhbWV0ZXIgc3FsX2xlbmd0aC4KCiAgICBhZGRlZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGIvci9pbm5vZGJfYnVnNDgwMjQucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiL3QvaW5ub2RiX2J1ZzQ4MDI0LnRlc3QKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lu
bm9iYXNlL2RpY3QvZGljdDBkaWN0LmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hh
X2lubm9kYi5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmgKICAg
ICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RpY3QwZGljdC5oCiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS9oYV9wcm90b3R5cGVzLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNs
dWRlL3JvdzBteXNxbC5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwdHJ4LmgK
ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG15c3FsLmMKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS90cngvdHJ4MGlfcy5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB0cnguYwog
MzA5NSBWYXNpbCBEaW1vdgkyMDEwLTA1LTEzIFttZXJnZV0KICAgICAgTWVyZ2UgbXlzcWwtdHJ1
bmstaW5ub2RiIGZyb20gYmstaW50ZXJuYWwgbG9jYWxseQoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3J2LmMKPT09IGFkZGVkIGZpbGUgJ215c3FsLXRlc3Qv
c3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZzQ4MDI0LnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9z
dWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVnNDgwMjQucmVzdWx0CTE5NzAtMDEtMDEgMDA6MDA6MDAg
KzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVnNDgwMjQucmVz
dWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE0MTMzMTQ0LWZlMGwwYjg5
dGVhNHg0dXUKQEAgLTAsMCArMSwxMCBAQAorQ1JFQVRFIFRBQkxFIGJ1ZzQ4MDI0KGEgaW50IFBS
SU1BUlkgS0VZLGIgaW50IE5PVCBOVUxMLEtFWShiKSkgRU5HSU5FPUlubm9EQjsKK0NSRUFURSBU
QUJMRSBidWc0ODAyNF9iKGIgaW50IFBSSU1BUlkgS0VZKSBFTkdJTkU9SW5ub0RCOworQUxURVIg
VEFCTEUgYnVnNDgwMjQgLyovQUREIENPTlNUUkFJTlQgRk9SRUlHTiBLRVkoYykgUkVGRVJFTkNF
UyhhKSwvKi8KK0FERCBDT05TVFJBSU5UIEZPUkVJR04gS0VZKGIpIFJFRkVSRU5DRVMgYnVnNDgw
MjRfYihiKTsKK0RST1AgVEFCTEUgYnVnNDgwMjQsYnVnNDgwMjRfYjsKK0NSRUFURSBUQUJMRSBi
dWc0ODAyNChhIGludCBQUklNQVJZIEtFWSxiIGludCBOT1QgTlVMTCxLRVkoYikpIEVOR0lORT1J
bm5vREI7CitDUkVBVEUgVEFCTEUgYnVnNDgwMjRfYihiIGludCBQUklNQVJZIEtFWSkgRU5HSU5F
PUlubm9EQjsKK0FMVEVSIFRBQkxFIGJ1ZzQ4MDI0IC8qL0FERCBDT05TVFJBSU5UIEZPUkVJR04g
S0VZKGMpIFJFRkVSRU5DRVMoYSksLyovCitBREQgQ09OU1RSQUlOVCBGT1JFSUdOIEtFWShiKSBS
RUZFUkVOQ0VTIGJ1ZzQ4MDI0X2IoYil8CitEUk9QIFRBQkxFIGJ1ZzQ4MDI0LGJ1ZzQ4MDI0X2I7
Cgo9PT0gYWRkZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNDgw
MjQudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNDgwMjQu
dGVzdAkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiL3QvaW5ub2RiX2J1ZzQ4MDI0LnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMDA1MTQxMzMxNDQtZmUwbDBiODl0ZWE0eDR1dQpAQCAtMCwwICsxLDIwIEBACisjIEJ1ZyAj
NDgwMjQgSW5ub2RiIGRvZXNuJ3Qgd29yayB3aXRoIG11bHRpLXN0YXRlbWVudHMKKworLS1zb3Vy
Y2UgaW5jbHVkZS9oYXZlX2lubm9kYi5pbmMKKworQ1JFQVRFIFRBQkxFIGJ1ZzQ4MDI0KGEgaW50
IFBSSU1BUlkgS0VZLGIgaW50IE5PVCBOVUxMLEtFWShiKSkgRU5HSU5FPUlubm9EQjsKK0NSRUFU
RSBUQUJMRSBidWc0ODAyNF9iKGIgaW50IFBSSU1BUlkgS0VZKSBFTkdJTkU9SW5ub0RCOworIyBC
dWcgIzUzNjQ0IElubm9EQiB0aGlua3MgdGhhdCAvKi8gc3RhcnRzIGFuZCBlbmRzIGEgY29tbWVu
dAorQUxURVIgVEFCTEUgYnVnNDgwMjQgLyovQUREIENPTlNUUkFJTlQgRk9SRUlHTiBLRVkoYykg
UkVGRVJFTkNFUyhhKSwvKi8KK0FERCBDT05TVFJBSU5UIEZPUkVJR04gS0VZKGIpIFJFRkVSRU5D
RVMgYnVnNDgwMjRfYihiKTsKKworRFJPUCBUQUJMRSBidWc0ODAyNCxidWc0ODAyNF9iOworCitk
ZWxpbWl0ZXIgfDsKK0NSRUFURSBUQUJMRSBidWc0ODAyNChhIGludCBQUklNQVJZIEtFWSxiIGlu
dCBOT1QgTlVMTCxLRVkoYikpIEVOR0lORT1Jbm5vREI7CitDUkVBVEUgVEFCTEUgYnVnNDgwMjRf
YihiIGludCBQUklNQVJZIEtFWSkgRU5HSU5FPUlubm9EQjsKK0FMVEVSIFRBQkxFIGJ1ZzQ4MDI0
IC8qL0FERCBDT05TVFJBSU5UIEZPUkVJR04gS0VZKGMpIFJFRkVSRU5DRVMoYSksLyovCitBREQg
Q09OU1RSQUlOVCBGT1JFSUdOIEtFWShiKSBSRUZFUkVOQ0VTIGJ1ZzQ4MDI0X2IoYil8CitkZWxp
bWl0ZXIgO3wKKworRFJPUCBUQUJMRSBidWc0ODAyNCxidWc0ODAyNF9iOwoKPT09IG1vZGlmaWVk
IGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGRpY3QuYycKLS0tIGEvc3RvcmFnZS9p
bm5vYmFzZS9kaWN0L2RpY3QwZGljdC5jCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAx
MDA1MTMwNzUzMDktY3FiM2h3ajJtaWFwY3dtegorKysgYi9zdG9yYWdlL2lubm9iYXNlL2RpY3Qv
ZGljdDBkaWN0LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTQxMzMxNDQt
ZmUwbDBiODl0ZWE0eDR1dQpAQCAtMzAyMywyNSArMzAyMywyOCBAQCBzdGF0aWMKIGNoYXIqCiBk
aWN0X3N0cmlwX2NvbW1lbnRzKAogLyo9PT09PT09PT09PT09PT09Ki8KLQljb25zdCBjaGFyKglz
cWxfc3RyaW5nKQkvKiE8IGluOiBTUUwgc3RyaW5nICovCisJY29uc3QgY2hhcioJc3FsX3N0cmlu
ZywJLyohPCBpbjogU1FMIHN0cmluZyAqLworCXNpemVfdAkJc3FsX2xlbmd0aCkJLyohPCBpbjog
bGVuZ3RoIG9mIHNxbF9zdHJpbmcgKi8KIHsKIAljaGFyKgkJc3RyOwogCWNvbnN0IGNoYXIqCXNw
dHI7CisJY29uc3QgY2hhcioJZXB0cgk9IHNxbF9zdHJpbmcgKyBzcWxfbGVuZ3RoOwogCWNoYXIq
CQlwdHI7CiAJLyogdW5jbG9zZWQgcXVvdGUgY2hhcmFjdGVyICgwIGlmIG5vbmUpICovCiAJY2hh
cgkJcXVvdGUJPSAwOwogCi0Jc3RyID0gbWVtX2FsbG9jKHN0cmxlbihzcWxfc3RyaW5nKSArIDEp
OworCXN0ciA9IG1lbV9hbGxvYyhzcWxfbGVuZ3RoICsgMSk7CiAKIAlzcHRyID0gc3FsX3N0cmlu
ZzsKIAlwdHIgPSBzdHI7CiAKIAlmb3IgKDs7KSB7CiBzY2FuX21vcmU6Ci0JCWlmICgqc3B0ciA9
PSAnXDAnKSB7CisJCWlmIChzcHRyID49IGVwdHIgfHwgKnNwdHIgPT0gJ1wwJykgeworZW5kX29m
X3N0cmluZzoKIAkJCSpwdHIgPSAnXDAnOwogCi0JCQl1dF9hKHB0ciA8PSBzdHIgKyBzdHJsZW4o
c3FsX3N0cmluZykpOworCQkJdXRfYShwdHIgPD0gc3RyICsgc3FsX2xlbmd0aCk7CiAKIAkJCXJl
dHVybihzdHIpOwogCQl9CkBAIC0zMDYwLDMwICszMDYzLDM1IEBAIHNjYW5fbW9yZToKIAkJCSAg
IHx8IChzcHRyWzBdID09ICctJyAmJiBzcHRyWzFdID09ICctJwogCQkJICAgICAgICYmIHNwdHJb
Ml0gPT0gJyAnKSkgewogCQkJZm9yICg7OykgeworCQkJCWlmICgrK3NwdHIgPj0gZXB0cikgewor
CQkJCQlnb3RvIGVuZF9vZl9zdHJpbmc7CisJCQkJfQorCiAJCQkJLyogSW4gVW5peCBhIG5ld2xp
bmUgaXMgMHgwQSB3aGlsZSBpbiBXaW5kb3dzCiAJCQkJaXQgaXMgMHgwRCBmb2xsb3dlZCBieSAw
eDBBICovCiAKLQkJCQlpZiAoKnNwdHIgPT0gKGNoYXIpMHgwQQotCQkJCSAgICB8fCAqc3B0ciA9
PSAoY2hhcikweDBECi0JCQkJICAgIHx8ICpzcHRyID09ICdcMCcpIHsKLQorCQkJCXN3aXRjaCAo
KnNwdHIpIHsKKwkJCQljYXNlIChjaGFyKSAwWDBBOgorCQkJCWNhc2UgKGNoYXIpIDB4MEQ6CisJ
CQkJY2FzZSAnXDAnOgogCQkJCQlnb3RvIHNjYW5fbW9yZTsKIAkJCQl9Ci0KLQkJCQlzcHRyKys7
CiAJCQl9CiAJCX0gZWxzZSBpZiAoIXF1b3RlICYmICpzcHRyID09ICcvJyAmJiAqKHNwdHIgKyAx
KSA9PSAnKicpIHsKKwkJCXNwdHIgKz0gMjsKIAkJCWZvciAoOzspIHsKLQkJCQlpZiAoKnNwdHIg
PT0gJyonICYmICooc3B0ciArIDEpID09ICcvJykgewotCi0JCQkJCXNwdHIgKz0gMjsKLQotCQkJ
CQlnb3RvIHNjYW5fbW9yZTsKKwkJCQlpZiAoc3B0ciA+PSBlcHRyKSB7CisJCQkJCWdvdG8gZW5k
X29mX3N0cmluZzsKIAkJCQl9CiAKLQkJCQlpZiAoKnNwdHIgPT0gJ1wwJykgewotCisJCQkJc3dp
dGNoICgqc3B0cikgeworCQkJCWNhc2UgJ1wwJzoKIAkJCQkJZ290byBzY2FuX21vcmU7CisJCQkJ
Y2FzZSAnKic6CisJCQkJCWlmIChzcHRyWzFdID09ICcvJykgeworCQkJCQkJc3B0ciArPSAyOwor
CQkJCQkJZ290byBzY2FuX21vcmU7CisJCQkJCX0KIAkJCQl9CiAKIAkJCQlzcHRyKys7CkBAIC0z
NzY0LDYgKzM3NzIsNyBAQCBkaWN0X2NyZWF0ZV9mb3JlaWduX2NvbnN0cmFpbnRzKAogCQkJCQlu
YW1lIGJlZm9yZSBpdDogdGVzdC50YWJsZTI7IHRoZQogCQkJCQlkZWZhdWx0IGRhdGFiYXNlIGlk
IHRoZSBkYXRhYmFzZSBvZgogCQkJCQlwYXJhbWV0ZXIgbmFtZSAqLworCXNpemVfdAkJc3FsX2xl
bmd0aCwJLyohPCBpbjogbGVuZ3RoIG9mIHNxbF9zdHJpbmcgKi8KIAljb25zdCBjaGFyKgluYW1l
LAkJLyohPCBpbjogdGFibGUgZnVsbCBuYW1lIGluIHRoZQogCQkJCQlub3JtYWxpemVkIGZvcm0K
IAkJCQkJZGF0YWJhc2VfbmFtZS90YWJsZV9uYW1lICovCkBAIC0zNzc4LDcgKzM3ODcsNyBAQCBk
aWN0X2NyZWF0ZV9mb3JlaWduX2NvbnN0cmFpbnRzKAogCXV0X2EodHJ4KTsKIAl1dF9hKHRyeC0+
bXlzcWxfdGhkKTsKIAotCXN0ciA9IGRpY3Rfc3RyaXBfY29tbWVudHMoc3FsX3N0cmluZyk7CisJ
c3RyID0gZGljdF9zdHJpcF9jb21tZW50cyhzcWxfc3RyaW5nLCBzcWxfbGVuZ3RoKTsKIAloZWFw
ID0gbWVtX2hlYXBfY3JlYXRlKDEwMDAwKTsKIAogCWVyciA9IGRpY3RfY3JlYXRlX2ZvcmVpZ25f
Y29uc3RyYWludHNfbG93KApAQCAtMzgxMSw2ICszODIwLDcgQEAgZGljdF9mb3JlaWduX3BhcnNl
X2Ryb3BfY29uc3RyYWludHMoCiAJZGljdF9mb3JlaWduX3QqCQlmb3JlaWduOwogCWlib29sCQkJ
c3VjY2VzczsKIAljaGFyKgkJCXN0cjsKKwlzaXplX3QJCQlsZW47CiAJY29uc3QgY2hhcioJCXB0
cjsKIAljb25zdCBjaGFyKgkJaWQ7CiAJRklMRSoJCQllZgk9IGRpY3RfZm9yZWlnbl9lcnJfZmls
ZTsKQEAgLTM4MjUsNyArMzgzNSwxMCBAQCBkaWN0X2ZvcmVpZ25fcGFyc2VfZHJvcF9jb25zdHJh
aW50cygKIAogCSpjb25zdHJhaW50c190b19kcm9wID0gbWVtX2hlYXBfYWxsb2MoaGVhcCwgMTAw
MCAqIHNpemVvZihjaGFyKikpOwogCi0Jc3RyID0gZGljdF9zdHJpcF9jb21tZW50cygqKHRyeC0+
bXlzcWxfcXVlcnlfc3RyKSk7CisJcHRyID0gaW5ub2Jhc2VfZ2V0X3N0bXQodHJ4LT5teXNxbF90
aGQsICZsZW4pOworCisJc3RyID0gZGljdF9zdHJpcF9jb21tZW50cyhwdHIsIGxlbik7CisKIAlw
dHIgPSBzdHI7CiAKIAl1dF9hZChtdXRleF9vd24oJihkaWN0X3N5cy0+bXV0ZXgpKSk7Cgo9PT0g
bW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYycKLS0t
IGEvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwlyZXZpZDp2YXNpbC5kaW1v
dkBvcmFjbGUuY29tLTIwMTAwNTEzMDc1MzA5LWNxYjNod2oybWlhcGN3bXoKKysrIGIvc3RvcmFn
ZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEwMDUxNDEzMzE0NC1mZTBsMGI4OXRlYTR4NHV1CkBAIC0xMTMzLDYgKzExMzMsMjMg
QEAgaW5ub2Jhc2VfZ2V0X2NoYXJzZXQoCiAJcmV0dXJuKHRoZF9jaGFyc2V0KChUSEQqKSBteXNx
bF90aGQpKTsKIH0KIAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCitEZXRlcm1pbmVzIHRoZSBjdXJyZW50
IFNRTCBzdGF0ZW1lbnQuCitAcmV0dXJuCVNRTCBzdGF0ZW1lbnQgc3RyaW5nICovCitleHRlcm4g
IkMiIFVOSVZfSU5URVJOCitjb25zdCBjaGFyKgoraW5ub2Jhc2VfZ2V0X3N0bXQoCisvKj09PT09
PT09PT09PT09Ki8KKwl2b2lkKglteXNxbF90aGQsCS8qITwgaW46IE15U1FMIHRocmVhZCBoYW5k
bGUgKi8KKwlzaXplX3QqCWxlbmd0aCkJCS8qITwgb3V0OiBsZW5ndGggb2YgdGhlIFNRTCBzdGF0
ZW1lbnQgKi8KK3sKKwlMRVhfU1RSSU5HKiBzdG10OworCisJc3RtdCA9IHRoZF9xdWVyeV9zdHJp
bmcoKFRIRCopIG15c3FsX3RoZCk7CisJKmxlbmd0aCA9IHN0bXQtPmxlbmd0aDsKKwlyZXR1cm4o
c3RtdC0+c3RyKTsKK30KKwogI2lmIGRlZmluZWQgKF9fV0lOX18pICYmIGRlZmluZWQgKE1ZU1FM
X0RZTkFNSUNfUExVR0lOKQogZXh0ZXJuIE1ZU1FMX1BMVUdJTl9JTVBPUlQgTVlfVE1QRElSIG15
c3FsX3RtcGRpcl9saXN0OwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCkBAIC0xNDY1LDcgKzE0ODIsNiBAQCBp
bm5vYmFzZV90cnhfYWxsb2NhdGUoCiAJdHJ4ID0gdHJ4X2FsbG9jYXRlX2Zvcl9teXNxbCgpOwog
CiAJdHJ4LT5teXNxbF90aGQgPSB0aGQ7Ci0JdHJ4LT5teXNxbF9xdWVyeV9zdHIgPSB0aGRfcXVl
cnkodGhkKTsKIAogCWlubm9iYXNlX3RyeF9pbml0KHRoZCwgdHJ4KTsKIApAQCAtNjYzMiw2ICs2
NjQ4LDggQEAgaGFfaW5ub2Jhc2U6OmNyZWF0ZSgKIAkvKiBDYWNoZSB0aGUgdmFsdWUgb2YgaW5u
b2RiX2ZpbGVfZm9ybWF0LCBpbiBjYXNlIGl0IGlzCiAJbW9kaWZpZWQgYnkgYW5vdGhlciB0aHJl
YWQgd2hpbGUgdGhlIHRhYmxlIGlzIGJlaW5nIGNyZWF0ZWQuICovCiAJY29uc3QgdWxpbnQJZmls
ZV9mb3JtYXQgPSBzcnZfZmlsZV9mb3JtYXQ7CisJY29uc3QgY2hhcioJc3RtdDsKKwlzaXplX3QJ
CXN0bXRfbGVuOwogCiAJREJVR19FTlRFUigiaGFfaW5ub2Jhc2U6OmNyZWF0ZSIpOwogCkBAIC02
OTA4LDkgKzY5MjYsMTEgQEAgaGFfaW5ub2Jhc2U6OmNyZWF0ZSgKIAkJfQogCX0KIAotCWlmICgq
dHJ4LT5teXNxbF9xdWVyeV9zdHIpIHsKLQkJZXJyb3IgPSByb3dfdGFibGVfYWRkX2ZvcmVpZ25f
Y29uc3RyYWludHModHJ4LAotCQkJKnRyeC0+bXlzcWxfcXVlcnlfc3RyLCBub3JtX25hbWUsCisJ
c3RtdCA9IGlubm9iYXNlX2dldF9zdG10KHRoZCwgJnN0bXRfbGVuKTsKKworCWlmIChzdG10KSB7
CisJCWVycm9yID0gcm93X3RhYmxlX2FkZF9mb3JlaWduX2NvbnN0cmFpbnRzKAorCQkJdHJ4LCBz
dG10LCBzdG10X2xlbiwgbm9ybV9uYW1lLAogCQkJY3JlYXRlX2luZm8tPm9wdGlvbnMgJiBIQV9M
RVhfQ1JFQVRFX1RNUF9UQUJMRSk7CiAKIAkJZXJyb3IgPSBjb252ZXJ0X2Vycm9yX2NvZGVfdG9f
bXlzcWwoZXJyb3IsIGZsYWdzLCBOVUxMKTsKQEAgLTcxOTUsNyArNzIxNSw2IEBAIGlubm9iYXNl
X2Ryb3BfZGF0YWJhc2UoCiAJLyogSW4gdGhlIFdpbmRvd3MgcGx1Z2luLCB0aGQgPSBjdXJyZW50
X3RoZCBpcyBhbHdheXMgTlVMTCAqLwogCXRyeCA9IHRyeF9hbGxvY2F0ZV9mb3JfbXlzcWwoKTsK
IAl0cngtPm15c3FsX3RoZCA9IE5VTEw7Ci0JdHJ4LT5teXNxbF9xdWVyeV9zdHIgPSBOVUxMOwog
I2Vsc2UKIAl0cnggPSBpbm5vYmFzZV90cnhfYWxsb2NhdGUodGhkKTsKICNlbmRpZgoKPT09IG1v
ZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYV9pbm5vZGIuaCcKLS0tIGEv
c3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5oCXJldmlkOnZhc2lsLmRpbW92QG9y
YWNsZS5jb20tMjAxMDA1MTMwNzUzMDktY3FiM2h3ajJtaWFwY3dtegorKysgYi9zdG9yYWdlL2lu
bm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMDA1MTQxMzMxNDQtZmUwbDBiODl0ZWE0eDR1dQpAQCAtMjMxLDcgKzIzMSw3IEBAIHRoZSBk
ZWZpbml0aW9ucyBhcmUgYnJhY2tldGVkIHdpdGggI2lmZGUKIAogZXh0ZXJuICJDIiB7CiBzdHJ1
Y3QgY2hhcnNldF9pbmZvX3N0ICp0aGRfY2hhcnNldChNWVNRTF9USEQgdGhkKTsKLWNoYXIgKip0
aGRfcXVlcnkoTVlTUUxfVEhEIHRoZCk7CitMRVhfU1RSSU5HICp0aGRfcXVlcnlfc3RyaW5nKE1Z
U1FMX1RIRCB0aGQpOwogCiAvKiogR2V0IHRoZSBmaWxlIG5hbWUgb2YgdGhlIE15U1FMIGJpbmxv
Zy4KICAqIEByZXR1cm4gdGhlIG5hbWUgb2YgdGhlIGJpbmxvZyBmaWxlCgo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RpY3QwZGljdC5oJwotLS0gYS9zdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvZGljdDBkaWN0LmgJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNv
bS0yMDEwMDUxMzA3NTMwOS1jcWIzaHdqMm1pYXBjd216CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9kaWN0MGRpY3QuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUx
NDEzMzE0NC1mZTBsMGI4OXRlYTR4NHV1CkBAIC0zNTIsNiArMzUyLDcgQEAgZGljdF9jcmVhdGVf
Zm9yZWlnbl9jb25zdHJhaW50cygKIAkJCQkJbmFtZSBiZWZvcmUgaXQ6IHRlc3QudGFibGUyOyB0
aGUKIAkJCQkJZGVmYXVsdCBkYXRhYmFzZSBpZCB0aGUgZGF0YWJhc2Ugb2YKIAkJCQkJcGFyYW1l
dGVyIG5hbWUgKi8KKwlzaXplX3QJCXNxbF9sZW5ndGgsCS8qITwgaW46IGxlbmd0aCBvZiBzcWxf
c3RyaW5nICovCiAJY29uc3QgY2hhcioJbmFtZSwJCS8qITwgaW46IHRhYmxlIGZ1bGwgbmFtZSBp
biB0aGUKIAkJCQkJbm9ybWFsaXplZCBmb3JtCiAJCQkJCWRhdGFiYXNlX25hbWUvdGFibGVfbmFt
ZSAqLwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9oYV9wcm90
b3R5cGVzLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9oYV9wcm90b3R5cGVzLmgJ
cmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMDUxMzA3NTMwOS1jcWIzaHdqMm1pYXBj
d216CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9oYV9wcm90b3R5cGVzLmgJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTQxMzMxNDQtZmUwbDBiODl0ZWE0eDR1dQpA
QCAtMjE1LDExICsyMTUsMjEgQEAgaW5ub2Jhc2VfY2FzZWRuX3N0cigKIC8qKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ly8qKgogRGV0ZXJtaW5lcyB0aGUgY29ubmVjdGlvbiBjaGFyYWN0ZXIgc2V0LgogQHJldHVybglj
b25uZWN0aW9uIGNoYXJhY3RlciBzZXQgKi8KK1VOSVZfSU5URVJOCiBzdHJ1Y3QgY2hhcnNldF9p
bmZvX3N0KgogaW5ub2Jhc2VfZ2V0X2NoYXJzZXQoCiAvKj09PT09PT09PT09PT09PT09Ki8KIAl2
b2lkKglteXNxbF90aGQpOwkvKiE8IGluOiBNeVNRTCB0aHJlYWQgaGFuZGxlICovCi0KKy8qKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqLy8qKgorRGV0ZXJtaW5lcyB0aGUgY3VycmVudCBTUUwgc3RhdGVtZW50LgorQHJl
dHVybglTUUwgc3RhdGVtZW50IHN0cmluZyAqLworVU5JVl9JTlRFUk4KK2NvbnN0IGNoYXIqCitp
bm5vYmFzZV9nZXRfc3RtdCgKKy8qPT09PT09PT09PT09PT0qLworCXZvaWQqCW15c3FsX3RoZCwJ
LyohPCBpbjogTXlTUUwgdGhyZWFkIGhhbmRsZSAqLworCXNpemVfdCoJbGVuZ3RoKQkJLyohPCBv
dXQ6IGxlbmd0aCBvZiB0aGUgU1FMIHN0YXRlbWVudCAqLworCV9fYXR0cmlidXRlX18oKG5vbm51
bGwpKTsKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKiovLyoqCiBUaGlzIGZ1bmN0aW9uIGlzIHVzZWQgdG8gZmluZCB0aGUg
c3RvcmFnZSBsZW5ndGggaW4gYnl0ZXMgb2YgdGhlIGZpcnN0IG4KIGNoYXJhY3RlcnMgZm9yIHBy
ZWZpeCBpbmRleGVzIHVzaW5nIGEgbXVsdGlieXRlIGNoYXJhY3RlciBzZXQuIFRoZSBmdW5jdGlv
bgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cwbXlzcWwu
aCcKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzBteXNxbC5oCXJldmlkOnZhc2ls
LmRpbW92QG9yYWNsZS5jb20tMjAxMDA1MTMwNzUzMDktY3FiM2h3ajJtaWFwY3dtegorKysgYi9z
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MG15c3FsLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMDA1MTQxMzMxNDQtZmUwbDBiODl0ZWE0eDR1dQpAQCAtNDAzLDYgKzQwMyw3
IEBAIHJvd190YWJsZV9hZGRfZm9yZWlnbl9jb25zdHJhaW50cygKIAkJCQlGT1JFSUdOIEtFWSAo
YSwgYikgUkVGRVJFTkNFUyB0YWJsZTIoYywgZCksCiAJCQkJCXRhYmxlMiBjYW4gYmUgd3JpdHRl
biBhbHNvIHdpdGggdGhlCiAJCQkJCWRhdGFiYXNlIG5hbWUgYmVmb3JlIGl0OiB0ZXN0LnRhYmxl
MiAqLworCXNpemVfdAkJc3FsX2xlbmd0aCwJLyohPCBpbjogbGVuZ3RoIG9mIHNxbF9zdHJpbmcg
Ki8KIAljb25zdCBjaGFyKgluYW1lLAkJLyohPCBpbjogdGFibGUgZnVsbCBuYW1lIGluIHRoZQog
CQkJCQlub3JtYWxpemVkIGZvcm0KIAkJCQkJZGF0YWJhc2VfbmFtZS90YWJsZV9uYW1lICovCgo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDB0cnguaCcKLS0t
IGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDB0cnguaAlyZXZpZDp2YXNpbC5kaW1vdkBv
cmFjbGUuY29tLTIwMTAwNTEzMDc1MzA5LWNxYjNod2oybWlhcGN3bXoKKysrIGIvc3RvcmFnZS9p
bm5vYmFzZS9pbmNsdWRlL3RyeDB0cnguaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDEwMDUxNDEzMzE0NC1mZTBsMGI4OXRlYTR4NHV1CkBAIC01NjAsOSArNTYwLDYgQEAgc3RydWN0
IHRyeF9zdHJ1Y3R7CiAJLyotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0qLwogCXZvaWQq
CQlteXNxbF90aGQ7CS8qITwgTXlTUUwgdGhyZWFkIGhhbmRsZSBjb3JyZXNwb25kaW5nCiAJCQkJ
CXRvIHRoaXMgdHJ4LCBvciBOVUxMICovCi0JY2hhcioqCQlteXNxbF9xdWVyeV9zdHI7LyogcG9p
bnRlciB0byB0aGUgZmllbGQgaW4gbXlzcWxkX3RoZAotCQkJCQl3aGljaCBjb250YWlucyB0aGUg
cG9pbnRlciB0byB0aGUKLQkJCQkJY3VycmVudCBTUUwgcXVlcnkgc3RyaW5nICovCiAJY29uc3Qg
Y2hhcioJbXlzcWxfbG9nX2ZpbGVfbmFtZTsKIAkJCQkJLyogaWYgTXlTUUwgYmlubG9nIGlzIHVz
ZWQsIHRoaXMgZmllbGQKIAkJCQkJY29udGFpbnMgYSBwb2ludGVyIHRvIHRoZSBsYXRlc3QgZmls
ZQoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBteXNxbC5jJwot
LS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbXlzcWwuYwlyZXZpZDp2YXNpbC5kaW1vdkBv
cmFjbGUuY29tLTIwMTAwNTEzMDc1MzA5LWNxYjNod2oybWlhcGN3bXoKKysrIGIvc3RvcmFnZS9p
bm5vYmFzZS9yb3cvcm93MG15c3FsLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MDA1MTQxMzMxNDQtZmUwbDBiODl0ZWE0eDR1dQpAQCAtMjA2MCw2ICsyMDYwLDcgQEAgcm93X3Rh
YmxlX2FkZF9mb3JlaWduX2NvbnN0cmFpbnRzKAogCQkJCUZPUkVJR04gS0VZIChhLCBiKSBSRUZF
UkVOQ0VTIHRhYmxlMihjLCBkKSwKIAkJCQkJdGFibGUyIGNhbiBiZSB3cml0dGVuIGFsc28gd2l0
aCB0aGUKIAkJCQkJZGF0YWJhc2UgbmFtZSBiZWZvcmUgaXQ6IHRlc3QudGFibGUyICovCisJc2l6
ZV90CQlzcWxfbGVuZ3RoLAkvKiE8IGluOiBsZW5ndGggb2Ygc3FsX3N0cmluZyAqLwogCWNvbnN0
IGNoYXIqCW5hbWUsCQkvKiE8IGluOiB0YWJsZSBmdWxsIG5hbWUgaW4gdGhlCiAJCQkJCW5vcm1h
bGl6ZWQgZm9ybQogCQkJCQlkYXRhYmFzZV9uYW1lL3RhYmxlX25hbWUgKi8KQEAgLTIwODEsOCAr
MjA4Miw4IEBAIHJvd190YWJsZV9hZGRfZm9yZWlnbl9jb25zdHJhaW50cygKIAogCXRyeF9zZXRf
ZGljdF9vcGVyYXRpb24odHJ4LCBUUlhfRElDVF9PUF9UQUJMRSk7CiAKLQllcnIgPSBkaWN0X2Ny
ZWF0ZV9mb3JlaWduX2NvbnN0cmFpbnRzKHRyeCwgc3FsX3N0cmluZywgbmFtZSwKLQkJCQkJICAg
ICAgcmVqZWN0X2Zrcyk7CisJZXJyID0gZGljdF9jcmVhdGVfZm9yZWlnbl9jb25zdHJhaW50cyh0
cngsIHNxbF9zdHJpbmcsIHNxbF9sZW5ndGgsCisJCQkJCSAgICAgIG5hbWUsIHJlamVjdF9ma3Mp
OwogCWlmIChlcnIgPT0gREJfU1VDQ0VTUykgewogCQkvKiBDaGVjayB0aGF0IGFsc28gcmVmZXJl
bmNpbmcgY29uc3RyYWludHMgYXJlIG9rICovCiAJCWVyciA9IGRpY3RfbG9hZF9mb3JlaWducyhu
YW1lLCBUUlVFKTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3RyeC90cngw
aV9zLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDBpX3MuYwlyZXZpZDp2YXNpbC5k
aW1vdkBvcmFjbGUuY29tLTIwMTAwNTEzMDc1MzA5LWNxYjNod2oybWlhcGN3bXoKKysrIGIvc3Rv
cmFnZS9pbm5vYmFzZS90cngvdHJ4MGlfcy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTAwNTE0MTMzMTQ0LWZlMGwwYjg5dGVhNHg0dXUKQEAgLTQzOCw2ICs0MzgsMTAgQEAgZmls
bF90cnhfcm93KAogCQkJCQkJd2hpY2ggdG8gY29weSB2b2xhdGlsZQogCQkJCQkJc3RyaW5ncyAq
LwogeworCWNvbnN0IGNoYXIqCXN0bXQ7CisJc2l6ZV90CQlzdG10X2xlbjsKKwljb25zdCBjaGFy
KglzOworCiAJcm93LT50cnhfaWQgPSB0cnhfZ2V0X2lkKHRyeCk7CiAJcm93LT50cnhfc3RhcnRl
ZCA9IChpYl90aW1lX3QpIHRyeC0+c3RhcnRfdGltZTsKIAlyb3ctPnRyeF9zdGF0ZSA9IHRyeF9n
ZXRfcXVlX3N0YXRlX3N0cih0cngpOwpAQCAtNDU4LDIwICs0NjIsMzIgQEAgZmlsbF90cnhfcm93
KAogCiAJcm93LT50cnhfd2VpZ2h0ID0gKHVsbGludCkgdXRfY29udl9kdWxpbnRfdG9fbG9uZ2xv
bmcoVFJYX1dFSUdIVCh0cngpKTsKIAotCWlmICh0cngtPm15c3FsX3RoZCAhPSBOVUxMKSB7Ci0J
CXJvdy0+dHJ4X215c3FsX3RocmVhZF9pZAotCQkJPSB0aGRfZ2V0X3RocmVhZF9pZCh0cngtPm15
c3FsX3RoZCk7Ci0JfSBlbHNlIHsKKwlpZiAodHJ4LT5teXNxbF90aGQgPT0gTlVMTCkgewogCQkv
KiBGb3IgaW50ZXJuYWwgdHJhbnNhY3Rpb25zIGUuZy4sIHB1cmdlIGFuZCB0cmFuc2FjdGlvbnMK
IAkJYmVpbmcgcmVjb3ZlcmVkIGF0IHN0YXJ0dXAgdGhlcmUgaXMgbm8gYXNzb2NpYXRlZCBNeVNR
TAogCQl0aHJlYWQgZGF0YSBzdHJ1Y3R1cmUuICovCiAJCXJvdy0+dHJ4X215c3FsX3RocmVhZF9p
ZCA9IDA7CisJCXJvdy0+dHJ4X3F1ZXJ5ID0gTlVMTDsKKwkJZ290byB0aGRfZG9uZTsKIAl9CiAK
LQlpZiAodHJ4LT5teXNxbF9xdWVyeV9zdHIgIT0gTlVMTCAmJiAqdHJ4LT5teXNxbF9xdWVyeV9z
dHIgIT0gTlVMTCkgeworCXJvdy0+dHJ4X215c3FsX3RocmVhZF9pZCA9IHRoZF9nZXRfdGhyZWFk
X2lkKHRyeC0+bXlzcWxfdGhkKTsKKwlzdG10ID0gaW5ub2Jhc2VfZ2V0X3N0bXQodHJ4LT5teXNx
bF90aGQsICZzdG10X2xlbik7CisKKwlpZiAoc3RtdCAhPSBOVUxMKSB7CisKKwkJY2hhcglxdWVy
eVtUUlhfSV9TX1RSWF9RVUVSWV9NQVhfTEVOICsgMV07CiAKLQkJVFJYX0lfU19TVFJJTkdfQ09Q
WSgqdHJ4LT5teXNxbF9xdWVyeV9zdHIsIHJvdy0+dHJ4X3F1ZXJ5LAotCQkJCSAgICBUUlhfSV9T
X1RSWF9RVUVSWV9NQVhfTEVOLCBjYWNoZSk7CisJCWlmIChzdG10X2xlbiA+IFRSWF9JX1NfVFJY
X1FVRVJZX01BWF9MRU4pIHsKKwkJCXN0bXRfbGVuID0gVFJYX0lfU19UUlhfUVVFUllfTUFYX0xF
TjsKKwkJfQorCisJCW1lbWNweShxdWVyeSwgc3RtdCwgc3RtdF9sZW4pOworCQlxdWVyeVtzdG10
X2xlbl0gPSAnXDAnOworCisJCXJvdy0+dHJ4X3F1ZXJ5ID0gaGFfc3RvcmFnZV9wdXRfbWVtbGlt
KAorCQkJY2FjaGUtPnN0b3JhZ2UsIHN0bXQsIHN0bXRfbGVuICsgMSwKKwkJCU1BWF9BTExPV0VE
X0ZPUl9TVE9SQUdFKGNhY2hlKSk7CiAKIAkJaWYgKHJvdy0+dHJ4X3F1ZXJ5ID09IE5VTEwpIHsK
IApAQCAtNDgyLDkgKzQ5OCwxMiBAQCBmaWxsX3RyeF9yb3coCiAJCXJvdy0+dHJ4X3F1ZXJ5ID0g
TlVMTDsKIAl9CiAKLQlpZiAodHJ4LT5vcF9pbmZvICE9IE5VTEwgJiYgdHJ4LT5vcF9pbmZvWzBd
ICE9ICdcMCcpIHsKK3RoZF9kb25lOgorCXMgPSB0cngtPm9wX2luZm87CiAKLQkJVFJYX0lfU19T
VFJJTkdfQ09QWSh0cngtPm9wX2luZm8sIHJvdy0+dHJ4X29wZXJhdGlvbl9zdGF0ZSwKKwlpZiAo
cyAhPSBOVUxMICYmIHNbMF0gIT0gJ1wwJykgeworCisJCVRSWF9JX1NfU1RSSU5HX0NPUFkocywg
cm93LT50cnhfb3BlcmF0aW9uX3N0YXRlLAogCQkJCSAgICBUUlhfSV9TX1RSWF9PUF9TVEFURV9N
QVhfTEVOLCBjYWNoZSk7CiAKIAkJaWYgKHJvdy0+dHJ4X29wZXJhdGlvbl9zdGF0ZSA9PSBOVUxM
KSB7CkBAIC01MzIsOSArNTUxLDExIEBAIGZpbGxfdHJ4X3JvdygKIAogCXJvdy0+dHJ4X2ZvcmVp
Z25fa2V5X2NoZWNrcyA9IChpYm9vbCkgdHJ4LT5jaGVja19mb3JlaWduczsKIAotCWlmICh0cngt
PmRldGFpbGVkX2Vycm9yICE9IE5VTEwgJiYgdHJ4LT5kZXRhaWxlZF9lcnJvclswXSAhPSAnXDAn
KSB7CisJcyA9IHRyeC0+ZGV0YWlsZWRfZXJyb3I7CisKKwlpZiAocyAhPSBOVUxMICYmIHNbMF0g
IT0gJ1wwJykgewogCi0JCVRSWF9JX1NfU1RSSU5HX0NPUFkodHJ4LT5kZXRhaWxlZF9lcnJvciwK
KwkJVFJYX0lfU19TVFJJTkdfQ09QWShzLAogCQkJCSAgICByb3ctPnRyeF9mb3JlaWduX2tleV9l
cnJvciwKIAkJCQkgICAgVFJYX0lfU19UUlhfRktfRVJST1JfTUFYX0xFTiwgY2FjaGUpOwogCkBA
IC01NDMsNyArNTY0LDcgQEAgZmlsbF90cnhfcm93KAogCQkJcmV0dXJuKEZBTFNFKTsKIAkJfQog
CX0gZWxzZSB7Ci0JCQlyb3ctPnRyeF9mb3JlaWduX2tleV9lcnJvciA9IE5VTEw7CisJCXJvdy0+
dHJ4X2ZvcmVpZ25fa2V5X2Vycm9yID0gTlVMTDsKIAl9CiAKIAlyb3ctPnRyeF9oYXNfc2VhcmNo
X2xhdGNoID0gKGlib29sKSB0cngtPmhhc19zZWFyY2hfbGF0Y2g7Cgo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHRyeC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl
L3RyeC90cngwdHJ4LmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMDUxMzA3NTMw
OS1jcWIzaHdqMm1pYXBjd216CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB0cnguYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxNDEzMzE0NC1mZTBsMGI4OXRlYTR4
NHV1CkBAIC0xMjQsNyArMTI0LDYgQEAgdHJ4X2NyZWF0ZSgKIAl0cngtPnRhYmxlX2lkID0gdXRf
ZHVsaW50X3plcm87CiAKIAl0cngtPm15c3FsX3RoZCA9IE5VTEw7Ci0JdHJ4LT5teXNxbF9xdWVy
eV9zdHIgPSBOVUxMOwogCXRyeC0+YWN0aXZlX3RyYW5zID0gMDsKIAl0cngtPmR1cGxpY2F0ZXMg
PSAwOwogCkBAIC05NDQsNyArOTQzLDYgQEAgdHJ4X2NvbW1pdF9vZmZfa2VybmVsKAogCXRyeC0+
cnNlZyA9IE5VTEw7CiAJdHJ4LT51bmRvX25vID0gdXRfZHVsaW50X3plcm87CiAJdHJ4LT5sYXN0
X3NxbF9zdGF0X3N0YXJ0LmxlYXN0X3VuZG9fbm8gPSB1dF9kdWxpbnRfemVybzsKLQl0cngtPm15
c3FsX3F1ZXJ5X3N0ciA9IE5VTEw7CiAKIAl1dF9hZChVVF9MSVNUX0dFVF9MRU4odHJ4LT53YWl0
X3RocnMpID09IDApOwogCXV0X2FkKFVUX0xJU1RfR0VUX0xFTih0cngtPnRyeF9sb2NrcykgPT0g
MCk7Cgo=

--===============0861510209==
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.5-innodb/
# testament_sha1: 3e0aff19ee171361d1efa1a43c16f913765da816
# timestamp: 2010-05-14 16:32:11 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   cqb3hwj2miapcwmz
# 
# Begin bundle
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
v5P6gZpOv7P/F3JFOFCQFp/GXQ==


--===============0861510209==--