From: marko.makela
Date: January 31 2011 8:24am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3300)
List-Archive: http://lists.mysql.com/commits/130004
Message-Id: <201101310825.p0V8F2jD001398@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1882776233=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMTMwMTcxNzMxLTM4YmIz
ejV6bndrZXQxMHQKCiAzMzAwIE1hcmtvIE3DpGtlbMOkCTIwMTEtMDEtMzEgW21lcmdlXQogICAg
ICBNZXJnZSBteXNxbC01LjEtaW5ub2RiIHRvIG15c3FsLTUuNS1pbm5vZGIuCgogICAgbW9kaWZp
ZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYwogICAgICBzdG9yYWdlL2lu
bm9iYXNlL2luY2x1ZGUvcm93MHVwZC5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBw
dXJnZS5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1bW9kLmMKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9yb3cvcm93MHVwZC5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDBy
b2xsLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYycK
LS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCXJldmlkOnZhc2lsLmRpbW92QG9y
YWNsZS5jb20tMjAxMTAxMzAxNzE3MzEtMzhiYjN6NXpud2tldDEwdAorKysgYi9zdG9yYWdlL2lu
bm9iYXNlL2J0ci9idHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAx
MzEwODIzMzgtMnd4Y2J4d2VhMDF3b3d1dgpAQCAtMTg4Niw4ICsxODg2LDggQEAgYnRyX2N1cl91
cGRhdGVfaW5fcGxhY2UoCiAJCU5PVCBjYWxsIGl0IGlmIGluZGV4IGlzIHNlY29uZGFyeSAqLwog
CiAJCWlmICghZGljdF9pbmRleF9pc19jbHVzdChpbmRleCkKLQkJICAgIHx8IHJvd191cGRfY2hh
bmdlc19vcmRfZmllbGRfYmluYXJ5KE5VTEwsIE5VTEwsCi0JCQkJCQkJaW5kZXgsIHVwZGF0ZSkp
IHsKKwkJICAgIHx8IHJvd191cGRfY2hhbmdlc19vcmRfZmllbGRfYmluYXJ5KGluZGV4LCB1cGRh
dGUsIHRociwKKwkJCQkJCQlOVUxMLCBOVUxMKSkgewogCiAJCQkvKiBSZW1vdmUgcG9zc2libGUg
aGFzaCBpbmRleCBwb2ludGVyIHRvIHRoaXMgcmVjb3JkICovCiAJCQlidHJfc2VhcmNoX3VwZGF0
ZV9oYXNoX29uX2RlbGV0ZShjdXJzb3IpOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS9yb3cwdXBkLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9y
b3cwdXBkLmgJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDExMDEzMDE3MTczMS0zOGJi
M3o1em53a2V0MTB0CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cwdXBkLmgJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMzEwODIzMzgtMnd4Y2J4d2VhMDF3b3d1
dgpAQCAtMjgwLDE5ICsyODAsMjkgQEAgTk9URTogd2UgY29tcGFyZSB0aGUgZmllbGRzIGFzIGJp
bmFyeSBzdAogQHJldHVybiBUUlVFIGlmIHVwZGF0ZSB2ZWN0b3IgY2hhbmdlcyBhbiBvcmRlcmlu
ZyBmaWVsZCBpbiB0aGUgaW5kZXggcmVjb3JkICovCiBVTklWX0lOVEVSTgogaWJvb2wKLXJvd191
cGRfY2hhbmdlc19vcmRfZmllbGRfYmluYXJ5KAotLyo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PSovCityb3dfdXBkX2NoYW5nZXNfb3JkX2ZpZWxkX2JpbmFyeV9mdW5jKAorLyo9PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KKwlkaWN0X2luZGV4X3QqCWluZGV4LAkvKiE8
IGluOiBpbmRleCBvZiB0aGUgcmVjb3JkICovCisJY29uc3QgdXBkX3QqCXVwZGF0ZSwJLyohPCBp
bjogdXBkYXRlIHZlY3RvciBmb3IgdGhlIHJvdzsgTk9URTogdGhlCisJCQkJZmllbGQgbnVtYmVy
cyBpbiB0aGlzIE1VU1QgYmUgY2x1c3RlcmVkIGluZGV4CisJCQkJcG9zaXRpb25zISAqLworI2lm
ZGVmIFVOSVZfREVCVUcKKwljb25zdCBxdWVfdGhyX3QqdGhyLAkvKiE8IGluOiBxdWVyeSB0aHJl
YWQgKi8KKyNlbmRpZiAvKiBVTklWX0RFQlVHICovCiAJY29uc3QgZHR1cGxlX3QqCXJvdywJLyoh
PCBpbjogb2xkIHZhbHVlIG9mIHJvdywgb3IgTlVMTCBpZiB0aGUKIAkJCQlyb3cgYW5kIHRoZSBk
YXRhIHZhbHVlcyBpbiB1cGRhdGUgYXJlIG5vdAogCQkJCWtub3duIHdoZW4gdGhpcyBmdW5jdGlv
biBpcyBjYWxsZWQsIGUuZy4sIGF0CiAJCQkJY29tcGlsZSB0aW1lICovCi0JY29uc3Qgcm93X2V4
dF90KmV4dCwJLyohPCBOVUxMLCBvciBwcmVmaXhlcyBvZiB0aGUgZXh0ZXJuYWxseQorCWNvbnN0
IHJvd19leHRfdCpleHQpCS8qITwgTlVMTCwgb3IgcHJlZml4ZXMgb2YgdGhlIGV4dGVybmFsbHkK
IAkJCQlzdG9yZWQgY29sdW1ucyBpbiB0aGUgb2xkIHJvdyAqLwotCWRpY3RfaW5kZXhfdCoJaW5k
ZXgsCS8qITwgaW46IGluZGV4IG9mIHRoZSByZWNvcmQgKi8KLQljb25zdCB1cGRfdCoJdXBkYXRl
KQkvKiE8IGluOiB1cGRhdGUgdmVjdG9yIGZvciB0aGUgcm93OyBOT1RFOiB0aGUKLQkJCQlmaWVs
ZCBudW1iZXJzIGluIHRoaXMgTVVTVCBiZSBjbHVzdGVyZWQgaW5kZXgKLQkJCQlwb3NpdGlvbnMh
ICovCi0JX19hdHRyaWJ1dGVfXygobm9ubnVsbCgzLDQpLCB3YXJuX3VudXNlZF9yZXN1bHQpKTsK
KwlfX2F0dHJpYnV0ZV9fKChub25udWxsKDEsMiksIHdhcm5fdW51c2VkX3Jlc3VsdCkpOworI2lm
ZGVmIFVOSVZfREVCVUcKKyMgZGVmaW5lIHJvd191cGRfY2hhbmdlc19vcmRfZmllbGRfYmluYXJ5
KGluZGV4LHVwZGF0ZSx0aHIscm93LGV4dCkJXAorCXJvd191cGRfY2hhbmdlc19vcmRfZmllbGRf
YmluYXJ5X2Z1bmMoaW5kZXgsdXBkYXRlLHRocixyb3csZXh0KQorI2Vsc2UgLyogVU5JVl9ERUJV
RyAqLworIyBkZWZpbmUgcm93X3VwZF9jaGFuZ2VzX29yZF9maWVsZF9iaW5hcnkoaW5kZXgsdXBk
YXRlLHRocixyb3csZXh0KQlcCisJcm93X3VwZF9jaGFuZ2VzX29yZF9maWVsZF9iaW5hcnlfZnVu
YyhpbmRleCx1cGRhdGUscm93LGV4dCkKKyNlbmRpZiAvKiBVTklWX0RFQlVHICovCiAvKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoq
CiBDaGVja3MgaWYgYW4gdXBkYXRlIHZlY3RvciBjaGFuZ2VzIGFuIG9yZGVyaW5nIGZpZWxkIG9m
IGFuIGluZGV4IHJlY29yZC4KIFRoaXMgZnVuY3Rpb24gaXMgZmFzdCBpZiB0aGUgdXBkYXRlIHZl
Y3RvciBpcyBzaG9ydCBvciB0aGUgbnVtYmVyIG9mIG9yZGVyaW5nCgo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHB1cmdlLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jh
c2Uvcm93L3JvdzBwdXJnZS5jCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTAxMzAx
NzE3MzEtMzhiYjN6NXpud2tldDEwdAorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcHVy
Z2UuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEzMTA4MjMzOC0yd3hjYnh3
ZWEwMXdvd3V2CkBAIC00ODksOCArNDg5LDExIEBAIFB1cmdlcyBhbiB1cGRhdGUgb2YgYW4gZXhp
c3RpbmcgcmVjb3JkLgogbWFya2VkIHJlY29yZCBpZiB0aGF0IHJlY29yZCBjb250YWluZWQgYW4g
ZXh0ZXJuYWxseSBzdG9yZWQgZmllbGQuICovCiBzdGF0aWMKIHZvaWQKLXJvd19wdXJnZV91cGRf
ZXhpc3Rfb3JfZXh0ZXJuKAotLyo9PT09PT09PT09PT09PT09PT09PT09PT09PSovCityb3dfcHVy
Z2VfdXBkX2V4aXN0X29yX2V4dGVybl9mdW5jKAorLyo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09Ki8KKyNpZmRlZiBVTklWX0RFQlVHCisJY29uc3QgcXVlX3Rocl90KnRociwJLyohPCBp
bjogcXVlcnkgdGhyZWFkICovCisjZW5kaWYgLyogVU5JVl9ERUJVRyAqLwogCXB1cmdlX25vZGVf
dCoJbm9kZSkJLyohPCBpbjogcm93IHB1cmdlIG5vZGUgKi8KIHsKIAltZW1faGVhcF90KgloZWFw
OwpAQCAtNTE1LDggKzUxOCw4IEBAIHJvd19wdXJnZV91cGRfZXhpc3Rfb3JfZXh0ZXJuKAogCXdo
aWxlIChub2RlLT5pbmRleCAhPSBOVUxMKSB7CiAJCWluZGV4ID0gbm9kZS0+aW5kZXg7CiAKLQkJ
aWYgKHJvd191cGRfY2hhbmdlc19vcmRfZmllbGRfYmluYXJ5KE5VTEwsIE5VTEwsIG5vZGUtPmlu
ZGV4LAotCQkJCQkJICAgICBub2RlLT51cGRhdGUpKSB7CisJCWlmIChyb3dfdXBkX2NoYW5nZXNf
b3JkX2ZpZWxkX2JpbmFyeShub2RlLT5pbmRleCwgbm9kZS0+dXBkYXRlLAorCQkJCQkJICAgICB0
aHIsIE5VTEwsIE5VTEwpKSB7CiAJCQkvKiBCdWlsZCB0aGUgb2xkZXIgdmVyc2lvbiBvZiB0aGUg
aW5kZXggZW50cnkgKi8KIAkJCWVudHJ5ID0gcm93X2J1aWxkX2luZGV4X2VudHJ5KG5vZGUtPnJv
dywgTlVMTCwKIAkJCQkJCSAgICAgIGluZGV4LCBoZWFwKTsKQEAgLTU5OCw2ICs2MDEsMTQgQEAg
c2tpcF9zZWNvbmRhcmllczoKIAl9CiB9CiAKKyNpZmRlZiBVTklWX0RFQlVHCisjIGRlZmluZSBy
b3dfcHVyZ2VfdXBkX2V4aXN0X29yX2V4dGVybih0aHIsbm9kZSkJXAorCXJvd19wdXJnZV91cGRf
ZXhpc3Rfb3JfZXh0ZXJuX2Z1bmModGhyLG5vZGUpCisjZWxzZSAvKiBVTklWX0RFQlVHICovCisj
IGRlZmluZSByb3dfcHVyZ2VfdXBkX2V4aXN0X29yX2V4dGVybih0aHIsbm9kZSkJXAorCXJvd19w
dXJnZV91cGRfZXhpc3Rfb3JfZXh0ZXJuX2Z1bmMobm9kZSkKKyNlbmRpZiAvKiBVTklWX0RFQlVH
ICovCisKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKi8vKioKIFBhcnNlcyB0aGUgcm93IHJlZmVyZW5jZSBhbmQgb3RoZXIgaW5mbyBp
biBhIG1vZGlmeSB1bmRvIGxvZyByZWNvcmQuCiBAcmV0dXJuIFRSVUUgaWYgcHVyZ2Ugb3BlcmF0
aW9uIHJlcXVpcmVkOiBOT1RFIHRoYXQgdGhlbiB0aGUgQ0FMTEVSCkBAIC03NTYsNyArNzY3LDcg
QEAgcm93X3B1cmdlKAogCQl9IGVsc2UgaWYgKHVwZGF0ZWRfZXh0ZXJuCiAJCQkgICB8fCBub2Rl
LT5yZWNfdHlwZSA9PSBUUlhfVU5ET19VUERfRVhJU1RfUkVDKSB7CiAKLQkJCXJvd19wdXJnZV91
cGRfZXhpc3Rfb3JfZXh0ZXJuKG5vZGUpOworCQkJcm93X3B1cmdlX3VwZF9leGlzdF9vcl9leHRl
cm4odGhyLCBub2RlKTsKIAkJfQogCiAJCWlmIChub2RlLT5mb3VuZF9jbHVzdCkgewoKPT09IG1v
ZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1bW9kLmMnCi0tLSBhL3N0b3Jh
Z2UvaW5ub2Jhc2Uvcm93L3JvdzB1bW9kLmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0y
MDExMDEzMDE3MTczMS0zOGJiM3o1em53a2V0MTB0CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93
L3JvdzB1bW9kLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMzEwODIzMzgt
Mnd4Y2J4d2VhMDF3b3d1dgpAQCAtNjkzLDggKzY5Myw5IEBAIHJvd191bmRvX21vZF91cGRfZXhp
c3Rfc2VjKAogCXdoaWxlIChub2RlLT5pbmRleCAhPSBOVUxMKSB7CiAJCWluZGV4ID0gbm9kZS0+
aW5kZXg7CiAKLQkJaWYgKHJvd191cGRfY2hhbmdlc19vcmRfZmllbGRfYmluYXJ5KAotCQkJICAg
IG5vZGUtPnJvdywgbm9kZS0+ZXh0LCBub2RlLT5pbmRleCwgbm9kZS0+dXBkYXRlKSkgeworCQlp
ZiAocm93X3VwZF9jaGFuZ2VzX29yZF9maWVsZF9iaW5hcnkobm9kZS0+aW5kZXgsIG5vZGUtPnVw
ZGF0ZSwKKwkJCQkJCSAgICAgdGhyLAorCQkJCQkJICAgICBub2RlLT5yb3csIG5vZGUtPmV4dCkp
IHsKIAogCQkJLyogQnVpbGQgdGhlIG5ld2VzdCB2ZXJzaW9uIG9mIHRoZSBpbmRleCBlbnRyeSAq
LwogCQkJZW50cnkgPSByb3dfYnVpbGRfaW5kZXhfZW50cnkobm9kZS0+cm93LCBub2RlLT5leHQs
Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVwZC5jJwotLS0g
YS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdXBkLmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xl
LmNvbS0yMDExMDEzMDE3MTczMS0zOGJiM3o1em53a2V0MTB0CisrKyBiL3N0b3JhZ2UvaW5ub2Jh
c2Uvcm93L3JvdzB1cGQuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEzMTA4
MjMzOC0yd3hjYnh3ZWEwMXdvd3V2CkBAIC0xMTkyLDI1ICsxMTkyLDMxIEBAIE5PVEU6IHdlIGNv
bXBhcmUgdGhlIGZpZWxkcyBhcyBiaW5hcnkgc3QKIEByZXR1cm4gVFJVRSBpZiB1cGRhdGUgdmVj
dG9yIGNoYW5nZXMgYW4gb3JkZXJpbmcgZmllbGQgaW4gdGhlIGluZGV4IHJlY29yZCAqLwogVU5J
Vl9JTlRFUk4KIGlib29sCi1yb3dfdXBkX2NoYW5nZXNfb3JkX2ZpZWxkX2JpbmFyeSgKLS8qPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0qLworcm93X3VwZF9jaGFuZ2VzX29yZF9maWVsZF9i
aW5hcnlfZnVuYygKKy8qPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSovCisJZGlj
dF9pbmRleF90KglpbmRleCwJLyohPCBpbjogaW5kZXggb2YgdGhlIHJlY29yZCAqLworCWNvbnN0
IHVwZF90Kgl1cGRhdGUsCS8qITwgaW46IHVwZGF0ZSB2ZWN0b3IgZm9yIHRoZSByb3c7IE5PVEU6
IHRoZQorCQkJCWZpZWxkIG51bWJlcnMgaW4gdGhpcyBNVVNUIGJlIGNsdXN0ZXJlZCBpbmRleAor
CQkJCXBvc2l0aW9ucyEgKi8KKyNpZmRlZiBVTklWX0RFQlVHCisJY29uc3QgcXVlX3Rocl90KnRo
ciwJLyohPCBpbjogcXVlcnkgdGhyZWFkICovCisjZW5kaWYgLyogVU5JVl9ERUJVRyAqLwogCWNv
bnN0IGR0dXBsZV90Kglyb3csCS8qITwgaW46IG9sZCB2YWx1ZSBvZiByb3csIG9yIE5VTEwgaWYg
dGhlCiAJCQkJcm93IGFuZCB0aGUgZGF0YSB2YWx1ZXMgaW4gdXBkYXRlIGFyZSBub3QKIAkJCQlr
bm93biB3aGVuIHRoaXMgZnVuY3Rpb24gaXMgY2FsbGVkLCBlLmcuLCBhdAogCQkJCWNvbXBpbGUg
dGltZSAqLwotCWNvbnN0IHJvd19leHRfdCpleHQsCS8qITwgTlVMTCwgb3IgcHJlZml4ZXMgb2Yg
dGhlIGV4dGVybmFsbHkKKwljb25zdCByb3dfZXh0X3QqZXh0KQkvKiE8IE5VTEwsIG9yIHByZWZp
eGVzIG9mIHRoZSBleHRlcm5hbGx5CiAJCQkJc3RvcmVkIGNvbHVtbnMgaW4gdGhlIG9sZCByb3cg
Ki8KLQlkaWN0X2luZGV4X3QqCWluZGV4LAkvKiE8IGluOiBpbmRleCBvZiB0aGUgcmVjb3JkICov
Ci0JY29uc3QgdXBkX3QqCXVwZGF0ZSkJLyohPCBpbjogdXBkYXRlIHZlY3RvciBmb3IgdGhlIHJv
dzsgTk9URTogdGhlCi0JCQkJZmllbGQgbnVtYmVycyBpbiB0aGlzIE1VU1QgYmUgY2x1c3RlcmVk
IGluZGV4Ci0JCQkJcG9zaXRpb25zISAqLwogewogCXVsaW50CQkJbl91bmlxdWU7CiAJdWxpbnQJ
CQlpOwogCWNvbnN0IGRpY3RfaW5kZXhfdCoJY2x1c3RfaW5kZXg7CiAKLQl1dF9hZCh1cGRhdGUp
OwogCXV0X2FkKGluZGV4KTsKKwl1dF9hZCh1cGRhdGUpOworCXV0X2FkKHRocik7CisJdXRfYWQo
dGhyLT5ncmFwaCk7CisJdXRfYWQodGhyLT5ncmFwaC0+dHJ4KTsKIAogCW5fdW5pcXVlID0gZGlj
dF9pbmRleF9nZXRfbl91bmlxdWUoaW5kZXgpOwogCkBAIC0xMjYzLDkgKzEyNjksMTQgQEAgcm93
X3VwZF9jaGFuZ2VzX29yZF9maWVsZF9iaW5hcnkoCiAKIAkJCWlmIChVTklWX0xJS0VMWV9OVUxM
KGJ1ZikpIHsKIAkJCQlpZiAoVU5JVl9VTkxJS0VMWShidWYgPT0gZmllbGRfcmVmX3plcm8pKSB7
Ci0JCQkJCS8qIFRoaXMgc2hvdWxkIG5ldmVyIGhhcHBlbiwgYnV0Ci0JCQkJCXdlIHRyeSB0byBm
YWlsIHNhZmUgaGVyZS4gKi8KLQkJCQkJdXRfYWQoMCk7CisJCQkJCS8qIFRoZSBleHRlcm5hbGx5
IHN0b3JlZCBmaWVsZAorCQkJCQl3YXMgbm90IHdyaXR0ZW4geWV0LiBUaGlzCisJCQkJCXJlY29y
ZCBzaG91bGQgb25seSBiZSBzZWVuIGJ5CisJCQkJCXJlY3ZfcmVjb3Zlcnlfcm9sbGJhY2tfYWN0
aXZlKCksCisJCQkJCXdoZW4gdGhlIHNlcnZlciBoYWQgY3Jhc2hlZCBiZWZvcmUKKwkJCQkJc3Rv
cmluZyB0aGUgZmllbGQuICovCisJCQkJCXV0X2FkKHRoci0+Z3JhcGgtPnRyeC0+aXNfcmVjb3Zl
cmVkKTsKKwkJCQkJdXRfYWQodHJ4X2lzX3JlY3YodGhyLT5ncmFwaC0+dHJ4KSk7CiAJCQkJCXJl
dHVybihUUlVFKTsKIAkJCQl9CiAKQEAgLTE2NDAsOCArMTY1MSw4IEBAIHJvd191cGRfc2VjX3N0
ZXAoCiAJdXRfYWQoIWRpY3RfaW5kZXhfaXNfY2x1c3Qobm9kZS0+aW5kZXgpKTsKIAogCWlmIChu
b2RlLT5zdGF0ZSA9PSBVUERfTk9ERV9VUERBVEVfQUxMX1NFQwotCSAgICB8fCByb3dfdXBkX2No
YW5nZXNfb3JkX2ZpZWxkX2JpbmFyeShub2RlLT5yb3csIG5vZGUtPmV4dCwKLQkJCQkJCW5vZGUt
PmluZGV4LCBub2RlLT51cGRhdGUpKSB7CisJICAgIHx8IHJvd191cGRfY2hhbmdlc19vcmRfZmll
bGRfYmluYXJ5KG5vZGUtPmluZGV4LCBub2RlLT51cGRhdGUsCisJCQkJCQl0aHIsIG5vZGUtPnJv
dywgbm9kZS0+ZXh0KSkgewogCQlyZXR1cm4ocm93X3VwZF9zZWNfaW5kZXhfZW50cnkobm9kZSwg
dGhyKSk7CiAJfQogCkBAIC0yMTY5LDggKzIxODAsOCBAQCBleGl0X2Z1bmM6CiAKIAlyb3dfdXBk
X3N0b3JlX3Jvdyhub2RlKTsKIAotCWlmIChyb3dfdXBkX2NoYW5nZXNfb3JkX2ZpZWxkX2JpbmFy
eShub2RlLT5yb3csIG5vZGUtPmV4dCwgaW5kZXgsCi0JCQkJCSAgICAgbm9kZS0+dXBkYXRlKSkg
eworCWlmIChyb3dfdXBkX2NoYW5nZXNfb3JkX2ZpZWxkX2JpbmFyeShpbmRleCwgbm9kZS0+dXBk
YXRlLCB0aHIsCisJCQkJCSAgICAgbm9kZS0+cm93LCBub2RlLT5leHQpKSB7CiAKIAkJLyogVXBk
YXRlIGNhdXNlcyBhbiBvcmRlcmluZyBmaWVsZCAob3JkZXJpbmcgZmllbGRzIHdpdGhpbgogCQl0
aGUgQi10cmVlKSBvZiB0aGUgY2x1c3RlcmVkIGluZGV4IHJlY29yZCB0byBjaGFuZ2U6IHBlcmZv
cm0KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcm9sbC5jJwot
LS0gYS9zdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcm9sbC5jCXJldmlkOnZhc2lsLmRpbW92QG9y
YWNsZS5jb20tMjAxMTAxMzAxNzE3MzEtMzhiYjN6NXpud2tldDEwdAorKysgYi9zdG9yYWdlL2lu
bm9iYXNlL3RyeC90cngwcm9sbC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEw
MTMxMDgyMzM4LTJ3eGNieHdlYTAxd293dXYKQEAgLTQ3LDggKzQ3LDggQEAgQ3JlYXRlZCAzLzI2
LzE5OTYgSGVpa2tpIFR1dXJpCiByb2xsYmFjayAqLwogI2RlZmluZSBUUlhfUk9MTF9UUlVOQ19U
SFJFU0hPTEQJMQogCi0vKiogSW4gY3Jhc2ggcmVjb3ZlcnksIHRoZSBjdXJyZW50IHRyeCB0byBi
ZSByb2xsZWQgYmFjayAqLwotc3RhdGljIHRyeF90KgkJdHJ4X3JvbGxfY3Jhc2hfcmVjdl90cngJ
PSBOVUxMOworLyoqIEluIGNyYXNoIHJlY292ZXJ5LCB0aGUgY3VycmVudCB0cnggdG8gYmUgcm9s
bGVkIGJhY2s7IE5VTEwgb3RoZXJ3aXNlICovCitzdGF0aWMgY29uc3QgdHJ4X3QqCXRyeF9yb2xs
X2NyYXNoX3JlY3ZfdHJ4CT0gTlVMTDsKIAogLyoqIEluIGNyYXNoIHJlY292ZXJ5IHdlIHNldCB0
aGlzIHRvIHRoZSB1bmRvIG46byBvZiB0aGUgY3VycmVudCB0cnggdG8gYmUKIHJvbGxlZCBiYWNr
LiBUaGVuIHdlIGNhbiBwcmludCBob3cgbWFueSAlIHRoZSByb2xsYmFjayBoYXMgcHJvZ3Jlc3Nl
ZC4gKi8KCg==

--===============1882776233==
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.5-innodb/
# testament_sha1: dc05501bb77f40415c2a9c576989c6da47681398
# timestamp: 2011-01-31 10:25:03 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   38bb3z5znwket10t
# 
# Begin bundle
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


--===============1882776233==--