From: marko.makela
Date: August 9 2010 8:58am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3150) Bug#54914
List-Archive: http://lists.mysql.com/commits/115286
X-Bug: 54914
Message-Id: <201008090858.o798SjJX024503@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0235039165=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDppbmFhbS5yYW5hQG9yYWNsZS5jb20tMjAxMDA4MDUxNTQyMTEtZmE5ZzZx
YWdxemJrcGZiawoKIDMxNTAgTWFya28gTcOka2Vsw6QJMjAxMC0wOC0wOQogICAgICBSZWR1Y2Ug
dGhlIGlidWZfbXV0ZXggaG9sZCB0aW1lLiBUaGlzIGRvZXMgbm90IGZpeCB0aGUgdXBkYXRlCiAg
ICAgIHJlZ3Jlc3Npb24gaW4gQnVnICM1NDkxNCwgYnV0IGl0IGRvZXMgc3BlZWQgdXAgdGhlIGV4
ZWN1dGlvbiBmb3IKICAgICAgaW5ub2RiX2NoYW5nZV9idWZmZXJpbmc9aW5zZXJ0cy4KICAgICAg
CiAgICAgIGlidWZfYWRkX29wcygpLCBpYnVmX21lcmdlX29yX2RlbGV0ZV9mb3JfcGFnZSgpLAog
ICAgICBpYnVmX2RlbGV0ZV9mb3JfZGlzY2FyZGVkX3NwYWNlKCk6IFVzZSBhdG9taWMgYnVpbHQt
aW5zIGluc3RlYWQgb2YKICAgICAgaWJ1Zl9tdXRleCwgd2hlbiBhdmFpbGFibGUuCiAgICAgIAog
ICAgICBpYnVmX2FkZF9mcmVlX3BhZ2UoKSwgaWJ1Zl9yZW1vdmVfZnJlZV9wYWdlKCksIGlidWZf
Y29udHJhY3RfZXh0KCk6CiAgICAgIFJlbGVhc2UgaWJ1Zl9tdXRleCBlYXJsaWVyLgogICAgICAK
ICAgICAgaWJ1Zl9mcmVlX2V4Y2Vzc19wYWdlcygpOiBSZWxlYXNlIGlidWZfbXV0ZXggYmVmb3Jl
IGEgY29uZGl0aW9uYWwgYnJhbmNoLgogICAgICAKICAgICAgaWJ1Zl9pbnNlcnRfbG93KCk6IFJl
bGVhc2UgaWJ1Zl9tdXRleCBiZWZvcmUgYSBjb25kaXRpb25hbAogICAgICBicmFuY2guIENyZWF0
ZSBpYnVmX2VudHJ5IGJlZm9yZSByZS1hY3F1aXJpbmcgaWJ1Zl9tdXRleC4gU2ltcGxpZnkgYQog
ICAgICBsb29wIHRvIHJlZHVjZSBjb2RlIGZvb3RwcmludC4gUmVsZWFzZSBpYnVmX211dGV4IGJl
Zm9yZSBtdHJfY29tbWl0KCkKICAgICAgW2J0cl9wY3VyX2Nsb3NlKCldLgogICAgICAKICAgICAg
aWJ1Zl9pc19lbXB0eSgpOiBSZWxlYXNlIGlidWZfbXV0ZXggYmVmb3JlIG10cl9jb21taXQoKS4K
CiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jCj09
PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmMnCi0tLSBh
L3N0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYwlyZXZpZDppbmFhbS5yYW5hQG9yYWNs
ZS5jb20tMjAxMDA4MDUxNTQyMTEtZmE5ZzZxYWdxemJrcGZiaworKysgYi9zdG9yYWdlL2lubm9i
YXNlL2lidWYvaWJ1ZjBpYnVmLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA4
MDkwODU4MzctczFuZng2Z2pmN2w2dHRhYgpAQCAtMTM1MCwxMCArMTM1MCwxOCBAQCBpYnVmX2Fk
ZF9vcHMoCiAJY29uc3QgdWxpbnQqCW9wcykJLyohPCBpbjogb3BlcmF0aW9uIGNvdW50cyAqLwog
CiB7CisjaWZuZGVmIEhBVkVfQVRPTUlDX0JVSUxUSU5TCisJdXRfYWQobXV0ZXhfb3duKCZpYnVm
X211dGV4KSk7CisjZW5kaWYgLyogIUhBVkVfQVRPTUlDX0JVSUxUSU5TICovCisKIAl1bGludAlp
OwogCiAJZm9yIChpID0gMDsgaSA8IElCVUZfT1BfQ09VTlQ7IGkrKykgeworI2lmZGVmIEhBVkVf
QVRPTUlDX0JVSUxUSU5TCisJCW9zX2F0b21pY19pbmNyZW1lbnRfdWxpbnQoJmFycltpXSwgb3Bz
W2ldKTsKKyNlbHNlIC8qIEhBVkVfQVRPTUlDX0JVSUxUSU5TICovCiAJCWFycltpXSArPSBvcHNb
aV07CisjZW5kaWYgLyogSEFWRV9BVE9NSUNfQlVJTFRJTlMgKi8KIAl9CiB9CiAKQEAgLTIwOTYs
MTMgKzIxMDQsMTMgQEAgaWJ1Zl9hZGRfZnJlZV9wYWdlKHZvaWQpCiAJYml0bWFwX3BhZ2UgPSBp
YnVmX2JpdG1hcF9nZXRfbWFwX3BhZ2UoCiAJCUlCVUZfU1BBQ0VfSUQsIHBhZ2Vfbm8sIHppcF9z
aXplLCAmbXRyKTsKIAorCW11dGV4X2V4aXQoJmlidWZfbXV0ZXgpOworCiAJaWJ1Zl9iaXRtYXBf
cGFnZV9zZXRfYml0cygKIAkJYml0bWFwX3BhZ2UsIHBhZ2Vfbm8sIHppcF9zaXplLCBJQlVGX0JJ
VE1BUF9JQlVGLCBUUlVFLCAmbXRyKTsKIAogCW10cl9jb21taXQoJm10cik7CiAKLQltdXRleF9l
eGl0KCZpYnVmX211dGV4KTsKLQogCWlidWZfZXhpdCgpOwogCiAJcmV0dXJuKERCX1NVQ0NFU1Mp
OwpAQCAtMjE1OCw2ICsyMTY2LDggQEAgaWJ1Zl9yZW1vdmVfZnJlZV9wYWdlKHZvaWQpCiAKIAly
b290ID0gaWJ1Zl90cmVlX3Jvb3RfZ2V0KCZtdHIyKTsKIAorCW11dGV4X2V4aXQoJmlidWZfbXV0
ZXgpOworCiAJcGFnZV9ubyA9IGZsc3RfZ2V0X2xhc3Qocm9vdCArIFBBR0VfSEVBREVSICsgUEFH
RV9CVFJfSUJVRl9GUkVFX0xJU1QsCiAJCQkJJm10cjIpLnBhZ2U7CiAKQEAgLTIxNjYsNyArMjE3
Niw2IEBAIGlidWZfcmVtb3ZlX2ZyZWVfcGFnZSh2b2lkKQogCWlzIGEgbGV2ZWwgMiBwYWdlLiAq
LwogCiAJbXRyX2NvbW1pdCgmbXRyMik7Ci0JbXV0ZXhfZXhpdCgmaWJ1Zl9tdXRleCk7CiAKIAlp
YnVmX2V4aXQoKTsKIApAQCAtMjIyMCw2ICsyMjI5LDggQEAgaWJ1Zl9yZW1vdmVfZnJlZV9wYWdl
KHZvaWQpCiAJYml0bWFwX3BhZ2UgPSBpYnVmX2JpdG1hcF9nZXRfbWFwX3BhZ2UoCiAJCUlCVUZf
U1BBQ0VfSUQsIHBhZ2Vfbm8sIHppcF9zaXplLCAmbXRyKTsKIAorCW11dGV4X2V4aXQoJmlidWZf
bXV0ZXgpOworCiAJaWJ1Zl9iaXRtYXBfcGFnZV9zZXRfYml0cygKIAkJYml0bWFwX3BhZ2UsIHBh
Z2Vfbm8sIHppcF9zaXplLCBJQlVGX0JJVE1BUF9JQlVGLCBGQUxTRSwgJm10cik7CiAKQEAgLTIy
MjgsOCArMjIzOSw2IEBAIGlidWZfcmVtb3ZlX2ZyZWVfcGFnZSh2b2lkKQogI2VuZGlmCiAJbXRy
X2NvbW1pdCgmbXRyKTsKIAotCW11dGV4X2V4aXQoJmlidWZfbXV0ZXgpOwotCiAJaWJ1Zl9leGl0
KCk7CiB9CiAKQEAgLTIyNzAsMTcgKzIyNzksMTYgQEAgaWJ1Zl9mcmVlX2V4Y2Vzc19wYWdlcyh2
b2lkKQogCiAJZm9yIChpID0gMDsgaSA8IDQ7IGkrKykgewogCi0JCW11dGV4X2VudGVyKCZpYnVm
X211dGV4KTsKLQotCQlpZiAoIWlidWZfZGF0YV90b29fbXVjaF9mcmVlKCkpIHsKKwkJaWJvb2wJ
dG9vX211Y2hfZnJlZTsKIAotCQkJbXV0ZXhfZXhpdCgmaWJ1Zl9tdXRleCk7CisJCW11dGV4X2Vu
dGVyKCZpYnVmX211dGV4KTsKKwkJdG9vX211Y2hfZnJlZSA9IGlidWZfZGF0YV90b29fbXVjaF9m
cmVlKCk7CisJCW11dGV4X2V4aXQoJmlidWZfbXV0ZXgpOwogCisJCWlmICghdG9vX211Y2hfZnJl
ZSkgewogCQkJcmV0dXJuOwogCQl9CiAKLQkJbXV0ZXhfZXhpdCgmaWJ1Zl9tdXRleCk7Ci0KIAkJ
aWJ1Zl9yZW1vdmVfZnJlZV9wYWdlKCk7CiAJfQogfQpAQCAtMjQ4Niw4ICsyNDk0LDggQEAgaWJ1
Zl9jb250cmFjdF9leHQoCiAJbXV0ZXhfZW50ZXIoJmlidWZfbXV0ZXgpOwogCiAJaWYgKGlidWYt
PmVtcHR5KSB7Ci1pYnVmX2lzX2VtcHR5OgogCQltdXRleF9leGl0KCZpYnVmX211dGV4KTsKK2li
dWZfaXNfZW1wdHk6CiAKICNpZiAwIC8qIFRPRE8gKi8KIAkJaWYgKHNydl9zaHV0ZG93bl9zdGF0
ZSkgewpAQCAtMjUxNSw2ICsyNTIzLDcgQEAgaWJ1Zl9pc19lbXB0eToKIAlwb3NpdGlvbiB3aXRo
aW4gdGhlIGxlYWYgKi8KIAogCWJ0cl9wY3VyX29wZW5fYXRfcm5kX3BvcyhpYnVmLT5pbmRleCwg
QlRSX1NFQVJDSF9MRUFGLCAmcGN1ciwgJm10cik7CisJbXV0ZXhfZXhpdCgmaWJ1Zl9tdXRleCk7
CiAKIAl1dF9hZChwYWdlX3ZhbGlkYXRlKGJ0cl9wY3VyX2dldF9wYWdlKCZwY3VyKSwgaWJ1Zi0+
aW5kZXgpKTsKIApAQCAtMjUzNSw4ICsyNTQ0LDYgQEAgaWJ1Zl9pc19lbXB0eToKIAkJZ290byBp
YnVmX2lzX2VtcHR5OwogCX0KIAotCW11dGV4X2V4aXQoJmlidWZfbXV0ZXgpOwotCiAJc3VtX3Np
emVzID0gaWJ1Zl9nZXRfbWVyZ2VfcGFnZV9ub3MoVFJVRSwgYnRyX3BjdXJfZ2V0X3JlYygmcGN1
ciksCiAJCQkJCSAgICBzcGFjZV9pZHMsIHNwYWNlX3ZlcnNpb25zLAogCQkJCQkgICAgcGFnZV9u
b3MsICZuX3N0b3JlZCk7CkBAIC0zMzA0LDYgKzMzMTEsNyBAQCBpYnVmX2luc2VydF9sb3coCiAJ
dWxpbnQJCW5fc3RvcmVkOwogCW10cl90CQltdHI7CiAJbXRyX3QJCWJpdG1hcF9tdHI7CisJaWJv
b2wJCXRvb19iaWc7CiAKIAl1dF9hKCFkaWN0X2luZGV4X2lzX2NsdXN0KGluZGV4KSk7CiAJdXRf
YWQoZHR1cGxlX2NoZWNrX3R5cGVkKGVudHJ5KSk7CkBAIC0zMzE2LDEyICszMzI0LDEzIEBAIGli
dWZfaW5zZXJ0X2xvdygKIAlkb19tZXJnZSA9IEZBTFNFOwogCiAJbXV0ZXhfZW50ZXIoJmlidWZf
bXV0ZXgpOworCXRvb19iaWcgPSBpYnVmLT5zaXplID49IGlidWYtPm1heF9zaXplICsgSUJVRl9D
T05UUkFDVF9ET19OT1RfSU5TRVJUOworCW11dGV4X2V4aXQoJmlidWZfbXV0ZXgpOwogCi0JaWYg
KGlidWYtPnNpemUgPj0gaWJ1Zi0+bWF4X3NpemUgKyBJQlVGX0NPTlRSQUNUX0RPX05PVF9JTlNF
UlQpIHsKKwlpZiAodG9vX2JpZykgewogCQkvKiBJbnNlcnQgYnVmZmVyIGlzIG5vdyB0b28gYmln
LCBjb250cmFjdCBpdCBidXQgZG8gbm90IHRyeQogCQl0byBpbnNlcnQgKi8KIAotCQltdXRleF9l
eGl0KCZpYnVmX211dGV4KTsKIAogI2lmZGVmIFVOSVZfSUJVRl9ERUJVRwogCQlmcHV0cygiSWJ1
ZiB0b28gYmlnXG4iLCBzdGRlcnIpOwpAQCAtMzMzMiwxNiArMzM0MSwzNiBAQCBpYnVmX2luc2Vy
dF9sb3coCiAJCXJldHVybihEQl9TVFJPTkdfRkFJTCk7CiAJfQogCi0JbXV0ZXhfZXhpdCgmaWJ1
Zl9tdXRleCk7CisJaGVhcCA9IG1lbV9oZWFwX2NyZWF0ZSg1MTIpOworCisJLyogQnVpbGQgdGhl
IGVudHJ5IHdoaWNoIGNvbnRhaW5zIHRoZSBzcGFjZSBpZCBhbmQgdGhlIHBhZ2UgbnVtYmVyCisJ
YXMgdGhlIGZpcnN0IGZpZWxkcyBhbmQgdGhlIHR5cGUgaW5mb3JtYXRpb24gZm9yIG90aGVyIGZp
ZWxkcywgYW5kCisJd2hpY2ggd2lsbCBiZSBpbnNlcnRlZCB0byB0aGUgaW5zZXJ0IGJ1ZmZlci4g
VXNpbmcgYSBjb3VudGVyIHZhbHVlCisJb2YgMHhGRkZGIHdlIGZpbmQgdGhlIGxhc3QgcmVjb3Jk
IGZvciAoc3BhY2UsIHBhZ2Vfbm8pLCBmcm9tIHdoaWNoCisJd2UgY2FuIHRoZW4gcmVhZCB0aGUg
Y291bnRlciB2YWx1ZSBOIGFuZCB1c2UgTiArIDEgaW4gdGhlIHJlY29yZCB3ZQorCWluc2VydC4g
KFdlIHBhdGNoIHRoZSBpYnVmX2VudHJ5J3MgY291bnRlciBmaWVsZCB0byB0aGUgY29ycmVjdAor
CXZhbHVlIGp1c3QgYmVmb3JlIGFjdHVhbGx5IGluc2VydGluZyB0aGUgZW50cnkuKSAqLworCisJ
aWJ1Zl9lbnRyeSA9IGlidWZfZW50cnlfYnVpbGQoCisJCW9wLCBpbmRleCwgZW50cnksIHNwYWNl
LCBwYWdlX25vLAorCQlub19jb3VudGVyID8gVUxJTlRfVU5ERUZJTkVEIDogMHhGRkZGLCBoZWFw
KTsKKworCS8qIE9wZW4gYSBjdXJzb3IgdG8gdGhlIGluc2VydCBidWZmZXIgdHJlZSB0byBjYWxj
dWxhdGUgaWYgd2UgY2FuIGFkZAorCXRoZSBuZXcgZW50cnkgdG8gaXQgd2l0aG91dCBleGNlZWRp
bmcgdGhlIGZyZWUgc3BhY2UgbGltaXQgZm9yIHRoZQorCXBhZ2UuICovCiAKIAlpZiAobW9kZSA9
PSBCVFJfTU9ESUZZX1RSRUUpIHsKLQkJbXV0ZXhfZW50ZXIoJmlidWZfcGVzc2ltaXN0aWNfaW5z
ZXJ0X211dGV4KTsKKwkJZm9yICg7OykgeworCQkJbXV0ZXhfZW50ZXIoJmlidWZfcGVzc2ltaXN0
aWNfaW5zZXJ0X211dGV4KTsKIAotCQlpYnVmX2VudGVyKCk7CisJCQlpYnVmX2VudGVyKCk7CiAK
LQkJbXV0ZXhfZW50ZXIoJmlidWZfbXV0ZXgpOworCQkJbXV0ZXhfZW50ZXIoJmlidWZfbXV0ZXgp
OwogCi0JCXdoaWxlICghaWJ1Zl9kYXRhX2Vub3VnaF9mcmVlX2Zvcl9pbnNlcnQoKSkgeworCQkJ
aWYgKFVOSVZfTElLRUxZKGlidWZfZGF0YV9lbm91Z2hfZnJlZV9mb3JfaW5zZXJ0KCkpKSB7CisK
KwkJCQlicmVhazsKKwkJCX0KIAogCQkJbXV0ZXhfZXhpdCgmaWJ1Zl9tdXRleCk7CiAKQEAgLTMz
NTEsMzkgKzMzODAsMTYgQEAgaWJ1Zl9pbnNlcnRfbG93KAogCiAJCQllcnIgPSBpYnVmX2FkZF9m
cmVlX3BhZ2UoKTsKIAotCQkJaWYgKGVyciA9PSBEQl9TVFJPTkdfRkFJTCkgeworCQkJaWYgKFVO
SVZfVU5MSUtFTFkoZXJyID09IERCX1NUUk9OR19GQUlMKSkgewogCisJCQkJbWVtX2hlYXBfZnJl
ZShoZWFwKTsKIAkJCQlyZXR1cm4oZXJyKTsKIAkJCX0KLQotCQkJbXV0ZXhfZW50ZXIoJmlidWZf
cGVzc2ltaXN0aWNfaW5zZXJ0X211dGV4KTsKLQotCQkJaWJ1Zl9lbnRlcigpOwotCi0JCQltdXRl
eF9lbnRlcigmaWJ1Zl9tdXRleCk7CiAJCX0KIAl9IGVsc2UgewogCQlpYnVmX2VudGVyKCk7CiAJ
fQogCi0JaGVhcCA9IG1lbV9oZWFwX2NyZWF0ZSg1MTIpOwotCi0JLyogQnVpbGQgdGhlIGVudHJ5
IHdoaWNoIGNvbnRhaW5zIHRoZSBzcGFjZSBpZCBhbmQgdGhlIHBhZ2UgbnVtYmVyCi0JYXMgdGhl
IGZpcnN0IGZpZWxkcyBhbmQgdGhlIHR5cGUgaW5mb3JtYXRpb24gZm9yIG90aGVyIGZpZWxkcywg
YW5kCi0Jd2hpY2ggd2lsbCBiZSBpbnNlcnRlZCB0byB0aGUgaW5zZXJ0IGJ1ZmZlci4gVXNpbmcg
YSBjb3VudGVyIHZhbHVlCi0Jb2YgMHhGRkZGIHdlIGZpbmQgdGhlIGxhc3QgcmVjb3JkIGZvciAo
c3BhY2UsIHBhZ2Vfbm8pLCBmcm9tIHdoaWNoCi0Jd2UgY2FuIHRoZW4gcmVhZCB0aGUgY291bnRl
ciB2YWx1ZSBOIGFuZCB1c2UgTiArIDEgaW4gdGhlIHJlY29yZCB3ZQotCWluc2VydC4gKFdlIHBh
dGNoIHRoZSBpYnVmX2VudHJ5J3MgY291bnRlciBmaWVsZCB0byB0aGUgY29ycmVjdAotCXZhbHVl
IGp1c3QgYmVmb3JlIGFjdHVhbGx5IGluc2VydGluZyB0aGUgZW50cnkuKSAqLwotCi0JaWJ1Zl9l
bnRyeSA9IGlidWZfZW50cnlfYnVpbGQoCi0JCW9wLCBpbmRleCwgZW50cnksIHNwYWNlLCBwYWdl
X25vLAotCQlub19jb3VudGVyID8gVUxJTlRfVU5ERUZJTkVEIDogMHhGRkZGLCBoZWFwKTsKLQot
CS8qIE9wZW4gYSBjdXJzb3IgdG8gdGhlIGluc2VydCBidWZmZXIgdHJlZSB0byBjYWxjdWxhdGUg
aWYgd2UgY2FuIGFkZAotCXRoZSBuZXcgZW50cnkgdG8gaXQgd2l0aG91dCBleGNlZWRpbmcgdGhl
IGZyZWUgc3BhY2UgbGltaXQgZm9yIHRoZQotCXBhZ2UuICovCi0KIAltdHJfc3RhcnQoJm10cik7
CiAKIAlidHJfcGN1cl9vcGVuKGlidWYtPmluZGV4LCBpYnVmX2VudHJ5LCBQQUdFX0NVUl9MRSwg
bW9kZSwgJnBjdXIsICZtdHIpOwpAQCAtNDExOCw5ICs0MTI0LDggQEAgaWJ1Zl9kZWxldGVfcmVj
KAogCWJ0cl9wY3VyX2NvbW1pdF9zcGVjaWZ5X210cihwY3VyLCBtdHIpOwogCiBmdW5jX2V4aXQ6
Ci0JYnRyX3BjdXJfY2xvc2UocGN1cik7Ci0KIAltdXRleF9leGl0KCZpYnVmX211dGV4KTsKKwli
dHJfcGN1cl9jbG9zZShwY3VyKTsKIAogCXJldHVybihUUlVFKTsKIH0KQEAgLTQ0OTUsNiArNDUw
MCwxMSBAQCByZXNldF9iaXQ6CiAJYnRyX3BjdXJfY2xvc2UoJnBjdXIpOwogCW1lbV9oZWFwX2Zy
ZWUoaGVhcCk7CiAKKyNpZmRlZiBIQVZFX0FUT01JQ19CVUlMVElOUworCW9zX2F0b21pY19pbmNy
ZW1lbnRfdWxpbnQoJmlidWYtPm5fbWVyZ2VzLCAxKTsKKwlpYnVmX2FkZF9vcHMoaWJ1Zi0+bl9t
ZXJnZWRfb3BzLCBtb3BzKTsKKwlpYnVmX2FkZF9vcHMoaWJ1Zi0+bl9kaXNjYXJkZWRfb3BzLCBk
b3BzKTsKKyNlbHNlIC8qIEhBVkVfQVRPTUlDX0JVSUxUSU5TICovCiAJLyogUHJvdGVjdCBvdXIg
c3RhdGlzdGljcyBrZWVwaW5nIGZyb20gcmFjZSBjb25kaXRpb25zICovCiAJbXV0ZXhfZW50ZXIo
JmlidWZfbXV0ZXgpOwogCkBAIC00NTAzLDYgKzQ1MTMsNyBAQCByZXNldF9iaXQ6CiAJaWJ1Zl9h
ZGRfb3BzKGlidWYtPm5fZGlzY2FyZGVkX29wcywgZG9wcyk7CiAKIAltdXRleF9leGl0KCZpYnVm
X211dGV4KTsKKyNlbmRpZiAvKiBIQVZFX0FUT01JQ19CVUlMVElOUyAqLwogCiAJaWYgKHVwZGF0
ZV9pYnVmX2JpdG1hcCAmJiAhdGFibGVzcGFjZV9iZWluZ19kZWxldGVkKSB7CiAKQEAgLTQ2MDQs
MTAgKzQ2MTUsMTQgQEAgbGVhdmVfbG9vcDoKIAltdHJfY29tbWl0KCZtdHIpOwogCWJ0cl9wY3Vy
X2Nsb3NlKCZwY3VyKTsKIAorI2lmZGVmIEhBVkVfQVRPTUlDX0JVSUxUSU5TCisJaWJ1Zl9hZGRf
b3BzKGlidWYtPm5fZGlzY2FyZGVkX29wcywgZG9wcyk7CisjZWxzZSAvKiBIQVZFX0FUT01JQ19C
VUlMVElOUyAqLwogCS8qIFByb3RlY3Qgb3VyIHN0YXRpc3RpY3Mga2VlcGluZyBmcm9tIHJhY2Ug
Y29uZGl0aW9ucyAqLwogCW11dGV4X2VudGVyKCZpYnVmX211dGV4KTsKIAlpYnVmX2FkZF9vcHMo
aWJ1Zi0+bl9kaXNjYXJkZWRfb3BzLCBkb3BzKTsKIAltdXRleF9leGl0KCZpYnVmX211dGV4KTsK
KyNlbmRpZiAvKiBIQVZFX0FUT01JQ19CVUlMVElOUyAqLwogCiAJaWJ1Zl9leGl0KCk7CiAKQEAg
LTQ2NTIsMTAgKzQ2NjcsMTAgQEAgaWJ1Zl9pc19lbXB0eSh2b2lkKQogCQlpc19lbXB0eSA9IEZB
TFNFOwogCX0KIAotCW10cl9jb21taXQoJm10cik7Ci0KIAltdXRleF9leGl0KCZpYnVmX211dGV4
KTsKIAorCW10cl9jb21taXQoJm10cik7CisKIAlpYnVmX2V4aXQoKTsKIAogCXJldHVybihpc19l
bXB0eSk7Cgo=

--===============0235039165==
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: b48147d9335c25064f7375b6455e55a5103ac7a2
# timestamp: 2010-08-09 11:58:47 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: inaam.rana@stripped\
#   fa9g6qagqzbkpfbk
# 
# Begin bundle
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
akf4cv0/8XckU4UJBc5V4MA=


--===============0235039165==--