From: marko.makela
Date: February 28 2011 11:51am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3715) Bug#58549
List-Archive: http://lists.mysql.com/commits/132106
X-Bug: 58549
Message-Id: <201102281152.p1SArgWX011791@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0993897782=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMjI1MDk1MDE4LWpnbXYx
cG51cHJyanphdDEKCiAzNzE1IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDItMjgKICAgICAgQnVnICM1
ODU0OSBSYWNlIGNvbmRpdGlvbiBpbiBidWZfTFJVX2Ryb3BfcGFnZV9oYXNoX2Zvcl90YWJsZXNw
YWNlKCkKICAgICAgYW5kIGNvbXByZXNzZWQgdGFibGVzCiAgICAgIAogICAgICBidWZfTFJVX2Ry
b3BfcGFnZV9oYXNoX2Zvcl90YWJsZXNwYWNlKCk6IGFmdGVyIHJlbGVhc2luZyBhbmQKICAgICAg
cmVhY3F1aXJpbmcgdGhlIGJ1ZmZlciBwb29sIG11dGV4LCBkbyBub3QgZGVyZWZlcmVuY2UgYW55
IGJsb2NrCiAgICAgIGRlc2NyaXB0b3IgcG9pbnRlciB0aGF0IGlzIG5vdCBrbm93biB0byBiZSBh
IHBvaW50ZXIgdG8gYW4KICAgICAgdW5jb21wcmVzc2VkIHBhZ2UgZnJhbWUgKHR5cGUgYnVmX2Js
b2NrX3Q7IHN0YXRlID09CiAgICAgIEJVRl9CTE9DS19GSUxFX1BBR0UpLiBBbHNvLCBkZWZlciB0
aGUgYWNxdWlzaXRpb24gb2YgdGhlIGJsb2NrX211dGV4CiAgICAgIHVudGlsIGl0IGlzIG5lZWRl
ZC4KICAgICAgCiAgICAgIGJ1Zl9wYWdlX2dldF9nZW4oKTogQWRkIG1vZGUgPT0gQlVGX0dFVF9J
Rl9JTl9QT09MX1BFRUsgZm9yCiAgICAgIGJ1ZmZlci1maXhpbmcgYSBibG9jayB3aXRob3V0IG1h
a2luZyBpdCB5b3VuZyBpbiB0aGUgTFJVIGxpc3QuCiAgICAgIAogICAgICBidWZfcGFnZV9nZXRf
Z2VuKCksIGJ1Zl9wYWdlX2luaXQoKSwgYnVmX0xSVV9ibG9ja19yZW1vdmVfaGFzaGVkX3BhZ2Uo
KToKICAgICAgU2V0IGJwYWdlLT5zdGF0ZSA9IEJVRl9CTE9DS19aSVBfRlJFRSBiZWZvcmUgYnVm
X2J1ZGR5X2ZyZWUoYnBhZ2UpLAogICAgICBzbyB0aGF0IHNpbWlsYXIgcmFjZSBjb25kaXRpb25z
IG1pZ2h0IGJlIGRldGVjdGVkIGEgbGl0dGxlIGVhc2llci4KICAgICAgCiAgICAgIGJ0cl9zZWFy
Y2hfZHJvcF9wYWdlX2hhc2hfd2hlbl9mcmVlZCgpOiBVc2UgQlVGX0dFVF9JRl9JTl9QT09MX1BF
RUsKICAgICAgd2hlbiBkcm9wcGluZyB0aGUgaGFzaCBpbmRleGVzLgogICAgICAKICAgICAgcmI6
Ly81MjggYXBwcm92ZWQgYnkgSmltbXkgWWFuZwoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdl
L2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIv
YnRyMHNlYS5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGJ1Zi5jCiAgICAg
IHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGxydS5jCiAgICAgIHN0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9pbmNsdWRlL2J1ZjBidWYuaAo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL0NoYW5nZUxvZycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxv
ZwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMjI1MDk1MDE4LWpnbXYxcG51cHJy
anphdDEKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDExMDIyODExNTExOC1vZ3MzaWIxZWF6OWJzZ2t0CkBAIC0xLDMg
KzEsOSBAQAorMjAxMS0wMi0yOAlUaGUgSW5ub0RCIFRlYW0KKworCSogYnRyL2J0cjBzZWEuYywg
YnVmL2J1ZjBidWYuYywgYnVmL2J1ZjBscnUuYzoKKwlGaXggQnVnIzU4NTQ5IFJhY2UgY29uZGl0
aW9uIGluIGJ1Zl9MUlVfZHJvcF9wYWdlX2hhc2hfZm9yX3RhYmxlc3BhY2UoKQorCWFuZCBjb21w
cmVzc2VkIHRhYmxlcworCiAyMDExLTAyLTE1CVRoZSBJbm5vREIgVGVhbQogCiAJKiBzeW5jL3N5
bmMwcncuYywgaW5ub2RiX2J1ZzU5MzA3LnRlc3Q6Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFn
ZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwc2VhLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdp
bi9idHIvYnRyMHNlYS5jCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTAyMjUwOTUw
MTgtamdtdjFwbnVwcnJqemF0MQorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBz
ZWEuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIyODExNTExOC1vZ3MzaWIx
ZWF6OWJzZ2t0CkBAIC0xMjAxLDggKzEyMDEsOCBAQCBidHJfc2VhcmNoX2Ryb3BfcGFnZV9oYXNo
X3doZW5fZnJlZWQoCiAJaGF2aW5nIHRvIGZlYXIgYSBkZWFkbG9jay4gKi8KIAogCWJsb2NrID0g
YnVmX3BhZ2VfZ2V0X2dlbihzcGFjZSwgemlwX3NpemUsIHBhZ2Vfbm8sIFJXX1NfTEFUQ0gsIE5V
TEwsCi0JCQkJQlVGX0dFVF9JRl9JTl9QT09MLCBfX0ZJTEVfXywgX19MSU5FX18sCi0JCQkJJm10
cik7CisJCQkJIEJVRl9QRUVLX0lGX0lOX1BPT0wsIF9fRklMRV9fLCBfX0xJTkVfXywKKwkJCQkg
Jm10cik7CiAJLyogQmVjYXVzZSB0aGUgYnVmZmVyIHBvb2wgbXV0ZXggd2FzIHJlbGVhc2VkIGJ5
CiAJYnVmX3BhZ2VfcGVla19pZl9zZWFyY2hfaGFzaGVkKCksIGl0IGlzIHBvc3NpYmxlIHRoYXQg
dGhlCiAJYmxvY2sgd2FzIHJlbW92ZWQgZnJvbSB0aGUgYnVmZmVyIHBvb2wgYnkgYW5vdGhlciB0
aHJlYWQKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBi
dWYuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwYnVmLmMJcmV2aWQ6dmFz
aWwuZGltb3ZAb3JhY2xlLmNvbS0yMDExMDIyNTA5NTAxOC1qZ212MXBudXBycmp6YXQxCisrKyBi
L3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTEwMjI4MTE1MTE4LW9nczNpYjFlYXo5YnNna3QKQEAgLTIwMzEsNyArMjAz
MSw3IEBAIGJ1Zl9wYWdlX2dldF9nZW4oCiAJdWxpbnQJCXJ3X2xhdGNoLC8qITwgaW46IFJXX1Nf
TEFUQ0gsIFJXX1hfTEFUQ0gsIFJXX05PX0xBVENIICovCiAJYnVmX2Jsb2NrX3QqCWd1ZXNzLAkv
KiE8IGluOiBndWVzc2VkIGJsb2NrIG9yIE5VTEwgKi8KIAl1bGludAkJbW9kZSwJLyohPCBpbjog
QlVGX0dFVCwgQlVGX0dFVF9JRl9JTl9QT09MLAotCQkJCUJVRl9HRVRfTk9fTEFUQ0ggKi8KKwkJ
CQlCVUZfUEVFS19JRl9JTl9QT09MLCBCVUZfR0VUX05PX0xBVENIICovCiAJY29uc3QgY2hhcioJ
ZmlsZSwJLyohPCBpbjogZmlsZSBuYW1lICovCiAJdWxpbnQJCWxpbmUsCS8qITwgaW46IGxpbmUg
d2hlcmUgY2FsbGVkICovCiAJbXRyX3QqCQltdHIpCS8qITwgaW46IG1pbmktdHJhbnNhY3Rpb24g
Ki8KQEAgLTIwNDcsOSArMjA0NywxOSBAQCBidWZfcGFnZV9nZXRfZ2VuKAogCXV0X2FkKChyd19s
YXRjaCA9PSBSV19TX0xBVENIKQogCSAgICAgIHx8IChyd19sYXRjaCA9PSBSV19YX0xBVENIKQog
CSAgICAgIHx8IChyd19sYXRjaCA9PSBSV19OT19MQVRDSCkpOwotCXV0X2FkKChtb2RlICE9IEJV
Rl9HRVRfTk9fTEFUQ0gpIHx8IChyd19sYXRjaCA9PSBSV19OT19MQVRDSCkpOwotCXV0X2FkKCht
b2RlID09IEJVRl9HRVQpIHx8IChtb2RlID09IEJVRl9HRVRfSUZfSU5fUE9PTCkKLQkgICAgICB8
fCAobW9kZSA9PSBCVUZfR0VUX05PX0xBVENIKSk7CisjaWZkZWYgVU5JVl9ERUJVRworCXN3aXRj
aCAobW9kZSkgeworCWNhc2UgQlVGX0dFVF9OT19MQVRDSDoKKwkJdXRfYWQocndfbGF0Y2ggPT0g
UldfTk9fTEFUQ0gpOworCQlicmVhazsKKwljYXNlIEJVRl9HRVQ6CisJY2FzZSBCVUZfR0VUX0lG
X0lOX1BPT0w6CisJY2FzZSBCVUZfUEVFS19JRl9JTl9QT09MOgorCQlicmVhazsKKwlkZWZhdWx0
OgorCQl1dF9lcnJvcjsKKwl9CisjZW5kaWYgLyogVU5JVl9ERUJVRyAqLwogCXV0X2FkKHppcF9z
aXplID09IGZpbF9zcGFjZV9nZXRfemlwX3NpemUoc3BhY2UpKTsKIAl1dF9hZCh1dF9pc18ycG93
KHppcF9zaXplKSk7CiAjaWZuZGVmIFVOSVZfTE9HX0RFQlVHCkBAIC0yMDkxLDcgKzIxMDEsOCBA
QCBsb29wMjoKIAogCQlidWZfcG9vbF9tdXRleF9leGl0KCk7CiAKLQkJaWYgKG1vZGUgPT0gQlVG
X0dFVF9JRl9JTl9QT09MKSB7CisJCWlmIChtb2RlID09IEJVRl9HRVRfSUZfSU5fUE9PTAorCQkg
ICAgfHwgbW9kZSA9PSBCVUZfUEVFS19JRl9JTl9QT09MKSB7CiAKIAkJCXJldHVybihOVUxMKTsK
IAkJfQpAQCAtMjEzMCw3ICsyMTQxLDggQEAgbG9vcDI6CiAKIAltdXN0X3JlYWQgPSBidWZfYmxv
Y2tfZ2V0X2lvX2ZpeChibG9jaykgPT0gQlVGX0lPX1JFQUQ7CiAKLQlpZiAobXVzdF9yZWFkICYm
IG1vZGUgPT0gQlVGX0dFVF9JRl9JTl9QT09MKSB7CisJaWYgKG11c3RfcmVhZCAmJiAobW9kZSA9
PSBCVUZfR0VUX0lGX0lOX1BPT0wKKwkJCSAgfHwgbW9kZSA9PSBCVUZfUEVFS19JRl9JTl9QT09M
KSkgewogCQkvKiBUaGUgcGFnZSBpcyBvbmx5IGJlaW5nIHJlYWQgdG8gYnVmZmVyICovCiAJCWJ1
Zl9wb29sX211dGV4X2V4aXQoKTsKIApAQCAtMjI0OCw2ICsyMjYwLDcgQEAgd2FpdF91bnRpbF91
bmZpeGVkOgogCQltdXRleF9leGl0KCZidWZfcG9vbF96aXBfbXV0ZXgpOwogCQlidWZfcG9vbC0+
bl9wZW5kX3VuemlwKys7CiAKKwkJYnBhZ2UtPnN0YXRlID0gQlVGX0JMT0NLX1pJUF9GUkVFOwog
CQlidWZfYnVkZHlfZnJlZShicGFnZSwgc2l6ZW9mICpicGFnZSk7CiAKIAkJYnVmX3Bvb2xfbXV0
ZXhfZXhpdCgpOwpAQCAtMjMyNCw3ICsyMzM3LDkgQEAgd2FpdF91bnRpbF91bmZpeGVkOgogCiAJ
YnVmX3Bvb2xfbXV0ZXhfZXhpdCgpOwogCi0JYnVmX3BhZ2Vfc2V0X2FjY2Vzc2VkX21ha2VfeW91
bmcoJmJsb2NrLT5wYWdlLCBhY2Nlc3NfdGltZSk7CisJaWYgKFVOSVZfTElLRUxZKG1vZGUgIT0g
QlVGX1BFRUtfSUZfSU5fUE9PTCkpIHsKKwkJYnVmX3BhZ2Vfc2V0X2FjY2Vzc2VkX21ha2VfeW91
bmcoJmJsb2NrLT5wYWdlLCBhY2Nlc3NfdGltZSk7CisJfQogCiAjaWYgZGVmaW5lZCBVTklWX0RF
QlVHX0ZJTEVfQUNDRVNTRVMgfHwgZGVmaW5lZCBVTklWX0RFQlVHCiAJdXRfYSghYmxvY2stPnBh
Z2UuZmlsZV9wYWdlX3dhc19mcmVlZCk7CkBAIC0yMzc3LDcgKzIzOTIsNyBAQCB3YWl0X3VudGls
X3VuZml4ZWQ6CiAKIAltdHJfbWVtb19wdXNoKG10ciwgYmxvY2ssIGZpeF90eXBlKTsKIAotCWlm
ICghYWNjZXNzX3RpbWUpIHsKKwlpZiAoVU5JVl9MSUtFTFkobW9kZSAhPSBCVUZfUEVFS19JRl9J
Tl9QT09MKSAmJiAhYWNjZXNzX3RpbWUpIHsKIAkJLyogSW4gdGhlIGNhc2Ugb2YgYSBmaXJzdCBh
Y2Nlc3MsIHRyeSB0byBhcHBseSBsaW5lYXIKIAkJcmVhZC1haGVhZCAqLwogCkBAIC0yOTI2LDYg
KzI5NDEsNyBAQCBlcnJfZXhpdDoKIAkJICAgICYmIFVOSVZfTElLRUxZX05VTEwoYnVmX3BhZ2Vf
aGFzaF9nZXQoc3BhY2UsIG9mZnNldCkpKSB7CiAKIAkJCS8qIFRoZSBibG9jayB3YXMgYWRkZWQg
Ynkgc29tZSBvdGhlciB0aHJlYWQuICovCisJCQlicGFnZS0+c3RhdGUgPSBCVUZfQkxPQ0tfWklQ
X0ZSRUU7CiAJCQlidWZfYnVkZHlfZnJlZShicGFnZSwgc2l6ZW9mICpicGFnZSk7CiAJCQlidWZf
YnVkZHlfZnJlZShkYXRhLCB6aXBfc2l6ZSk7CiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl
L2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBscnUuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L2J1Zi9idWYwbHJ1LmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDExMDIyNTA5NTAx
OC1qZ212MXBudXBycmp6YXQxCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGxy
dS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjI4MTE1MTE4LW9nczNpYjFl
YXo5YnNna3QKQEAgLTI0Niw3MSArMjQ2LDc1IEBAIGJ1Zl9MUlVfZHJvcF9wYWdlX2hhc2hfZm9y
X3RhYmxlc3BhY2UoCiAJcGFnZV9hcnIgPSB1dF9tYWxsb2Moc2l6ZW9mKHVsaW50KQogCQkJICAg
ICAqIEJVRl9MUlVfRFJPUF9TRUFSQ0hfSEFTSF9TSVpFKTsKIAlidWZfcG9vbF9tdXRleF9lbnRl
cigpOworCW51bV9lbnRyaWVzID0gMDsKIAogc2Nhbl9hZ2FpbjoKLQludW1fZW50cmllcyA9IDA7
CiAJYnBhZ2UgPSBVVF9MSVNUX0dFVF9MQVNUKGJ1Zl9wb29sLT5MUlUpOwogCiAJd2hpbGUgKGJw
YWdlICE9IE5VTEwpIHsKLQkJbXV0ZXhfdCoJYmxvY2tfbXV0ZXggPSBidWZfcGFnZV9nZXRfbXV0
ZXgoYnBhZ2UpOwogCQlidWZfcGFnZV90KglwcmV2X2JwYWdlOworCQlpYm9vbAkJaXNfZml4ZWQ7
CiAKLQkJbXV0ZXhfZW50ZXIoYmxvY2tfbXV0ZXgpOwogCQlwcmV2X2JwYWdlID0gVVRfTElTVF9H
RVRfUFJFVihMUlUsIGJwYWdlKTsKIAogCQl1dF9hKGJ1Zl9wYWdlX2luX2ZpbGUoYnBhZ2UpKTsK
IAogCQlpZiAoYnVmX3BhZ2VfZ2V0X3N0YXRlKGJwYWdlKSAhPSBCVUZfQkxPQ0tfRklMRV9QQUdF
CiAJCSAgICB8fCBicGFnZS0+c3BhY2UgIT0gaWQKLQkJICAgIHx8IGJwYWdlLT5idWZfZml4X2Nv
dW50ID4gMAogCQkgICAgfHwgYnBhZ2UtPmlvX2ZpeCAhPSBCVUZfSU9fTk9ORSkgewotCQkJLyog
V2UgbGVhdmUgdGhlIGZpeGVkIHBhZ2VzIGFzIGlzIGluIHRoaXMgc2Nhbi4KLQkJCVRvIGJlIGRl
YWx0IHdpdGggbGF0ZXIgaW4gdGhlIGZpbmFsIHNjYW4uICovCi0JCQltdXRleF9leGl0KGJsb2Nr
X211dGV4KTsKLQkJCWdvdG8gbmV4dF9wYWdlOworCQkJLyogQ29tcHJlc3NlZCBwYWdlcyBhcmUg
bmV2ZXIgaGFzaGVkLgorCQkJU2tpcCBibG9ja3Mgb2Ygb3RoZXIgdGFibGVzcGFjZXMuCisJCQlT
a2lwIEkvTy1maXhlZCBibG9ja3MgKHRvIGJlIGRlYWx0IHdpdGggbGF0ZXIpLiAqLworbmV4dF9w
YWdlOgorCQkJYnBhZ2UgPSBwcmV2X2JwYWdlOworCQkJY29udGludWU7CiAJCX0KIAotCQlpZiAo
KChidWZfYmxvY2tfdCopIGJwYWdlKS0+aXNfaGFzaGVkKSB7CisJCW11dGV4X2VudGVyKCYoKGJ1
Zl9ibG9ja190KikgYnBhZ2UpLT5tdXRleCk7CisJCWlzX2ZpeGVkID0gYnBhZ2UtPmJ1Zl9maXhf
Y291bnQgPiAwCisJCQl8fCAhKChidWZfYmxvY2tfdCopIGJwYWdlKS0+aXNfaGFzaGVkOworCQlt
dXRleF9leGl0KCYoKGJ1Zl9ibG9ja190KikgYnBhZ2UpLT5tdXRleCk7CiAKLQkJCS8qIFN0b3Jl
IHRoZSBvZmZzZXQoaS5lLjogcGFnZV9ubykgaW4gdGhlIGFycmF5Ci0JCQlzbyB0aGF0IHdlIGNh
biBkcm9wIGhhc2ggaW5kZXggaW4gYSBiYXRjaAotCQkJbGF0ZXIuICovCi0JCQlwYWdlX2Fycltu
dW1fZW50cmllc10gPSBicGFnZS0+b2Zmc2V0OwotCQkJbXV0ZXhfZXhpdChibG9ja19tdXRleCk7
Ci0JCQl1dF9hKG51bV9lbnRyaWVzIDwgQlVGX0xSVV9EUk9QX1NFQVJDSF9IQVNIX1NJWkUpOwot
CQkJKytudW1fZW50cmllczsKKwkJaWYgKGlzX2ZpeGVkKSB7CisJCQlnb3RvIG5leHRfcGFnZTsK
KwkJfQogCi0JCQlpZiAobnVtX2VudHJpZXMgPCBCVUZfTFJVX0RST1BfU0VBUkNIX0hBU0hfU0la
RSkgewotCQkJCWdvdG8gbmV4dF9wYWdlOwotCQkJfQotCQkJLyogQXJyYXkgZnVsbC4gV2UgcmVs
ZWFzZSB0aGUgYnVmX3Bvb2xfbXV0ZXggdG8KLQkJCW9iZXkgdGhlIGxhdGNoaW5nIG9yZGVyLiAq
LwotCQkJYnVmX3Bvb2xfbXV0ZXhfZXhpdCgpOwotCi0JCQlidWZfTFJVX2Ryb3BfcGFnZV9oYXNo
X2JhdGNoKGlkLCB6aXBfc2l6ZSwgcGFnZV9hcnIsCi0JCQkJCQkgICAgIG51bV9lbnRyaWVzKTsK
LQkJCW51bV9lbnRyaWVzID0gMDsKLQkJCWJ1Zl9wb29sX211dGV4X2VudGVyKCk7Ci0JCX0gZWxz
ZSB7Ci0JCQltdXRleF9leGl0KGJsb2NrX211dGV4KTsKKwkJLyogU3RvcmUgdGhlIHBhZ2UgbnVt
YmVyIHNvIHRoYXQgd2UgY2FuIGRyb3AgdGhlIGhhc2gKKwkJaW5kZXggaW4gYSBiYXRjaCBsYXRl
ci4gKi8KKwkJcGFnZV9hcnJbbnVtX2VudHJpZXNdID0gYnBhZ2UtPm9mZnNldDsKKwkJdXRfYShu
dW1fZW50cmllcyA8IEJVRl9MUlVfRFJPUF9TRUFSQ0hfSEFTSF9TSVpFKTsKKwkJKytudW1fZW50
cmllczsKKworCQlpZiAobnVtX2VudHJpZXMgPCBCVUZfTFJVX0RST1BfU0VBUkNIX0hBU0hfU0la
RSkgeworCQkJZ290byBuZXh0X3BhZ2U7CiAJCX0KIAotbmV4dF9wYWdlOgotCQkvKiBOb3RlIHRo
YXQgd2UgbWF5IGhhdmUgcmVsZWFzZWQgdGhlIGJ1Zl9wb29sIG11dGV4Ci0JCWFib3ZlIGFmdGVy
IHJlYWRpbmcgdGhlIHByZXZfYnBhZ2UgZHVyaW5nIHByb2Nlc3NpbmcKLQkJb2YgYSBwYWdlX2hh
c2hfYmF0Y2ggKGkuZS46IHdoZW4gdGhlIGFycmF5IHdhcyBmdWxsKS4KLQkJVGhpcyBtZWFucyB0
aGF0IHByZXZfYnBhZ2UgY2FuIGNoYW5nZSBpbiBMUlUgbGlzdC4KLQkJVGhpcyBpcyBPSyBiZWNh
dXNlIHRoaXMgZnVuY3Rpb24gaXMgYSAnYmVzdCBlZmZvcnQnCi0JCXRvIGRyb3AgYXMgbWFueSBz
ZWFyY2ggaGFzaCBlbnRyaWVzIGFzIHBvc3NpYmxlIGFuZAotCQlpdCBkb2VzIG5vdCBndWFyYW50
ZWUgdGhhdCBBTEwgc3VjaCBlbnRyaWVzIHdpbGwgYmUKLQkJZHJvcHBlZC4gKi8KLQkJYnBhZ2Ug
PSBwcmV2X2JwYWdlOworCQkvKiBBcnJheSBmdWxsLiBXZSByZWxlYXNlIHRoZSBidWZfcG9vbF9t
dXRleCB0bworCQlvYmV5IHRoZSBsYXRjaGluZyBvcmRlci4gKi8KKwkJYnVmX3Bvb2xfbXV0ZXhf
ZXhpdCgpOworCQlidWZfTFJVX2Ryb3BfcGFnZV9oYXNoX2JhdGNoKGlkLCB6aXBfc2l6ZSwgcGFn
ZV9hcnIsCisJCQkJCSAgICAgbnVtX2VudHJpZXMpOworCQlidWZfcG9vbF9tdXRleF9lbnRlcigp
OworCQludW1fZW50cmllcyA9IDA7CisKKwkJLyogTm90ZSB0aGF0IHdlIHJlbGVhc2VkIHRoZSBi
dWZfcG9vbCBtdXRleCBhYm92ZQorCQlhZnRlciByZWFkaW5nIHRoZSBwcmV2X2JwYWdlIGR1cmlu
ZyBwcm9jZXNzaW5nIG9mIGEKKwkJcGFnZV9oYXNoX2JhdGNoIChpLmUuOiB3aGVuIHRoZSBhcnJh
eSB3YXMgZnVsbCkuCisJCUJlY2F1c2UgcHJldl9icGFnZSBjb3VsZCBiZWxvbmcgdG8gYSBjb21w
cmVzc2VkLW9ubHkKKwkJYmxvY2ssIGl0IG1heSBoYXZlIGJlZW4gcmVsb2NhdGVkLCBhbmQgdGh1
cyB0aGUKKwkJcG9pbnRlciBjYW5ub3QgYmUgdHJ1c3RlZC4gQmVjYXVzZSBicGFnZSBpcyBvZiB0
eXBlCisJCWJ1Zl9ibG9ja190LCBpdCBpcyBzYWZlIHRvIGRlcmVmZXJlbmNlLgorCisJCWJwYWdl
IGNhbiBjaGFuZ2UgaW4gdGhlIExSVSBsaXN0LiBUaGlzIGlzIE9LIGJlY2F1c2UKKwkJdGhpcyBm
dW5jdGlvbiBpcyBhICdiZXN0IGVmZm9ydCcgdG8gZHJvcCBhcyBtYW55CisJCXNlYXJjaCBoYXNo
IGVudHJpZXMgYXMgcG9zc2libGUgYW5kIGl0IGRvZXMgbm90CisJCWd1YXJhbnRlZSB0aGF0IEFM
TCBzdWNoIGVudHJpZXMgd2lsbCBiZSBkcm9wcGVkLiAqLwogCiAJCS8qIElmLCBob3dldmVyLCBi
cGFnZSBoYXMgYmVlbiByZW1vdmVkIGZyb20gTFJVIGxpc3QKIAkJdG8gdGhlIGZyZWUgbGlzdCB0
aGVuIHdlIHNob3VsZCByZXN0YXJ0IHRoZSBzY2FuLgogCQlicGFnZS0+c3RhdGUgaXMgcHJvdGVj
dGVkIGJ5IGJ1Zl9wb29sIG11dGV4LiAqLwotCQlpZiAoYnBhZ2UgJiYgIWJ1Zl9wYWdlX2luX2Zp
bGUoYnBhZ2UpKSB7Ci0JCQl1dF9hKG51bV9lbnRyaWVzID09IDApOworCQlpZiAoYnBhZ2UKKwkJ
ICAgICYmIGJ1Zl9wYWdlX2dldF9zdGF0ZShicGFnZSkgIT0gQlVGX0JMT0NLX0ZJTEVfUEFHRSkg
ewogCQkJZ290byBzY2FuX2FnYWluOwogCQl9CiAJfQpAQCAtMTc5OSw2ICsxODAzLDcgQEAgYnVm
X0xSVV9ibG9ja19yZW1vdmVfaGFzaGVkX3BhZ2UoCiAJCWJ1Zl9wb29sX211dGV4X2V4aXRfZm9y
YmlkKCk7CiAJCWJ1Zl9idWRkeV9mcmVlKGJwYWdlLT56aXAuZGF0YSwKIAkJCSAgICAgICBwYWdl
X3ppcF9nZXRfc2l6ZSgmYnBhZ2UtPnppcCkpOworCQlicGFnZS0+c3RhdGUgPSBCVUZfQkxPQ0tf
WklQX0ZSRUU7CiAJCWJ1Zl9idWRkeV9mcmVlKGJwYWdlLCBzaXplb2YoKmJwYWdlKSk7CiAJCWJ1
Zl9wb29sX211dGV4X2V4aXRfYWxsb3coKTsKIAkJVU5JVl9NRU1fVU5ERVNDKGJwYWdlKTsKCj09
PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9idWYwYnVmLmgn
Ci0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2J1ZjBidWYuaAlyZXZpZDp2YXNp
bC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMjI1MDk1MDE4LWpnbXYxcG51cHJyanphdDEKKysrIGIv
c3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvYnVmMGJ1Zi5oCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTEwMjI4MTE1MTE4LW9nczNpYjFlYXo5YnNna3QKQEAgLTQxLDYgKzQx
LDggQEAgQ3JlYXRlZCAxMS81LzE5OTUgSGVpa2tpIFR1dXJpCiAvKiBAeyAqLwogI2RlZmluZSBC
VUZfR0VUCQkJMTAJLyohPCBnZXQgYWx3YXlzICovCiAjZGVmaW5lCUJVRl9HRVRfSUZfSU5fUE9P
TAkxMQkvKiE8IGdldCBpZiBpbiBwb29sICovCisjZGVmaW5lIEJVRl9QRUVLX0lGX0lOX1BPT0wJ
MTIJLyohPCBnZXQgaWYgaW4gcG9vbCwgZG8gbm90IG1ha2UKKwkJCQkJdGhlIGJsb2NrIHlvdW5n
IGluIHRoZSBMUlUgbGlzdCAqLwogI2RlZmluZSBCVUZfR0VUX05PX0xBVENICTE0CS8qITwgZ2V0
IGFuZCBidWZmZXJmaXgsIGJ1dAogCQkJCQlzZXQgbm8gbGF0Y2g7IHdlIGhhdmUKIAkJCQkJc2Vw
YXJhdGVkIHRoaXMgY2FzZSwgYmVjYXVzZQpAQCAtMjg0LDcgKzI4Niw3IEBAIGJ1Zl9wYWdlX2dl
dF9nZW4oCiAJdWxpbnQJCXJ3X2xhdGNoLC8qITwgaW46IFJXX1NfTEFUQ0gsIFJXX1hfTEFUQ0gs
IFJXX05PX0xBVENIICovCiAJYnVmX2Jsb2NrX3QqCWd1ZXNzLAkvKiE8IGluOiBndWVzc2VkIGJs
b2NrIG9yIE5VTEwgKi8KIAl1bGludAkJbW9kZSwJLyohPCBpbjogQlVGX0dFVCwgQlVGX0dFVF9J
Rl9JTl9QT09MLAotCQkJCUJVRl9HRVRfTk9fTEFUQ0ggKi8KKwkJCQlCVUZfUEVFS19JRl9JTl9Q
T09MLCBCVUZfR0VUX05PX0xBVENIICovCiAJY29uc3QgY2hhcioJZmlsZSwJLyohPCBpbjogZmls
ZSBuYW1lICovCiAJdWxpbnQJCWxpbmUsCS8qITwgaW46IGxpbmUgd2hlcmUgY2FsbGVkICovCiAJ
bXRyX3QqCQltdHIpOwkvKiE8IGluOiBtaW5pLXRyYW5zYWN0aW9uICovCgo=

--===============0993897782==
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.1-innodb/
# testament_sha1: a558a70deb6d9fe78d4bdb9cddad7533b67afe6a
# timestamp: 2011-02-28 13:51:46 +0200
# base_revision_id: vasil.dimov@stripped\
#   jgmv1pnuprrjzat1
# 
# Begin bundle
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
e93/F3JFOFCQ2sd3Wg==


--===============0993897782==--