From: marko.makela
Date: October 27 2010 6:57am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3206) Bug#57707
List-Archive: http://lists.mysql.com/commits/122021
X-Bug: 57707
Message-Id: <201010270657.o9R62RgB020317@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0325938532=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAyNzA2NTQyMC16cnU1
cHZjNnU4c2JtcmpnCgogMzIwNiBNYXJrbyBNw6RrZWzDpAkyMDEwLTEwLTI3CiAgICAgIEJ1ZyAj
NTc3MDcgSW5ub0RCIGJ1Zl9wYWdlX3Qgc2l6ZSBoYXMgZG91YmxlZCBvbiAzMi1iaXQgc3lzdGVt
cwogICAgICAKICAgICAgYnVmX3BhZ2VfdDogUmVtb3ZlIHRoZSBidWZfcG9vbCBwb2ludGVyLiBB
ZGQgYnVmX3Bvb2xfaW5kZXg6NiBuZXh0IHRvCiAgICAgIGJ1Zl9maXhfY291bnQ6MTkgKGl0IHdh
cyBidWZfZml4X2NvdW50OjI1KS4gVGhpcyB3aWxsIGxpbWl0IHRoZSBudW1iZXIKICAgICAgb2Yg
Y29uY3VycmVudCB0cmFuc2FjdGlvbnMgdG8gc29tZXdoZXJlIGFyb3VuZCA1MjQsMjg4LgogICAg
ICAKICAgICAgYnVmX3Bvb2xfaW5kZXgoYnVmX3Bvb2wpOiBBIG5ldyBmdW5jdGlvbiB0byBkZXRl
cm1pbmUgdGhlIGluZGV4IG9mIGEKICAgICAgYnVmZmVyIHBvb2wgaW4gYnVmX3Bvb2xfcHRyW10u
CiAgICAgIAogICAgICBidWZfcG9vbF9wdHI6IE1ha2UgdGhpcyBhIGR5bmFtaWNhbGx5IGFsbG9j
YXRlZCBhcnJheSBpbnN0ZWFkIG9mIGFuCiAgICAgIGFycmF5IG9mIHBvaW50ZXJzLiBBbGxvY2F0
ZSB0aGUgYXJyYXkgaW4gYnVmX3Bvb2xfaW5pdCgpIGFuZCBmcmVlIGluCiAgICAgIGJ1Zl9wb29s
X2ZyZWUoKS4KICAgICAgCiAgICAgIGJ1Zl9wb29sX2ZyZWVfaW5zdGFuY2UoKTogTm8gbG9uZ2Vy
IGZyZWUgdGhlIGJ1Zl9wb29sIG9iamVjdCwgYXMgaXQgaXMKICAgICAgYWxsb2NhdGVkIGZyb20g
YSBiaWcgYXJyYXkuCiAgICAgIAogICAgICBidWZfcG9vbF9mcm9tX2JwYWdlKCksIGJ1Zl9wb29s
X2Zyb21fYmxvY2soKTogTW92ZSB0aGUgZGVmaW5pdGlvbnMgdG8KICAgICAgdGhlIGJlZ2lubmlu
ZyBvZiB0aGUgZmlsZXMsIGJlY2F1c2Ugc29tZSBjb21waWxlcnMgaGF2ZSAoaGFkKSBwcm9ibGVt
cwogICAgICB3aXRoIGZvcndhcmQgZGVmaW5pdGlvbnMgb2YgaW5saW5lIGZ1bmN0aW9ucy4gQ2Fs
Y3VsYXRlIHRoZSBidWZmZXIKICAgICAgcG9vbCBmcm9tIGJ1Zl9wb29sX2luZGV4LgogICAgICAK
ICAgICAgYnVmX3Bvb2xfZnJvbV9hcnJheSgpOiBBZGQgZGVidWcgYXNzZXJ0aW9ucyBmb3IgaW5w
dXQgdmFsaWRhdGlvbi4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idWYv
YnVmMGJ1Zi5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYwYnVmLmgKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1ZjBidWYuaWMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9idWYv
YnVmMGJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDI3MDY1NDIwLXpy
dTVwdmM2dThzYm1yamcKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1Zi5jCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDI3MDY1NjU2LWdydTVyN2szcXF5dTY0bDkK
QEAgLTI0Niw4ICsyNDYsOCBAQCBzdGF0aWMgY29uc3QgaW50IFdBSVRfRk9SX1JFQUQJPSA1MDAw
OwogLyoqIE51bWJlciBvZiBhdHRlbXRwcyBtYWRlIHRvIHJlYWQgaW4gYSBwYWdlIGluIHRoZSBi
dWZmZXIgcG9vbCAqLwogc3RhdGljIGNvbnN0IHVsaW50IEJVRl9QQUdFX1JFQURfTUFYX1JFVFJJ
RVMgPSAxMDA7CiAKLS8qKiBUaGUgYnVmZmVyIGJ1Zl9wb29sIG9mIHRoZSBkYXRhYmFzZSAqLwot
VU5JVl9JTlRFUk4gYnVmX3Bvb2xfdCoJYnVmX3Bvb2xfcHRyW01BWF9CVUZGRVJfUE9PTFNdOwor
LyoqIFRoZSBidWZmZXIgcG9vbHMgb2YgdGhlIGRhdGFiYXNlICovCitVTklWX0lOVEVSTiBidWZf
cG9vbF90KglidWZfcG9vbF9wdHI7CiAKICNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5l
ZCBVTklWX0JVRl9ERUJVRwogc3RhdGljIHVsaW50CWJ1Zl9kYmdfY291bnRlcgk9IDA7IC8qITwg
VGhpcyBpcyB1c2VkIHRvIGluc2VydCB2YWxpZGF0aW9uCkBAIC04NTgsNyArODU4LDcgQEAgYnVm
X2Jsb2NrX2luaXQoCiAKIAlibG9jay0+ZnJhbWUgPSBmcmFtZTsKIAotCWJsb2NrLT5wYWdlLmJ1
Zl9wb29sID0gYnVmX3Bvb2w7CisJYmxvY2stPnBhZ2UuYnVmX3Bvb2xfaW5kZXggPSBidWZfcG9v
bF9pbmRleChidWZfcG9vbCk7CiAJYmxvY2stPnBhZ2Uuc3RhdGUgPSBCVUZfQkxPQ0tfTk9UX1VT
RUQ7CiAJYmxvY2stPnBhZ2UuYnVmX2ZpeF9jb3VudCA9IDA7CiAJYmxvY2stPnBhZ2UuaW9fZml4
ID0gQlVGX0lPX05PTkU7CkBAIC0xMjgwLDggKzEyODAsNiBAQCBidWZfcG9vbF9mcmVlX2luc3Rh
bmNlKAogCW1lbV9mcmVlKGJ1Zl9wb29sLT5jaHVua3MpOwogCWhhc2hfdGFibGVfZnJlZShidWZf
cG9vbC0+cGFnZV9oYXNoKTsKIAloYXNoX3RhYmxlX2ZyZWUoYnVmX3Bvb2wtPnppcF9oYXNoKTsK
LQltZW1fZnJlZShidWZfcG9vbCk7Ci0JYnVmX3Bvb2wgPSBOVUxMOwogfQogCiAvKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KiovLyoqCkBAIC0xMjk0LDI1ICsxMjkyLDIyIEBAIGJ1Zl9wb29sX2luaXQoCiAJdWxpbnQJdG90
YWxfc2l6ZSwJLyohPCBpbjogc2l6ZSBvZiB0aGUgdG90YWwgcG9vbCBpbiBieXRlcyAqLwogCXVs
aW50CW5faW5zdGFuY2VzKQkvKiE8IGluOiBudW1iZXIgb2YgaW5zdGFuY2VzICovCiB7Ci0JdWxp
bnQJaTsKKwl1bGludAkJaTsKKwljb25zdCB1bGludAlzaXplCT0gdG90YWxfc2l6ZSAvIG5faW5z
dGFuY2VzOworCisJdXRfYWQobl9pbnN0YW5jZXMgPCBNQVhfQlVGRkVSX1BPT0xTKTsKKwl1dF9h
ZChuX2luc3RhbmNlcyA9PSBzcnZfYnVmX3Bvb2xfaW5zdGFuY2VzKTsKIAogCS8qIFdlIGNyZWF0
ZSBhbiBleHRyYSBidWZmZXIgcG9vbCBpbnN0YW5jZSwgdGhpcyBpbnN0YW5jZSBpcyB1c2VkCiAJ
Zm9yIGZsdXNoaW5nIHRoZSBmbHVzaCBsaXN0cywgdG8ga2VlcCB0cmFjayBvZiBuX2ZsdXNoIGZv
ciBhbGwKIAl0aGUgYnVmZmVyIHBvb2xzIGFuZCBhbHNvIHVzZWQgYXMgYSB3YWl0aW5nIG9iamVj
dCBkdXJpbmcgZmx1c2hpbmcuICovCi0JZm9yIChpID0gMDsgaSA8IG5faW5zdGFuY2VzOyBpKysp
IHsKLQkJYnVmX3Bvb2xfdCoJcHRyOwotCQl1bGludAkJc2l6ZTsKLQotCQlwdHIgPSBtZW1femFs
bG9jKHNpemVvZigqcHRyKSk7CisJYnVmX3Bvb2xfcHRyID0gbWVtX3phbGxvYyhuX2luc3RhbmNl
cyAqIHNpemVvZiAqYnVmX3Bvb2xfcHRyKTsKIAotCQlzaXplID0gdG90YWxfc2l6ZSAvIG5faW5z
dGFuY2VzOwotCi0JCWJ1Zl9wb29sX3B0cltpXSA9IHB0cjsKKwlmb3IgKGkgPSAwOyBpIDwgbl9p
bnN0YW5jZXM7IGkrKykgeworCQlidWZfcG9vbF90KglwdHIJPSAmYnVmX3Bvb2xfcHRyW2ldOwog
CiAJCWlmIChidWZfcG9vbF9pbml0X2luc3RhbmNlKHB0ciwgc2l6ZSwgaSkgIT0gREJfU1VDQ0VT
UykgewogCi0JCQltZW1fZnJlZShidWZfcG9vbF9wdHJbaV0pOwotCiAJCQkvKiBGcmVlIGFsbCB0
aGUgaW5zdGFuY2VzIGNyZWF0ZWQgc28gZmFyLiAqLwogCQkJYnVmX3Bvb2xfZnJlZShpKTsKIApA
QCAtMTM0MSw4ICsxMzM2LDEwIEBAIGJ1Zl9wb29sX2ZyZWUoCiAKIAlmb3IgKGkgPSAwOyBpIDwg
bl9pbnN0YW5jZXM7IGkrKykgewogCQlidWZfcG9vbF9mcmVlX2luc3RhbmNlKGJ1Zl9wb29sX2Zy
b21fYXJyYXkoaSkpOwotCQlidWZfcG9vbF9wdHJbaV0gPSBOVUxMOwogCX0KKworCW1lbV9mcmVl
KGJ1Zl9wb29sX3B0cik7CisJYnVmX3Bvb2xfcHRyID0gTlVMTDsKIH0KIAogLyoqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ly8qKgpAQCAtMzY4NSw3ICszNjgyLDcgQEAgZXJyX2V4aXQ6CiAJCWJwYWdlID0gYnVmX2J1ZGR5
X2FsbG9jKGJ1Zl9wb29sLCBzaXplb2YgKmJwYWdlLCAmbHJ1KTsKIAogCQkvKiBJbml0aWFsaXpl
IHRoZSBidWZfcG9vbCBwb2ludGVyLiAqLwotCQlicGFnZS0+YnVmX3Bvb2wgPSBidWZfcG9vbDsK
KwkJYnBhZ2UtPmJ1Zl9wb29sX2luZGV4ID0gYnVmX3Bvb2xfaW5kZXgoYnVmX3Bvb2wpOwogCiAJ
CS8qIElmIGJ1Zl9idWRkeV9hbGxvYygpIGFsbG9jYXRlZCBzdG9yYWdlIGZyb20gdGhlIExSVSBs
aXN0LAogCQlpdCByZWxlYXNlZCBhbmQgcmVhY3F1aXJlZCBidWZfcG9vbC0+bXV0ZXguICBUaHVz
LCB3ZSBtdXN0Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1
ZjBidWYuaCcKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1ZjBidWYuaAlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAyNzA2NTQyMC16cnU1cHZjNnU4c2JtcmpnCisr
KyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYwYnVmLmgJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMDEwMjcwNjU2NTYtZ3J1NXI3azNxcXl1NjRsOQpAQCAtNjksNyArNjks
NyBAQCBDcmVhdGVkIDExLzUvMTk5NSBIZWlra2kgVHV1cmkKICNkZWZpbmUgQlVGX1BPT0xfV0FU
Q0hfU0laRSAxCQkvKiE8IE1heGltdW0gbnVtYmVyIG9mIGNvbmN1cnJlbnQKIAkJCQkJYnVmZmVy
IHBvb2wgd2F0Y2hlcyAqLwogCi1leHRlcm4JYnVmX3Bvb2xfdCoJYnVmX3Bvb2xfcHRyW01BWF9C
VUZGRVJfUE9PTFNdOyAvKiE8IFRoZSBidWZmZXIgcG9vbHMKK2V4dGVybglidWZfcG9vbF90Kgli
dWZfcG9vbF9wdHI7CS8qITwgVGhlIGJ1ZmZlciBwb29scwogCQkJCQlvZiB0aGUgZGF0YWJhc2Ug
Ki8KICNpZmRlZiBVTklWX0RFQlVHCiBleHRlcm4gaWJvb2wJCWJ1Zl9kZWJ1Z19wcmludHM7Lyoh
PCBJZiB0aGlzIGlzIHNldCBUUlVFLCB0aGUgcHJvZ3JhbQpAQCAtMTAzNCw2ICsxMDM0LDE1IEBA
IGJ1Zl9wYWdlX2FkZHJlc3NfZm9sZCgKIAl1bGludAlzcGFjZSwJLyohPCBpbjogc3BhY2UgaWQg
Ki8KIAl1bGludAlvZmZzZXQpCS8qITwgaW46IG9mZnNldCBvZiB0aGUgcGFnZSB3aXRoaW4gc3Bh
Y2UgKi8KIAlfX2F0dHJpYnV0ZV9fKChjb25zdCkpOworLyoqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgorQ2FsY3Vs
YXRlcyB0aGUgaW5kZXggb2YgYSBidWZmZXIgcG9vbCB0byB0aGUgYnVmX3Bvb2xbXSBhcnJheS4K
K0ByZXR1cm4JdGhlIHBvc2l0aW9uIG9mIHRoZSBidWZmZXIgcG9vbCBpbiBidWZfcG9vbFtdICov
CitVTklWX0lOTElORQordWxpbnQKK2J1Zl9wb29sX2luZGV4KAorLyo9PT09PT09PT09PSovCisJ
Y29uc3QgYnVmX3Bvb2xfdCoJYnVmX3Bvb2wpCS8qITwgaW46IGJ1ZmZlciBwb29sICovCisJX19h
dHRyaWJ1dGVfXygobm9ubnVsbCwgY29uc3QpKTsKIC8qKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBSZXR1cm5zIHRo
ZSBidWZmZXIgcG9vbCBpbnN0YW5jZSBnaXZlbiBhIHBhZ2UgaW5zdGFuY2UKIEByZXR1cm4gYnVm
X3Bvb2wgKi8KQEAgLTEwNjUsOCArMTA3NCw5IEBAIFJldHVybnMgdGhlIGJ1ZmZlciBwb29sIGlu
c3RhbmNlIGdpdmVuIGkKIFVOSVZfSU5MSU5FCiBidWZfcG9vbF90KgogYnVmX3Bvb2xfZnJvbV9h
cnJheSgKLS8qPT09PT09PT09PT09PT09PT09PT0qLwotCXVsaW50CWluZGV4KTsJLyohPCBpbjog
YXJyYXkgaW5kZXggdG8gZ2V0IGJ1ZmZlciBwb29sIGluc3RhbmNlIGZyb20gKi8KKy8qPT09PT09
PT09PT09PT09PSovCisJdWxpbnQJaW5kZXgpOwkJLyohPCBpbjogYXJyYXkgaW5kZXggdG8gZ2V0
CisJCQkJYnVmZmVyIHBvb2wgaW5zdGFuY2UgZnJvbSAqLwogLyoqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFJldHVy
bnMgdGhlIGNvbnRyb2wgYmxvY2sgb2YgYSBmaWxlIHBhZ2UsIE5VTEwgaWYgbm90IGZvdW5kLgog
QHJldHVybglibG9jaywgTlVMTCBpZiBub3QgZm91bmQgKi8KQEAgLTEyMDQsOCArMTIxNCwxMyBA
QCBzdHJ1Y3QgYnVmX3BhZ2Vfc3RydWN0ewogCXVuc2lnbmVkCWlvX2ZpeDoyOwkvKiE8IHR5cGUg
b2YgcGVuZGluZyBJL08gb3BlcmF0aW9uOwogCQkJCQlhbHNvIHByb3RlY3RlZCBieSBidWZfcG9v
bC0+bXV0ZXgKIAkJCQkJQHNlZSBlbnVtIGJ1Zl9pb19maXggKi8KLQl1bnNpZ25lZAlidWZfZml4
X2NvdW50OjI1Oy8qITwgY291bnQgb2YgaG93IG1hbnlmb2xkIHRoaXMgYmxvY2sKKwl1bnNpZ25l
ZAlidWZfZml4X2NvdW50OjE5Oy8qITwgY291bnQgb2YgaG93IG1hbnlmb2xkIHRoaXMgYmxvY2sK
IAkJCQkJaXMgY3VycmVudGx5IGJ1ZmZlcmZpeGVkICovCisJdW5zaWduZWQJYnVmX3Bvb2xfaW5k
ZXg6NjsvKiE8IGluZGV4IG51bWJlciBvZiB0aGUgYnVmZmVyIHBvb2wKKwkJCQkJdGhhdCB0aGlz
IGJsb2NrIGJlbG9uZ3MgdG8gKi8KKyMgaWYgTUFYX0JVRkZFUl9QT09MUyA+IDY0CisjICBlcnJv
ciAiTUFYX0JVRkZFUl9QT09MUyA+IDY0OyByZWRlZmluZSBidWZfcG9vbF9pbmRleDo2IgorIyBl
bmRpZgogCS8qIEB9ICovCiAjZW5kaWYgLyogIVVOSVZfSE9UQkFDS1VQICovCiAJcGFnZV96aXBf
ZGVzX3QJemlwOwkJLyohPCBjb21wcmVzc2VkIHBhZ2U7IHppcC5kYXRhCkBAIC0xMzI0LDggKzEz
MzksNiBAQCBzdHJ1Y3QgYnVmX3BhZ2Vfc3RydWN0ewogCQkJCQlmcmVlcyBhIHBhZ2UgaW4gYnVm
ZmVyIHBvb2wgKi8KICMgZW5kaWYgLyogVU5JVl9ERUJVR19GSUxFX0FDQ0VTU0VTICovCiAjZW5k
aWYgLyogIVVOSVZfSE9UQkFDS1VQICovCi0JYnVmX3Bvb2xfdCoJYnVmX3Bvb2w7CS8qITwgYnVm
ZmVyIHBvb2wgaW5zdGFuY2UgdGhpcwotCQkJCQlwYWdlIGJlbG9uZ3MgdG8gKi8KIH07CiAKIC8q
KiBUaGUgYnVmZmVyIGNvbnRyb2wgYmxvY2sgc3RydWN0dXJlICovCgo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1ZjBidWYuaWMnCi0tLSBhL3N0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS9idWYwYnVmLmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTAxMDI3MDY1NDIwLXpydTVwdmM2dThzYm1yamcKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNs
dWRlL2J1ZjBidWYuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEwMjcwNjU2
NTYtZ3J1NXI3azNxcXl1NjRsOQpAQCAtNDYsNiArNDYsNDggQEAgYnVmX3Bvb2xfZ2V0X2N1cnJf
c2l6ZSh2b2lkKQogCXJldHVybihzcnZfYnVmX3Bvb2xfY3Vycl9zaXplKTsKIH0KIAorLyoqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqLy8qKgorQ2FsY3VsYXRlcyB0aGUgaW5kZXggb2YgYSBidWZmZXIgcG9vbCB0byB0aGUg
YnVmX3Bvb2xbXSBhcnJheS4KK0ByZXR1cm4JdGhlIHBvc2l0aW9uIG9mIHRoZSBidWZmZXIgcG9v
bCBpbiBidWZfcG9vbFtdICovCitVTklWX0lOTElORQordWxpbnQKK2J1Zl9wb29sX2luZGV4KAor
Lyo9PT09PT09PT09PSovCisJY29uc3QgYnVmX3Bvb2xfdCoJYnVmX3Bvb2wpCS8qITwgaW46IGJ1
ZmZlciBwb29sICovCit7CisJdWxpbnQJaSA9IGJ1Zl9wb29sIC0gYnVmX3Bvb2xfcHRyOworCXV0
X2FkKGkgPCBNQVhfQlVGRkVSX1BPT0xTKTsKKwl1dF9hZChpIDwgc3J2X2J1Zl9wb29sX2luc3Rh
bmNlcyk7CisJcmV0dXJuKGkpOworfQorCisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgorUmV0dXJucyB0aGUgYnVm
ZmVyIHBvb2wgaW5zdGFuY2UgZ2l2ZW4gYSBwYWdlIGluc3RhbmNlCitAcmV0dXJuIGJ1Zl9wb29s
ICovCitVTklWX0lOTElORQorYnVmX3Bvb2xfdCoKK2J1Zl9wb29sX2Zyb21fYnBhZ2UoCisvKj09
PT09PT09PT09PT09PT0qLworCWNvbnN0IGJ1Zl9wYWdlX3QqCWJwYWdlKSAvKiE8IGluOiBidWZm
ZXIgcG9vbCBwYWdlICovCit7CisJdWxpbnQJaTsKKwlpID0gYnBhZ2UtPmJ1Zl9wb29sX2luZGV4
OworCXV0X2FkKGkgPCBzcnZfYnVmX3Bvb2xfaW5zdGFuY2VzKTsKKwlyZXR1cm4oJmJ1Zl9wb29s
X3B0cltpXSk7Cit9CisKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCitSZXR1cm5zIHRoZSBidWZmZXIgcG9vbCBp
bnN0YW5jZSBnaXZlbiBhIGJsb2NrIGluc3RhbmNlCitAcmV0dXJuIGJ1Zl9wb29sICovCitVTklW
X0lOTElORQorYnVmX3Bvb2xfdCoKK2J1Zl9wb29sX2Zyb21fYmxvY2soCisvKj09PT09PT09PT09
PT09PT0qLworCWNvbnN0IGJ1Zl9ibG9ja190KglibG9jaykgLyohPCBpbjogYmxvY2sgKi8KK3sK
KwlyZXR1cm4oYnVmX3Bvb2xfZnJvbV9icGFnZSgmYmxvY2stPnBhZ2UpKTsKK30KKwogLyoqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKi8vKioKIEdldHMgdGhlIGN1cnJlbnQgc2l6ZSBvZiBidWZmZXIgYnVmX3Bvb2wgaW4g
cGFnZXMuCiBAcmV0dXJuIHNpemUgaW4gcGFnZXMqLwpAQCAtODg2LDMzICs5MjgsNiBAQCBidWZf
YmxvY2tfYnVmX2ZpeF9kZWMoCiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCi1SZXR1cm5zIHRoZSBidWZm
ZXIgcG9vbCBpbnN0YW5jZSBnaXZlbiBhIHBhZ2UgaW5zdGFuY2UKLUByZXR1cm4gYnVmX3Bvb2wg
Ki8KLVVOSVZfSU5MSU5FCi1idWZfcG9vbF90KgotYnVmX3Bvb2xfZnJvbV9icGFnZSgKLS8qPT09
PT09PT09PT09PT09PSovCi0JY29uc3QgYnVmX3BhZ2VfdCoJYnBhZ2UpIC8qITwgaW46IGJ1ZmZl
ciBwb29sIHBhZ2UgKi8KLXsKLQkvKiBFdmVyeSBwYWdlIG11c3QgYmUgaW4gc29tZSBidWZmZXIg
cG9vbC4gKi8KLQl1dF9hZChicGFnZS0+YnVmX3Bvb2wgIT0gTlVMTCk7Ci0KLQlyZXR1cm4oYnBh
Z2UtPmJ1Zl9wb29sKTsKLX0KLQotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKLVJldHVybnMgdGhlIGJ1ZmZlciBw
b29sIGluc3RhbmNlIGdpdmVuIGEgYmxvY2sgaW5zdGFuY2UKLUByZXR1cm4gYnVmX3Bvb2wgKi8K
LVVOSVZfSU5MSU5FCi1idWZfcG9vbF90KgotYnVmX3Bvb2xfZnJvbV9ibG9jaygKLS8qPT09PT09
PT09PT09PT09PSovCi0JY29uc3QgYnVmX2Jsb2NrX3QqCWJsb2NrKSAvKiE8IGluOiBibG9jayAq
LwotewotCXJldHVybihidWZfcG9vbF9mcm9tX2JwYWdlKCZibG9jay0+cGFnZSkpOwotfQotCi0v
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqLy8qKgogUmV0dXJucyB0aGUgYnVmZmVyIHBvb2wgaW5zdGFuY2UgZ2l2ZW4gc3Bh
Y2UgYW5kIG9mZnNldCBvZiBwYWdlCiBAcmV0dXJuIGJ1ZmZlciBwb29sICovCiBVTklWX0lOTElO
RQpAQCAtOTI5LDcgKzk0NCw3IEBAIGJ1Zl9wb29sX2dldCgKIAlpZ25vcmVkX29mZnNldCA9IG9m
ZnNldCA+PiA2OyAvKiAybG9nIG9mIEJVRl9SRUFEX0FIRUFEX0FSRUEgKDY0KSovCiAJZm9sZCA9
IGJ1Zl9wYWdlX2FkZHJlc3NfZm9sZChzcGFjZSwgaWdub3JlZF9vZmZzZXQpOwogCWluZGV4ID0g
Zm9sZCAlIHNydl9idWZfcG9vbF9pbnN0YW5jZXM7Ci0JcmV0dXJuIGJ1Zl9wb29sX3B0cltpbmRl
eF07CisJcmV0dXJuKCZidWZfcG9vbF9wdHJbaW5kZXhdKTsKIH0KIAogLyoqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioK
QEAgLTkzOSwxMCArOTU0LDEyIEBAIFVOSVZfSU5MSU5FCiBidWZfcG9vbF90KgogYnVmX3Bvb2xf
ZnJvbV9hcnJheSgKIC8qPT09PT09PT09PT09PT09PSovCi0JdWxpbnQJaW5kZXgpIAkJLyohPCBp
bjogYXJyYXkgaW5kZXggdG8gZ2V0CisJdWxpbnQJaW5kZXgpCQkvKiE8IGluOiBhcnJheSBpbmRl
eCB0byBnZXQKIAkJCQlidWZmZXIgcG9vbCBpbnN0YW5jZSBmcm9tICovCiB7Ci0JcmV0dXJuIGJ1
Zl9wb29sX3B0cltpbmRleF07CisJdXRfYWQoaW5kZXggPCBNQVhfQlVGRkVSX1BPT0xTKTsKKwl1
dF9hZChpbmRleCA8IHNydl9idWZfcG9vbF9pbnN0YW5jZXMpOworCXJldHVybigmYnVmX3Bvb2xf
cHRyW2luZGV4XSk7CiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCgo=

--===============0325938532==
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: dfd8cebac210f00531eecb360ad1d4ed5cc4459f
# timestamp: 2010-10-27 09:57:05 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   zru5pvc6u8sbmrjg
# 
# Begin bundle
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
BFPK0CvpWAv/Fvt/+LuSKcKEhPY3OpA=


--===============0325938532==--