From: marko.makela
Date: February 28 2011 1:40pm
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3340)
List-Archive: http://lists.mysql.com/commits/132115
Message-Id: <201102281340.p1SDZAs0022351@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1463046689=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMjI4MDkwNzIyLTBoc2c2
MDV5dm0yeXBsOWMKCiAzMzQwIE1hcmtvIE3DpGtlbMOkCTIwMTEtMDItMjggW21lcmdlXQogICAg
ICBNZXJnZSBteXNxbC01LjEtaW5ub2RiIHRvIG15c3FsLTUuNS1pbm5vZGIuCgogICAgbW9kaWZp
ZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBzZWEuYwogICAgICBzdG9yYWdlL2lu
bm9iYXNlL2J1Zi9idWYwYnVmLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGxydS5j
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYwYnVmLmgKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBzZWEuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFz
ZS9idHIvYnRyMHNlYS5jCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTAyMjgwOTA3
MjItMGhzZzYwNXl2bTJ5cGw5YworKysgYi9zdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwc2VhLmMJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMjgxMzM5MDctcmF1YmV4Y2JoMzJv
cmdxcQpAQCAtMTIxMyw4ICsxMjEzLDggQEAgYnRyX3NlYXJjaF9kcm9wX3BhZ2VfaGFzaF93aGVu
X2ZyZWVkKAogCWhhdmluZyB0byBmZWFyIGEgZGVhZGxvY2suICovCiAKIAlibG9jayA9IGJ1Zl9w
YWdlX2dldF9nZW4oc3BhY2UsIHppcF9zaXplLCBwYWdlX25vLCBSV19TX0xBVENILCBOVUxMLAot
CQkJCUJVRl9HRVRfSUZfSU5fUE9PTCwgX19GSUxFX18sIF9fTElORV9fLAotCQkJCSZtdHIpOwor
CQkJCSBCVUZfUEVFS19JRl9JTl9QT09MLCBfX0ZJTEVfXywgX19MSU5FX18sCisJCQkJICZtdHIp
OwogCS8qIEJlY2F1c2UgdGhlIGJ1ZmZlciBwb29sIG11dGV4IHdhcyByZWxlYXNlZCBieQogCWJ1
Zl9wYWdlX3BlZWtfaWZfc2VhcmNoX2hhc2hlZCgpLCBpdCBpcyBwb3NzaWJsZSB0aGF0IHRoZQog
CWJsb2NrIHdhcyByZW1vdmVkIGZyb20gdGhlIGJ1ZmZlciBwb29sIGJ5IGFub3RoZXIgdGhyZWFk
Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1Zi5jJwotLS0g
YS9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwYnVmLmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xl
LmNvbS0yMDExMDIyODA5MDcyMi0waHNnNjA1eXZtMnlwbDljCisrKyBiL3N0b3JhZ2UvaW5ub2Jh
c2UvYnVmL2J1ZjBidWYuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIyODEz
MzkwNy1yYXViZXhjYmgzMm9yZ3FxCkBAIC0yNzIyLDcgKzI3MjIsNyBAQCBidWZfcGFnZV9nZXRf
Z2VuKAogCXVsaW50CQlyd19sYXRjaCwvKiE8IGluOiBSV19TX0xBVENILCBSV19YX0xBVENILCBS
V19OT19MQVRDSCAqLwogCWJ1Zl9ibG9ja190KglndWVzcywJLyohPCBpbjogZ3Vlc3NlZCBibG9j
ayBvciBOVUxMICovCiAJdWxpbnQJCW1vZGUsCS8qITwgaW46IEJVRl9HRVQsIEJVRl9HRVRfSUZf
SU5fUE9PTCwKLQkJCQlCVUZfR0VUX05PX0xBVENILCBvcgorCQkJCUJVRl9QRUVLX0lGX0lOX1BP
T0wsIEJVRl9HRVRfTk9fTEFUQ0gsIG9yCiAJCQkJQlVGX0dFVF9JRl9JTl9QT09MX09SX1dBVENI
ICovCiAJY29uc3QgY2hhcioJZmlsZSwJLyohPCBpbjogZmlsZSBuYW1lICovCiAJdWxpbnQJCWxp
bmUsCS8qITwgaW46IGxpbmUgd2hlcmUgY2FsbGVkICovCkBAIC0yNzQxLDExICsyNzQxLDIwIEBA
IGJ1Zl9wYWdlX2dldF9nZW4oCiAJdXRfYWQoKHJ3X2xhdGNoID09IFJXX1NfTEFUQ0gpCiAJICAg
ICAgfHwgKHJ3X2xhdGNoID09IFJXX1hfTEFUQ0gpCiAJICAgICAgfHwgKHJ3X2xhdGNoID09IFJX
X05PX0xBVENIKSk7Ci0JdXRfYWQoKG1vZGUgIT0gQlVGX0dFVF9OT19MQVRDSCkgfHwgKHJ3X2xh
dGNoID09IFJXX05PX0xBVENIKSk7Ci0JdXRfYWQobW9kZSA9PSBCVUZfR0VUCi0JICAgICAgfHwg
bW9kZSA9PSBCVUZfR0VUX0lGX0lOX1BPT0wKLQkgICAgICB8fCBtb2RlID09IEJVRl9HRVRfTk9f
TEFUQ0gKLQkgICAgICB8fCBtb2RlID09IEJVRl9HRVRfSUZfSU5fUE9PTF9PUl9XQVRDSCk7Cisj
aWZkZWYgVU5JVl9ERUJVRworCXN3aXRjaCAobW9kZSkgeworCWNhc2UgQlVGX0dFVF9OT19MQVRD
SDoKKwkJdXRfYWQocndfbGF0Y2ggPT0gUldfTk9fTEFUQ0gpOworCQlicmVhazsKKwljYXNlIEJV
Rl9HRVQ6CisJY2FzZSBCVUZfR0VUX0lGX0lOX1BPT0w6CisJY2FzZSBCVUZfUEVFS19JRl9JTl9Q
T09MOgorCWNhc2UgQlVGX0dFVF9JRl9JTl9QT09MX09SX1dBVENIOgorCQlicmVhazsKKwlkZWZh
dWx0OgorCQl1dF9lcnJvcjsKKwl9CisjZW5kaWYgLyogVU5JVl9ERUJVRyAqLwogCXV0X2FkKHpp
cF9zaXplID09IGZpbF9zcGFjZV9nZXRfemlwX3NpemUoc3BhY2UpKTsKIAl1dF9hZCh1dF9pc18y
cG93KHppcF9zaXplKSk7CiAjaWZuZGVmIFVOSVZfTE9HX0RFQlVHCkBAIC0yODA1LDYgKzI4MTQs
NyBAQCBsb29wMjoKIAkJYnVmX3Bvb2xfbXV0ZXhfZXhpdChidWZfcG9vbCk7CiAKIAkJaWYgKG1v
ZGUgPT0gQlVGX0dFVF9JRl9JTl9QT09MCisJCSAgICB8fCBtb2RlID09IEJVRl9QRUVLX0lGX0lO
X1BPT0wKIAkJICAgIHx8IG1vZGUgPT0gQlVGX0dFVF9JRl9JTl9QT09MX09SX1dBVENIKSB7CiAK
IAkJCXJldHVybihOVUxMKTsKQEAgLTI4NDUsNyArMjg1NSw4IEBAIGdvdF9ibG9jazoKIAogCW11
c3RfcmVhZCA9IGJ1Zl9ibG9ja19nZXRfaW9fZml4KGJsb2NrKSA9PSBCVUZfSU9fUkVBRDsKIAot
CWlmIChtdXN0X3JlYWQgJiYgbW9kZSA9PSBCVUZfR0VUX0lGX0lOX1BPT0wpIHsKKwlpZiAobXVz
dF9yZWFkICYmIChtb2RlID09IEJVRl9HRVRfSUZfSU5fUE9PTAorCQkJICB8fCBtb2RlID09IEJV
Rl9QRUVLX0lGX0lOX1BPT0wpKSB7CiAKIAkJLyogVGhlIHBhZ2UgaXMgYmVpbmcgcmVhZCB0byBi
dWZmZXIgcG9vbCwKIAkJYnV0IHdlIGNhbm5vdCB3YWl0IGFyb3VuZCBmb3IgdGhlIHJlYWQgdG8K
QEAgLTI5NjgsNiArMjk3OSw3IEBAIHdhaXRfdW50aWxfdW5maXhlZDoKIAkJbXV0ZXhfZXhpdCgm
YnVmX3Bvb2wtPnppcF9tdXRleCk7CiAJCWJ1Zl9wb29sLT5uX3BlbmRfdW56aXArKzsKIAorCQli
cGFnZS0+c3RhdGUgPSBCVUZfQkxPQ0tfWklQX0ZSRUU7CiAJCWJ1Zl9idWRkeV9mcmVlKGJ1Zl9w
b29sLCBicGFnZSwgc2l6ZW9mICpicGFnZSk7CiAKIAkJYnVmX3Bvb2xfbXV0ZXhfZXhpdChidWZf
cG9vbCk7CkBAIC0zMDYxLDcgKzMwNzMsOSBAQCB3YWl0X3VudGlsX3VuZml4ZWQ6CiAKIAlidWZf
cG9vbF9tdXRleF9leGl0KGJ1Zl9wb29sKTsKIAotCWJ1Zl9wYWdlX3NldF9hY2Nlc3NlZF9tYWtl
X3lvdW5nKCZibG9jay0+cGFnZSwgYWNjZXNzX3RpbWUpOworCWlmIChVTklWX0xJS0VMWShtb2Rl
ICE9IEJVRl9QRUVLX0lGX0lOX1BPT0wpKSB7CisJCWJ1Zl9wYWdlX3NldF9hY2Nlc3NlZF9tYWtl
X3lvdW5nKCZibG9jay0+cGFnZSwgYWNjZXNzX3RpbWUpOworCX0KIAogI2lmIGRlZmluZWQgVU5J
Vl9ERUJVR19GSUxFX0FDQ0VTU0VTIHx8IGRlZmluZWQgVU5JVl9ERUJVRwogCXV0X2EoIWJsb2Nr
LT5wYWdlLmZpbGVfcGFnZV93YXNfZnJlZWQpOwpAQCAtMzExNCw3ICszMTI4LDcgQEAgd2FpdF91
bnRpbF91bmZpeGVkOgogCiAJbXRyX21lbW9fcHVzaChtdHIsIGJsb2NrLCBmaXhfdHlwZSk7CiAK
LQlpZiAoIWFjY2Vzc190aW1lKSB7CisJaWYgKFVOSVZfTElLRUxZKG1vZGUgIT0gQlVGX1BFRUtf
SUZfSU5fUE9PTCkgJiYgIWFjY2Vzc190aW1lKSB7CiAJCS8qIEluIHRoZSBjYXNlIG9mIGEgZmly
c3QgYWNjZXNzLCB0cnkgdG8gYXBwbHkgbGluZWFyCiAJCXJlYWQtYWhlYWQgKi8KIApAQCAtMzcw
Myw2ICszNzE3LDcgQEAgZXJyX2V4aXQ6CiAKIAkJCQkvKiBUaGUgYmxvY2sgd2FzIGFkZGVkIGJ5
IHNvbWUgb3RoZXIgdGhyZWFkLiAqLwogCQkJCXdhdGNoX3BhZ2UgPSBOVUxMOworCQkJCWJwYWdl
LT5zdGF0ZSA9IEJVRl9CTE9DS19aSVBfRlJFRTsKIAkJCQlidWZfYnVkZHlfZnJlZShidWZfcG9v
bCwgYnBhZ2UsIHNpemVvZiAqYnBhZ2UpOwogCQkJCWJ1Zl9idWRkeV9mcmVlKGJ1Zl9wb29sLCBk
YXRhLCB6aXBfc2l6ZSk7CiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2J1
Zi9idWYwbHJ1LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBscnUuYwlyZXZpZDp2
YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMjI4MDkwNzIyLTBoc2c2MDV5dm0yeXBsOWMKKysr
IGIvc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGxydS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTEwMjI4MTMzOTA3LXJhdWJleGNiaDMyb3JncXEKQEAgLTI0Nyw3NCArMjQ3LDc4
IEBAIGJ1Zl9MUlVfZHJvcF9wYWdlX2hhc2hfZm9yX3RhYmxlc3BhY2UoCiAJCXNpemVvZih1bGlu
dCkgKiBCVUZfTFJVX0RST1BfU0VBUkNIX0hBU0hfU0laRSk7CiAKIAlidWZfcG9vbF9tdXRleF9l
bnRlcihidWZfcG9vbCk7CisJbnVtX2VudHJpZXMgPSAwOwogCiBzY2FuX2FnYWluOgotCW51bV9l
bnRyaWVzID0gMDsKIAlicGFnZSA9IFVUX0xJU1RfR0VUX0xBU1QoYnVmX3Bvb2wtPkxSVSk7CiAK
IAl3aGlsZSAoYnBhZ2UgIT0gTlVMTCkgewotCQltdXRleF90KglibG9ja19tdXRleCA9IGJ1Zl9w
YWdlX2dldF9tdXRleChicGFnZSk7CiAJCWJ1Zl9wYWdlX3QqCXByZXZfYnBhZ2U7CisJCWlib29s
CQlpc19maXhlZDsKIAotCQltdXRleF9lbnRlcihibG9ja19tdXRleCk7CiAJCXByZXZfYnBhZ2Ug
PSBVVF9MSVNUX0dFVF9QUkVWKExSVSwgYnBhZ2UpOwogCiAJCXV0X2EoYnVmX3BhZ2VfaW5fZmls
ZShicGFnZSkpOwogCiAJCWlmIChidWZfcGFnZV9nZXRfc3RhdGUoYnBhZ2UpICE9IEJVRl9CTE9D
S19GSUxFX1BBR0UKIAkJICAgIHx8IGJwYWdlLT5zcGFjZSAhPSBpZAotCQkgICAgfHwgYnBhZ2Ut
PmJ1Zl9maXhfY291bnQgPiAwCiAJCSAgICB8fCBicGFnZS0+aW9fZml4ICE9IEJVRl9JT19OT05F
KSB7Ci0JCQkvKiBXZSBsZWF2ZSB0aGUgZml4ZWQgcGFnZXMgYXMgaXMgaW4gdGhpcyBzY2FuLgot
CQkJVG8gYmUgZGVhbHQgd2l0aCBsYXRlciBpbiB0aGUgZmluYWwgc2Nhbi4gKi8KLQkJCW11dGV4
X2V4aXQoYmxvY2tfbXV0ZXgpOwotCQkJZ290byBuZXh0X3BhZ2U7CisJCQkvKiBDb21wcmVzc2Vk
IHBhZ2VzIGFyZSBuZXZlciBoYXNoZWQuCisJCQlTa2lwIGJsb2NrcyBvZiBvdGhlciB0YWJsZXNw
YWNlcy4KKwkJCVNraXAgSS9PLWZpeGVkIGJsb2NrcyAodG8gYmUgZGVhbHQgd2l0aCBsYXRlciku
ICovCituZXh0X3BhZ2U6CisJCQlicGFnZSA9IHByZXZfYnBhZ2U7CisJCQljb250aW51ZTsKIAkJ
fQogCi0JCWlmICgoKGJ1Zl9ibG9ja190KikgYnBhZ2UpLT5pc19oYXNoZWQpIHsKKwkJbXV0ZXhf
ZW50ZXIoJigoYnVmX2Jsb2NrX3QqKSBicGFnZSktPm11dGV4KTsKKwkJaXNfZml4ZWQgPSBicGFn
ZS0+YnVmX2ZpeF9jb3VudCA+IDAKKwkJCXx8ICEoKGJ1Zl9ibG9ja190KikgYnBhZ2UpLT5pc19o
YXNoZWQ7CisJCW11dGV4X2V4aXQoJigoYnVmX2Jsb2NrX3QqKSBicGFnZSktPm11dGV4KTsKIAot
CQkJLyogU3RvcmUgdGhlIG9mZnNldChpLmUuOiBwYWdlX25vKSBpbiB0aGUgYXJyYXkKLQkJCXNv
IHRoYXQgd2UgY2FuIGRyb3AgaGFzaCBpbmRleCBpbiBhIGJhdGNoCi0JCQlsYXRlci4gKi8KLQkJ
CXBhZ2VfYXJyW251bV9lbnRyaWVzXSA9IGJwYWdlLT5vZmZzZXQ7Ci0JCQltdXRleF9leGl0KGJs
b2NrX211dGV4KTsKLQkJCXV0X2EobnVtX2VudHJpZXMgPCBCVUZfTFJVX0RST1BfU0VBUkNIX0hB
U0hfU0laRSk7Ci0JCQkrK251bV9lbnRyaWVzOworCQlpZiAoaXNfZml4ZWQpIHsKKwkJCWdvdG8g
bmV4dF9wYWdlOworCQl9CiAKLQkJCWlmIChudW1fZW50cmllcyA8IEJVRl9MUlVfRFJPUF9TRUFS
Q0hfSEFTSF9TSVpFKSB7Ci0JCQkJZ290byBuZXh0X3BhZ2U7Ci0JCQl9CisJCS8qIFN0b3JlIHRo
ZSBwYWdlIG51bWJlciBzbyB0aGF0IHdlIGNhbiBkcm9wIHRoZSBoYXNoCisJCWluZGV4IGluIGEg
YmF0Y2ggbGF0ZXIuICovCisJCXBhZ2VfYXJyW251bV9lbnRyaWVzXSA9IGJwYWdlLT5vZmZzZXQ7
CisJCXV0X2EobnVtX2VudHJpZXMgPCBCVUZfTFJVX0RST1BfU0VBUkNIX0hBU0hfU0laRSk7CisJ
CSsrbnVtX2VudHJpZXM7CiAKLQkJCS8qIEFycmF5IGZ1bGwuIFdlIHJlbGVhc2UgdGhlIGJ1Zl9w
b29sLT5tdXRleCB0bwotCQkJb2JleSB0aGUgbGF0Y2hpbmcgb3JkZXIuICovCi0JCQlidWZfcG9v
bF9tdXRleF9leGl0KGJ1Zl9wb29sKTsKKwkJaWYgKG51bV9lbnRyaWVzIDwgQlVGX0xSVV9EUk9Q
X1NFQVJDSF9IQVNIX1NJWkUpIHsKKwkJCWdvdG8gbmV4dF9wYWdlOworCQl9CiAKLQkJCWJ1Zl9M
UlVfZHJvcF9wYWdlX2hhc2hfYmF0Y2goCi0JCQkJaWQsIHppcF9zaXplLCBwYWdlX2FyciwgbnVt
X2VudHJpZXMpOworCQkvKiBBcnJheSBmdWxsLiBXZSByZWxlYXNlIHRoZSBidWZfcG9vbC0+bXV0
ZXggdG8gb2JleQorCQl0aGUgbGF0Y2hpbmcgb3JkZXIuICovCisJCWJ1Zl9wb29sX211dGV4X2V4
aXQoYnVmX3Bvb2wpOwogCi0JCQludW1fZW50cmllcyA9IDA7CisJCWJ1Zl9MUlVfZHJvcF9wYWdl
X2hhc2hfYmF0Y2goCisJCQlpZCwgemlwX3NpemUsIHBhZ2VfYXJyLCBudW1fZW50cmllcyk7CiAK
LQkJCWJ1Zl9wb29sX211dGV4X2VudGVyKGJ1Zl9wb29sKTsKLQkJfSBlbHNlIHsKLQkJCW11dGV4
X2V4aXQoYmxvY2tfbXV0ZXgpOwotCQl9CisJCW51bV9lbnRyaWVzID0gMDsKIAotbmV4dF9wYWdl
OgotCQkvKiBOb3RlIHRoYXQgd2UgbWF5IGhhdmUgcmVsZWFzZWQgdGhlIGJ1Zl9wb29sIG11dGV4
Ci0JCWFib3ZlIGFmdGVyIHJlYWRpbmcgdGhlIHByZXZfYnBhZ2UgZHVyaW5nIHByb2Nlc3NpbmcK
LQkJb2YgYSBwYWdlX2hhc2hfYmF0Y2ggKGkuZS46IHdoZW4gdGhlIGFycmF5IHdhcyBmdWxsKS4K
LQkJVGhpcyBtZWFucyB0aGF0IHByZXZfYnBhZ2UgY2FuIGNoYW5nZSBpbiBMUlUgbGlzdC4KLQkJ
VGhpcyBpcyBPSyBiZWNhdXNlIHRoaXMgZnVuY3Rpb24gaXMgYSAnYmVzdCBlZmZvcnQnCi0JCXRv
IGRyb3AgYXMgbWFueSBzZWFyY2ggaGFzaCBlbnRyaWVzIGFzIHBvc3NpYmxlIGFuZAotCQlpdCBk
b2VzIG5vdCBndWFyYW50ZWUgdGhhdCBBTEwgc3VjaCBlbnRyaWVzIHdpbGwgYmUKLQkJZHJvcHBl
ZC4gKi8KLQkJYnBhZ2UgPSBwcmV2X2JwYWdlOworCQlidWZfcG9vbF9tdXRleF9lbnRlcihidWZf
cG9vbCk7CisKKwkJLyogTm90ZSB0aGF0IHdlIHJlbGVhc2VkIHRoZSBidWZfcG9vbCBtdXRleCBh
Ym92ZQorCQlhZnRlciByZWFkaW5nIHRoZSBwcmV2X2JwYWdlIGR1cmluZyBwcm9jZXNzaW5nIG9m
IGEKKwkJcGFnZV9oYXNoX2JhdGNoIChpLmUuOiB3aGVuIHRoZSBhcnJheSB3YXMgZnVsbCkuCisJ
CUJlY2F1c2UgcHJldl9icGFnZSBjb3VsZCBiZWxvbmcgdG8gYSBjb21wcmVzc2VkLW9ubHkKKwkJ
YmxvY2ssIGl0IG1heSBoYXZlIGJlZW4gcmVsb2NhdGVkLCBhbmQgdGh1cyB0aGUKKwkJcG9pbnRl
ciBjYW5ub3QgYmUgdHJ1c3RlZC4gQmVjYXVzZSBicGFnZSBpcyBvZiB0eXBlCisJCWJ1Zl9ibG9j
a190LCBpdCBpcyBzYWZlIHRvIGRlcmVmZXJlbmNlLgorCisJCWJwYWdlIGNhbiBjaGFuZ2UgaW4g
dGhlIExSVSBsaXN0LiBUaGlzIGlzIE9LIGJlY2F1c2UKKwkJdGhpcyBmdW5jdGlvbiBpcyBhICdi
ZXN0IGVmZm9ydCcgdG8gZHJvcCBhcyBtYW55CisJCXNlYXJjaCBoYXNoIGVudHJpZXMgYXMgcG9z
c2libGUgYW5kIGl0IGRvZXMgbm90CisJCWd1YXJhbnRlZSB0aGF0IEFMTCBzdWNoIGVudHJpZXMg
d2lsbCBiZSBkcm9wcGVkLiAqLwogCiAJCS8qIElmLCBob3dldmVyLCBicGFnZSBoYXMgYmVlbiBy
ZW1vdmVkIGZyb20gTFJVIGxpc3QKIAkJdG8gdGhlIGZyZWUgbGlzdCB0aGVuIHdlIHNob3VsZCBy
ZXN0YXJ0IHRoZSBzY2FuLgogCQlicGFnZS0+c3RhdGUgaXMgcHJvdGVjdGVkIGJ5IGJ1Zl9wb29s
IG11dGV4LiAqLwotCQlpZiAoYnBhZ2UgJiYgIWJ1Zl9wYWdlX2luX2ZpbGUoYnBhZ2UpKSB7Ci0J
CQl1dF9hKG51bV9lbnRyaWVzID09IDApOworCQlpZiAoYnBhZ2UKKwkJICAgICYmIGJ1Zl9wYWdl
X2dldF9zdGF0ZShicGFnZSkgIT0gQlVGX0JMT0NLX0ZJTEVfUEFHRSkgewogCQkJZ290byBzY2Fu
X2FnYWluOwogCQl9CiAJfQpAQCAtMTg4OSw2ICsxODkzLDcgQEAgYnVmX0xSVV9ibG9ja19yZW1v
dmVfaGFzaGVkX3BhZ2UoCiAJCQlidWZfcG9vbCwgYnBhZ2UtPnppcC5kYXRhLAogCQkJcGFnZV96
aXBfZ2V0X3NpemUoJmJwYWdlLT56aXApKTsKIAorCQlicGFnZS0+c3RhdGUgPSBCVUZfQkxPQ0tf
WklQX0ZSRUU7CiAJCWJ1Zl9idWRkeV9mcmVlKGJ1Zl9wb29sLCBicGFnZSwgc2l6ZW9mKCpicGFn
ZSkpOwogCQlidWZfcG9vbF9tdXRleF9leGl0X2FsbG93KGJ1Zl9wb29sKTsKIAoKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYwYnVmLmgnCi0tLSBhL3N0b3Jh
Z2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYwYnVmLmgJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNv
bS0yMDExMDIyODA5MDcyMi0waHNnNjA1eXZtMnlwbDljCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9idWYwYnVmLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMjgx
MzM5MDctcmF1YmV4Y2JoMzJvcmdxcQpAQCAtNDEsNiArNDEsOCBAQCBDcmVhdGVkIDExLzUvMTk5
NSBIZWlra2kgVHV1cmkKIC8qIEB7ICovCiAjZGVmaW5lIEJVRl9HRVQJCQkxMAkvKiE8IGdldCBh
bHdheXMgKi8KICNkZWZpbmUJQlVGX0dFVF9JRl9JTl9QT09MCTExCS8qITwgZ2V0IGlmIGluIHBv
b2wgKi8KKyNkZWZpbmUgQlVGX1BFRUtfSUZfSU5fUE9PTAkxMgkvKiE8IGdldCBpZiBpbiBwb29s
LCBkbyBub3QgbWFrZQorCQkJCQl0aGUgYmxvY2sgeW91bmcgaW4gdGhlIExSVSBsaXN0ICovCiAj
ZGVmaW5lIEJVRl9HRVRfTk9fTEFUQ0gJMTQJLyohPCBnZXQgYW5kIGJ1ZmZlcmZpeCwgYnV0CiAJ
CQkJCXNldCBubyBsYXRjaDsgd2UgaGF2ZQogCQkJCQlzZXBhcmF0ZWQgdGhpcyBjYXNlLCBiZWNh
dXNlCkBAIC0zOTYsNyArMzk4LDcgQEAgYnVmX3BhZ2VfZ2V0X2dlbigKIAl1bGludAkJcndfbGF0
Y2gsLyohPCBpbjogUldfU19MQVRDSCwgUldfWF9MQVRDSCwgUldfTk9fTEFUQ0ggKi8KIAlidWZf
YmxvY2tfdCoJZ3Vlc3MsCS8qITwgaW46IGd1ZXNzZWQgYmxvY2sgb3IgTlVMTCAqLwogCXVsaW50
CQltb2RlLAkvKiE8IGluOiBCVUZfR0VULCBCVUZfR0VUX0lGX0lOX1BPT0wsCi0JCQkJQlVGX0dF
VF9OT19MQVRDSCBvcgorCQkJCUJVRl9QRUVLX0lGX0lOX1BPT0wsIEJVRl9HRVRfTk9fTEFUQ0gg
b3IKIAkJCQlCVUZfR0VUX0lGX0lOX1BPT0xfT1JfV0FUQ0ggKi8KIAljb25zdCBjaGFyKglmaWxl
LAkvKiE8IGluOiBmaWxlIG5hbWUgKi8KIAl1bGludAkJbGluZSwJLyohPCBpbjogbGluZSB3aGVy
ZSBjYWxsZWQgKi8KCg==

--===============1463046689==
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: 85e87d6aed4b863e96f8e8dc0ed43eea5f343ce0
# timestamp: 2011-02-28 15:40:43 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   0hsg605yvm2ypl9c
# 
# Begin bundle
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


--===============1463046689==--