From: marko.makela
Date: January 31 2011 9:29am
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3299 to 3300)
List-Archive: http://lists.mysql.com/commits/130017
Message-Id: <201101310929.p0V8sQBe031811@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1634803926=="

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

IDMzMDAgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0zMSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuMS1pbm5vZGIgdG8gbXlzcWwtNS41LWlubm9kYi4KCiAgICBtb2RpZmllZDoKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS9yb3cwdXBkLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHB1cmdlLmMKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVtb2QuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jv
dy9yb3cwdXBkLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJvbGwuYwogMzI5OSBW
YXNpbCBEaW1vdgkyMDExLTAxLTMwIFttZXJnZV0KICAgICAgTWVyZ2UgbXlzcWwtNS4xLWlubm9k
YiAtPiBteXNxbC01LjUtaW5ub2RiIChlbXB0eSkKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl
L2lubm9iYXNlL2J0ci9idHIwY3VyLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBj
dXIuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMTMwMTcxNzMxLTM4YmIzejV6
bndrZXQxMHQKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTMxMDgyMzM4LTJ3eGNieHdlYTAxd293dXYKQEAgLTE4
ODYsOCArMTg4Niw4IEBAIGJ0cl9jdXJfdXBkYXRlX2luX3BsYWNlKAogCQlOT1QgY2FsbCBpdCBp
ZiBpbmRleCBpcyBzZWNvbmRhcnkgKi8KIAogCQlpZiAoIWRpY3RfaW5kZXhfaXNfY2x1c3QoaW5k
ZXgpCi0JCSAgICB8fCByb3dfdXBkX2NoYW5nZXNfb3JkX2ZpZWxkX2JpbmFyeShOVUxMLCBOVUxM
LAotCQkJCQkJCWluZGV4LCB1cGRhdGUpKSB7CisJCSAgICB8fCByb3dfdXBkX2NoYW5nZXNfb3Jk
X2ZpZWxkX2JpbmFyeShpbmRleCwgdXBkYXRlLCB0aHIsCisJCQkJCQkJTlVMTCwgTlVMTCkpIHsK
IAogCQkJLyogUmVtb3ZlIHBvc3NpYmxlIGhhc2ggaW5kZXggcG9pbnRlciB0byB0aGlzIHJlY29y
ZCAqLwogCQkJYnRyX3NlYXJjaF91cGRhdGVfaGFzaF9vbl9kZWxldGUoY3Vyc29yKTsKCj09PSBt
b2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MHVwZC5oJwotLS0gYS9z
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MHVwZC5oCXJldmlkOnZhc2lsLmRpbW92QG9yYWNs
ZS5jb20tMjAxMTAxMzAxNzE3MzEtMzhiYjN6NXpud2tldDEwdAorKysgYi9zdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvcm93MHVwZC5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEw
MTMxMDgyMzM4LTJ3eGNieHdlYTAxd293dXYKQEAgLTI4MCwxOSArMjgwLDI5IEBAIE5PVEU6IHdl
IGNvbXBhcmUgdGhlIGZpZWxkcyBhcyBiaW5hcnkgc3QKIEByZXR1cm4gVFJVRSBpZiB1cGRhdGUg
dmVjdG9yIGNoYW5nZXMgYW4gb3JkZXJpbmcgZmllbGQgaW4gdGhlIGluZGV4IHJlY29yZCAqLwog
VU5JVl9JTlRFUk4KIGlib29sCi1yb3dfdXBkX2NoYW5nZXNfb3JkX2ZpZWxkX2JpbmFyeSgKLS8q
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0qLworcm93X3VwZF9jaGFuZ2VzX29yZF9maWVs
ZF9iaW5hcnlfZnVuYygKKy8qPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSovCisJ
ZGljdF9pbmRleF90KglpbmRleCwJLyohPCBpbjogaW5kZXggb2YgdGhlIHJlY29yZCAqLworCWNv
bnN0IHVwZF90Kgl1cGRhdGUsCS8qITwgaW46IHVwZGF0ZSB2ZWN0b3IgZm9yIHRoZSByb3c7IE5P
VEU6IHRoZQorCQkJCWZpZWxkIG51bWJlcnMgaW4gdGhpcyBNVVNUIGJlIGNsdXN0ZXJlZCBpbmRl
eAorCQkJCXBvc2l0aW9ucyEgKi8KKyNpZmRlZiBVTklWX0RFQlVHCisJY29uc3QgcXVlX3Rocl90
KnRociwJLyohPCBpbjogcXVlcnkgdGhyZWFkICovCisjZW5kaWYgLyogVU5JVl9ERUJVRyAqLwog
CWNvbnN0IGR0dXBsZV90Kglyb3csCS8qITwgaW46IG9sZCB2YWx1ZSBvZiByb3csIG9yIE5VTEwg
aWYgdGhlCiAJCQkJcm93IGFuZCB0aGUgZGF0YSB2YWx1ZXMgaW4gdXBkYXRlIGFyZSBub3QKIAkJ
CQlrbm93biB3aGVuIHRoaXMgZnVuY3Rpb24gaXMgY2FsbGVkLCBlLmcuLCBhdAogCQkJCWNvbXBp
bGUgdGltZSAqLwotCWNvbnN0IHJvd19leHRfdCpleHQsCS8qITwgTlVMTCwgb3IgcHJlZml4ZXMg
b2YgdGhlIGV4dGVybmFsbHkKKwljb25zdCByb3dfZXh0X3QqZXh0KQkvKiE8IE5VTEwsIG9yIHBy
ZWZpeGVzIG9mIHRoZSBleHRlcm5hbGx5CiAJCQkJc3RvcmVkIGNvbHVtbnMgaW4gdGhlIG9sZCBy
b3cgKi8KLQlkaWN0X2luZGV4X3QqCWluZGV4LAkvKiE8IGluOiBpbmRleCBvZiB0aGUgcmVjb3Jk
ICovCi0JY29uc3QgdXBkX3QqCXVwZGF0ZSkJLyohPCBpbjogdXBkYXRlIHZlY3RvciBmb3IgdGhl
IHJvdzsgTk9URTogdGhlCi0JCQkJZmllbGQgbnVtYmVycyBpbiB0aGlzIE1VU1QgYmUgY2x1c3Rl
cmVkIGluZGV4Ci0JCQkJcG9zaXRpb25zISAqLwotCV9fYXR0cmlidXRlX18oKG5vbm51bGwoMyw0
KSwgd2Fybl91bnVzZWRfcmVzdWx0KSk7CisJX19hdHRyaWJ1dGVfXygobm9ubnVsbCgxLDIpLCB3
YXJuX3VudXNlZF9yZXN1bHQpKTsKKyNpZmRlZiBVTklWX0RFQlVHCisjIGRlZmluZSByb3dfdXBk
X2NoYW5nZXNfb3JkX2ZpZWxkX2JpbmFyeShpbmRleCx1cGRhdGUsdGhyLHJvdyxleHQpCVwKKwly
b3dfdXBkX2NoYW5nZXNfb3JkX2ZpZWxkX2JpbmFyeV9mdW5jKGluZGV4LHVwZGF0ZSx0aHIscm93
LGV4dCkKKyNlbHNlIC8qIFVOSVZfREVCVUcgKi8KKyMgZGVmaW5lIHJvd191cGRfY2hhbmdlc19v
cmRfZmllbGRfYmluYXJ5KGluZGV4LHVwZGF0ZSx0aHIscm93LGV4dCkJXAorCXJvd191cGRfY2hh
bmdlc19vcmRfZmllbGRfYmluYXJ5X2Z1bmMoaW5kZXgsdXBkYXRlLHJvdyxleHQpCisjZW5kaWYg
LyogVU5JVl9ERUJVRyAqLwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqLy8qKgogQ2hlY2tzIGlmIGFuIHVwZGF0ZSB2ZWN0b3IgY2hh
bmdlcyBhbiBvcmRlcmluZyBmaWVsZCBvZiBhbiBpbmRleCByZWNvcmQuCiBUaGlzIGZ1bmN0aW9u
IGlzIGZhc3QgaWYgdGhlIHVwZGF0ZSB2ZWN0b3IgaXMgc2hvcnQgb3IgdGhlIG51bWJlciBvZiBv
cmRlcmluZwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBwdXJn
ZS5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcHVyZ2UuYwlyZXZpZDp2YXNpbC5k
aW1vdkBvcmFjbGUuY29tLTIwMTEwMTMwMTcxNzMxLTM4YmIzejV6bndrZXQxMHQKKysrIGIvc3Rv
cmFnZS9pbm5vYmFzZS9yb3cvcm93MHB1cmdlLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMTAxMzEwODIzMzgtMnd4Y2J4d2VhMDF3b3d1dgpAQCAtNDg5LDggKzQ4OSwxMSBAQCBQ
dXJnZXMgYW4gdXBkYXRlIG9mIGFuIGV4aXN0aW5nIHJlY29yZC4KIG1hcmtlZCByZWNvcmQgaWYg
dGhhdCByZWNvcmQgY29udGFpbmVkIGFuIGV4dGVybmFsbHkgc3RvcmVkIGZpZWxkLiAqLwogc3Rh
dGljCiB2b2lkCi1yb3dfcHVyZ2VfdXBkX2V4aXN0X29yX2V4dGVybigKLS8qPT09PT09PT09PT09
PT09PT09PT09PT09PT0qLworcm93X3B1cmdlX3VwZF9leGlzdF9vcl9leHRlcm5fZnVuYygKKy8q
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSovCisjaWZkZWYgVU5JVl9ERUJVRworCWNv
bnN0IHF1ZV90aHJfdCp0aHIsCS8qITwgaW46IHF1ZXJ5IHRocmVhZCAqLworI2VuZGlmIC8qIFVO
SVZfREVCVUcgKi8KIAlwdXJnZV9ub2RlX3QqCW5vZGUpCS8qITwgaW46IHJvdyBwdXJnZSBub2Rl
ICovCiB7CiAJbWVtX2hlYXBfdCoJaGVhcDsKQEAgLTUxNSw4ICs1MTgsOCBAQCByb3dfcHVyZ2Vf
dXBkX2V4aXN0X29yX2V4dGVybigKIAl3aGlsZSAobm9kZS0+aW5kZXggIT0gTlVMTCkgewogCQlp
bmRleCA9IG5vZGUtPmluZGV4OwogCi0JCWlmIChyb3dfdXBkX2NoYW5nZXNfb3JkX2ZpZWxkX2Jp
bmFyeShOVUxMLCBOVUxMLCBub2RlLT5pbmRleCwKLQkJCQkJCSAgICAgbm9kZS0+dXBkYXRlKSkg
eworCQlpZiAocm93X3VwZF9jaGFuZ2VzX29yZF9maWVsZF9iaW5hcnkobm9kZS0+aW5kZXgsIG5v
ZGUtPnVwZGF0ZSwKKwkJCQkJCSAgICAgdGhyLCBOVUxMLCBOVUxMKSkgewogCQkJLyogQnVpbGQg
dGhlIG9sZGVyIHZlcnNpb24gb2YgdGhlIGluZGV4IGVudHJ5ICovCiAJCQllbnRyeSA9IHJvd19i
dWlsZF9pbmRleF9lbnRyeShub2RlLT5yb3csIE5VTEwsCiAJCQkJCQkgICAgICBpbmRleCwgaGVh
cCk7CkBAIC01OTgsNiArNjAxLDE0IEBAIHNraXBfc2Vjb25kYXJpZXM6CiAJfQogfQogCisjaWZk
ZWYgVU5JVl9ERUJVRworIyBkZWZpbmUgcm93X3B1cmdlX3VwZF9leGlzdF9vcl9leHRlcm4odGhy
LG5vZGUpCVwKKwlyb3dfcHVyZ2VfdXBkX2V4aXN0X29yX2V4dGVybl9mdW5jKHRocixub2RlKQor
I2Vsc2UgLyogVU5JVl9ERUJVRyAqLworIyBkZWZpbmUgcm93X3B1cmdlX3VwZF9leGlzdF9vcl9l
eHRlcm4odGhyLG5vZGUpCVwKKwlyb3dfcHVyZ2VfdXBkX2V4aXN0X29yX2V4dGVybl9mdW5jKG5v
ZGUpCisjZW5kaWYgLyogVU5JVl9ERUJVRyAqLworCiAvKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBQYXJzZXMgdGhlIHJvdyBy
ZWZlcmVuY2UgYW5kIG90aGVyIGluZm8gaW4gYSBtb2RpZnkgdW5kbyBsb2cgcmVjb3JkLgogQHJl
dHVybiBUUlVFIGlmIHB1cmdlIG9wZXJhdGlvbiByZXF1aXJlZDogTk9URSB0aGF0IHRoZW4gdGhl
IENBTExFUgpAQCAtNzU2LDcgKzc2Nyw3IEBAIHJvd19wdXJnZSgKIAkJfSBlbHNlIGlmICh1cGRh
dGVkX2V4dGVybgogCQkJICAgfHwgbm9kZS0+cmVjX3R5cGUgPT0gVFJYX1VORE9fVVBEX0VYSVNU
X1JFQykgewogCi0JCQlyb3dfcHVyZ2VfdXBkX2V4aXN0X29yX2V4dGVybihub2RlKTsKKwkJCXJv
d19wdXJnZV91cGRfZXhpc3Rfb3JfZXh0ZXJuKHRociwgbm9kZSk7CiAJCX0KIAogCQlpZiAobm9k
ZS0+Zm91bmRfY2x1c3QpIHsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jv
dy9yb3cwdW1vZC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdW1vZC5jCXJldmlk
OnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTAxMzAxNzE3MzEtMzhiYjN6NXpud2tldDEwdAor
KysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdW1vZC5jCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTEwMTMxMDgyMzM4LTJ3eGNieHdlYTAxd293dXYKQEAgLTY5Myw4ICs2OTMs
OSBAQCByb3dfdW5kb19tb2RfdXBkX2V4aXN0X3NlYygKIAl3aGlsZSAobm9kZS0+aW5kZXggIT0g
TlVMTCkgewogCQlpbmRleCA9IG5vZGUtPmluZGV4OwogCi0JCWlmIChyb3dfdXBkX2NoYW5nZXNf
b3JkX2ZpZWxkX2JpbmFyeSgKLQkJCSAgICBub2RlLT5yb3csIG5vZGUtPmV4dCwgbm9kZS0+aW5k
ZXgsIG5vZGUtPnVwZGF0ZSkpIHsKKwkJaWYgKHJvd191cGRfY2hhbmdlc19vcmRfZmllbGRfYmlu
YXJ5KG5vZGUtPmluZGV4LCBub2RlLT51cGRhdGUsCisJCQkJCQkgICAgIHRociwKKwkJCQkJCSAg
ICAgbm9kZS0+cm93LCBub2RlLT5leHQpKSB7CiAKIAkJCS8qIEJ1aWxkIHRoZSBuZXdlc3QgdmVy
c2lvbiBvZiB0aGUgaW5kZXggZW50cnkgKi8KIAkJCWVudHJ5ID0gcm93X2J1aWxkX2luZGV4X2Vu
dHJ5KG5vZGUtPnJvdywgbm9kZS0+ZXh0LAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5u
b2Jhc2Uvcm93L3JvdzB1cGQuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVwZC5j
CXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTAxMzAxNzE3MzEtMzhiYjN6NXpud2tl
dDEwdAorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdXBkLmMJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMTAxMzEwODIzMzgtMnd4Y2J4d2VhMDF3b3d1dgpAQCAtMTE5Miwy
NSArMTE5MiwzMSBAQCBOT1RFOiB3ZSBjb21wYXJlIHRoZSBmaWVsZHMgYXMgYmluYXJ5IHN0CiBA
cmV0dXJuIFRSVUUgaWYgdXBkYXRlIHZlY3RvciBjaGFuZ2VzIGFuIG9yZGVyaW5nIGZpZWxkIGlu
IHRoZSBpbmRleCByZWNvcmQgKi8KIFVOSVZfSU5URVJOCiBpYm9vbAotcm93X3VwZF9jaGFuZ2Vz
X29yZF9maWVsZF9iaW5hcnkoCi0vKj09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KK3Jv
d191cGRfY2hhbmdlc19vcmRfZmllbGRfYmluYXJ5X2Z1bmMoCisvKj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0qLworCWRpY3RfaW5kZXhfdCoJaW5kZXgsCS8qITwgaW46IGluZGV4
IG9mIHRoZSByZWNvcmQgKi8KKwljb25zdCB1cGRfdCoJdXBkYXRlLAkvKiE8IGluOiB1cGRhdGUg
dmVjdG9yIGZvciB0aGUgcm93OyBOT1RFOiB0aGUKKwkJCQlmaWVsZCBudW1iZXJzIGluIHRoaXMg
TVVTVCBiZSBjbHVzdGVyZWQgaW5kZXgKKwkJCQlwb3NpdGlvbnMhICovCisjaWZkZWYgVU5JVl9E
RUJVRworCWNvbnN0IHF1ZV90aHJfdCp0aHIsCS8qITwgaW46IHF1ZXJ5IHRocmVhZCAqLworI2Vu
ZGlmIC8qIFVOSVZfREVCVUcgKi8KIAljb25zdCBkdHVwbGVfdCoJcm93LAkvKiE8IGluOiBvbGQg
dmFsdWUgb2Ygcm93LCBvciBOVUxMIGlmIHRoZQogCQkJCXJvdyBhbmQgdGhlIGRhdGEgdmFsdWVz
IGluIHVwZGF0ZSBhcmUgbm90CiAJCQkJa25vd24gd2hlbiB0aGlzIGZ1bmN0aW9uIGlzIGNhbGxl
ZCwgZS5nLiwgYXQKIAkJCQljb21waWxlIHRpbWUgKi8KLQljb25zdCByb3dfZXh0X3QqZXh0LAkv
KiE8IE5VTEwsIG9yIHByZWZpeGVzIG9mIHRoZSBleHRlcm5hbGx5CisJY29uc3Qgcm93X2V4dF90
KmV4dCkJLyohPCBOVUxMLCBvciBwcmVmaXhlcyBvZiB0aGUgZXh0ZXJuYWxseQogCQkJCXN0b3Jl
ZCBjb2x1bW5zIGluIHRoZSBvbGQgcm93ICovCi0JZGljdF9pbmRleF90KglpbmRleCwJLyohPCBp
bjogaW5kZXggb2YgdGhlIHJlY29yZCAqLwotCWNvbnN0IHVwZF90Kgl1cGRhdGUpCS8qITwgaW46
IHVwZGF0ZSB2ZWN0b3IgZm9yIHRoZSByb3c7IE5PVEU6IHRoZQotCQkJCWZpZWxkIG51bWJlcnMg
aW4gdGhpcyBNVVNUIGJlIGNsdXN0ZXJlZCBpbmRleAotCQkJCXBvc2l0aW9ucyEgKi8KIHsKIAl1
bGludAkJCW5fdW5pcXVlOwogCXVsaW50CQkJaTsKIAljb25zdCBkaWN0X2luZGV4X3QqCWNsdXN0
X2luZGV4OwogCi0JdXRfYWQodXBkYXRlKTsKIAl1dF9hZChpbmRleCk7CisJdXRfYWQodXBkYXRl
KTsKKwl1dF9hZCh0aHIpOworCXV0X2FkKHRoci0+Z3JhcGgpOworCXV0X2FkKHRoci0+Z3JhcGgt
PnRyeCk7CiAKIAluX3VuaXF1ZSA9IGRpY3RfaW5kZXhfZ2V0X25fdW5pcXVlKGluZGV4KTsKIApA
QCAtMTI2Myw5ICsxMjY5LDE0IEBAIHJvd191cGRfY2hhbmdlc19vcmRfZmllbGRfYmluYXJ5KAog
CiAJCQlpZiAoVU5JVl9MSUtFTFlfTlVMTChidWYpKSB7CiAJCQkJaWYgKFVOSVZfVU5MSUtFTFko
YnVmID09IGZpZWxkX3JlZl96ZXJvKSkgewotCQkJCQkvKiBUaGlzIHNob3VsZCBuZXZlciBoYXBw
ZW4sIGJ1dAotCQkJCQl3ZSB0cnkgdG8gZmFpbCBzYWZlIGhlcmUuICovCi0JCQkJCXV0X2FkKDAp
OworCQkJCQkvKiBUaGUgZXh0ZXJuYWxseSBzdG9yZWQgZmllbGQKKwkJCQkJd2FzIG5vdCB3cml0
dGVuIHlldC4gVGhpcworCQkJCQlyZWNvcmQgc2hvdWxkIG9ubHkgYmUgc2VlbiBieQorCQkJCQly
ZWN2X3JlY292ZXJ5X3JvbGxiYWNrX2FjdGl2ZSgpLAorCQkJCQl3aGVuIHRoZSBzZXJ2ZXIgaGFk
IGNyYXNoZWQgYmVmb3JlCisJCQkJCXN0b3JpbmcgdGhlIGZpZWxkLiAqLworCQkJCQl1dF9hZCh0
aHItPmdyYXBoLT50cngtPmlzX3JlY292ZXJlZCk7CisJCQkJCXV0X2FkKHRyeF9pc19yZWN2KHRo
ci0+Z3JhcGgtPnRyeCkpOwogCQkJCQlyZXR1cm4oVFJVRSk7CiAJCQkJfQogCkBAIC0xNjQwLDgg
KzE2NTEsOCBAQCByb3dfdXBkX3NlY19zdGVwKAogCXV0X2FkKCFkaWN0X2luZGV4X2lzX2NsdXN0
KG5vZGUtPmluZGV4KSk7CiAKIAlpZiAobm9kZS0+c3RhdGUgPT0gVVBEX05PREVfVVBEQVRFX0FM
TF9TRUMKLQkgICAgfHwgcm93X3VwZF9jaGFuZ2VzX29yZF9maWVsZF9iaW5hcnkobm9kZS0+cm93
LCBub2RlLT5leHQsCi0JCQkJCQlub2RlLT5pbmRleCwgbm9kZS0+dXBkYXRlKSkgeworCSAgICB8
fCByb3dfdXBkX2NoYW5nZXNfb3JkX2ZpZWxkX2JpbmFyeShub2RlLT5pbmRleCwgbm9kZS0+dXBk
YXRlLAorCQkJCQkJdGhyLCBub2RlLT5yb3csIG5vZGUtPmV4dCkpIHsKIAkJcmV0dXJuKHJvd191
cGRfc2VjX2luZGV4X2VudHJ5KG5vZGUsIHRocikpOwogCX0KIApAQCAtMjE2OSw4ICsyMTgwLDgg
QEAgZXhpdF9mdW5jOgogCiAJcm93X3VwZF9zdG9yZV9yb3cobm9kZSk7CiAKLQlpZiAocm93X3Vw
ZF9jaGFuZ2VzX29yZF9maWVsZF9iaW5hcnkobm9kZS0+cm93LCBub2RlLT5leHQsIGluZGV4LAot
CQkJCQkgICAgIG5vZGUtPnVwZGF0ZSkpIHsKKwlpZiAocm93X3VwZF9jaGFuZ2VzX29yZF9maWVs
ZF9iaW5hcnkoaW5kZXgsIG5vZGUtPnVwZGF0ZSwgdGhyLAorCQkJCQkgICAgIG5vZGUtPnJvdywg
bm9kZS0+ZXh0KSkgewogCiAJCS8qIFVwZGF0ZSBjYXVzZXMgYW4gb3JkZXJpbmcgZmllbGQgKG9y
ZGVyaW5nIGZpZWxkcyB3aXRoaW4KIAkJdGhlIEItdHJlZSkgb2YgdGhlIGNsdXN0ZXJlZCBpbmRl
eCByZWNvcmQgdG8gY2hhbmdlOiBwZXJmb3JtCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9p
bm5vYmFzZS90cngvdHJ4MHJvbGwuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJv
bGwuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMTMwMTcxNzMxLTM4YmIzejV6
bndrZXQxMHQKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJvbGwuYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEzMTA4MjMzOC0yd3hjYnh3ZWEwMXdvd3V2CkBAIC00
Nyw4ICs0Nyw4IEBAIENyZWF0ZWQgMy8yNi8xOTk2IEhlaWtraSBUdXVyaQogcm9sbGJhY2sgKi8K
ICNkZWZpbmUgVFJYX1JPTExfVFJVTkNfVEhSRVNIT0xECTEKIAotLyoqIEluIGNyYXNoIHJlY292
ZXJ5LCB0aGUgY3VycmVudCB0cnggdG8gYmUgcm9sbGVkIGJhY2sgKi8KLXN0YXRpYyB0cnhfdCoJ
CXRyeF9yb2xsX2NyYXNoX3JlY3ZfdHJ4CT0gTlVMTDsKKy8qKiBJbiBjcmFzaCByZWNvdmVyeSwg
dGhlIGN1cnJlbnQgdHJ4IHRvIGJlIHJvbGxlZCBiYWNrOyBOVUxMIG90aGVyd2lzZSAqLworc3Rh
dGljIGNvbnN0IHRyeF90Kgl0cnhfcm9sbF9jcmFzaF9yZWN2X3RyeAk9IE5VTEw7CiAKIC8qKiBJ
biBjcmFzaCByZWNvdmVyeSB3ZSBzZXQgdGhpcyB0byB0aGUgdW5kbyBuOm8gb2YgdGhlIGN1cnJl
bnQgdHJ4IHRvIGJlCiByb2xsZWQgYmFjay4gVGhlbiB3ZSBjYW4gcHJpbnQgaG93IG1hbnkgJSB0
aGUgcm9sbGJhY2sgaGFzIHByb2dyZXNzZWQuICovCgo=

--===============1634803926==
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 11:29:32 +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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


--===============1634803926==--