From: marko.makela
Date: March 15 2011 11:13am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3716 to 3717)
 Bug#11849231
List-Archive: http://lists.mysql.com/commits/133000
X-Bug: 11849231
Message-Id: <201103151113.p2FBDg6B017629@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1718129190=="

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

IDM3MTcgTWFya28gTcOka2Vsw6QJMjAxMS0wMy0xNQogICAgICBCdWcjMTE4NDkyMzEgaW5mbGF0
ZUluaXQoKSBpbnZva2VkIHdpdGhvdXQgaW5pdGlhbGl6aW5nIGFsbCBtZW1vcnkKICAgICAgCiAg
ICAgIEFjY29yZGluZyB0byB0aGUgemxpYiBkb2N1bWVudGF0aW9uLCBuZXh0X2luIGFuZCBhdmFp
bF9pbgogICAgICBtdXN0IGJlIGluaXRpYWxpemVkIGJlZm9yZSBpbnZva2luZyBpbmZsYXRlSW5p
dCBvciBpbmZsYXRlSW5pdDIuCiAgICAgIEZ1cnRoZXJtb3JlLCB0aGUgemFsbG9jIGZ1bmN0aW9u
IG11c3QgY2xlYXIgdGhlIGFsbG9jYXRlZCBtZW1vcnkuCiAgICAgIAogICAgICBidHJfY29weV96
YmxvYl9wcmVmaXgoKTogUmVwbGFjZSB0aGUgZF9zdHJlYW0gcGFyYW1ldGVyIHdpdGggYnVmLGxl
bgogICAgICBhbmQgcmV0dXJuIHRoZSBjb3BpZWQgbGVuZ3RoLgogICAgICAKICAgICAgcGFnZV96
aXBfZGVjb21wcmVzcygpOiBJbnZva2UgaW5mbGF0ZUluaXQyIGEgbGl0dGxlIGxhdGVyLgogICAg
ICAKICAgICAgcGFnZV96aXBfemFsbG9jKCk6IFJlbmFtZSBmcm9tIHBhZ2VfemlwX2FsbG9jKCku
CiAgICAgIEludm9rZSBtZW1faGVhcF96YWxsb2MoKSBpbnN0ZWFkIG9mIG1lbV9oZWFwX2FsbG9j
KCkuCiAgICAgIAogICAgICByYjo2MTkgYXBwcm92ZWQgYnkgSmltbXkgWWFuZwoKICAgIG1vZGlm
aWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCiAgICAgIHN0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9idHIvYnRyMGN1ci5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9w
YWdlL3BhZ2UwemlwLmMKIDM3MTYgVmFzaWwgRGltb3YJMjAxMS0wMy0wMiBbbWVyZ2VdCiAgICAg
IE1lcmdlIG15c3FsLTUuMSAtPiBteXNxbC01LjEtaW5ub2RiCgogICAgcmVtb3ZlZDoKICAgICAg
bXlzcWwtdGVzdC9jb2xsZWN0aW9ucy9teXNxbC01LjEtYnVndGVhbS5kYWlseQogICAgICBteXNx
bC10ZXN0L2NvbGxlY3Rpb25zL215c3FsLTUuMS1idWd0ZWFtLnB1c2gKICAgIGFkZGVkOgogICAg
ICBteXNxbC10ZXN0L2V4dHJhL3JwbF90ZXN0cy9ycGxfaW5zZXJ0X2R1cGxpY2F0ZS50ZXN0CiAg
ICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi9yL2lubm9kYi1hdXRvaW5jLTU2MjI4
LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGItYXV0
b2luYy01NjIyOC1tYXN0ZXIub3B0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdp
bi90L2lubm9kYi1hdXRvaW5jLTU2MjI4LnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwv
ci9ycGxfaW5zZXJ0X2R1cGxpY2F0ZS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwv
dC9ycGxfaW5zZXJ0X2R1cGxpY2F0ZS50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3Zh
cnMvci9zZWN1cmVfZmlsZV9wcml2Mi5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNf
dmFycy90L3NlY3VyZV9maWxlX3ByaXYyLW1hc3Rlci5vcHQKICAgICAgbXlzcWwtdGVzdC9zdWl0
ZS9zeXNfdmFycy90L3NlY3VyZV9maWxlX3ByaXYyLnRlc3QKICAgIG1vZGlmaWVkOgogICAgICBS
RUFETUUKICAgICAgY2xpZW50L215X3JlYWRsaW5lLmgKICAgICAgY2xpZW50L215c3FsLmNjCiAg
ICAgIGNsaWVudC9teXNxbGR1bXAuYwogICAgICBjbGllbnQvcmVhZGxpbmUuY2MKICAgICAgY29u
ZmlndXJlLmluCiAgICAgIGluY2x1ZGUvY29uZmlnLXdpbi5oCiAgICAgIGluY2x1ZGUvbXlfYml0
LmgKICAgICAgaW5jbHVkZS9teV9iaXRtYXAuaAogICAgICBpbmNsdWRlL215X3B0aHJlYWQuaAog
ICAgICBpbmNsdWRlL215X3N5cy5oCiAgICAgIGluY2x1ZGUvbXlfdGltZS5oCiAgICAgIG15c3Fs
LXRlc3QvY29sbGVjdGlvbnMvZGVmYXVsdC53ZWVrbHkKICAgICAgbXlzcWwtdGVzdC9leHRyYS9y
cGxfdGVzdHMvcnBsX2luc2VydF9pZ25vcmUudGVzdAogICAgICBteXNxbC10ZXN0L2luY2x1ZGUv
Y29tbWl0LmluYwogICAgICBteXNxbC10ZXN0L2luY2x1ZGUvZ2lzX2tleXMuaW5jCiAgICAgIG15
c3FsLXRlc3QvaW5jbHVkZS9teXNxbGhvdGNvcHkuaW5jCiAgICAgIG15c3FsLXRlc3QvaW5jbHVk
ZS9ycGxfc3luYy5pbmMKICAgICAgbXlzcWwtdGVzdC9teXNxbC10ZXN0LXJ1bi5wbAogICAgICBt
eXNxbC10ZXN0L3IvY29tbWl0XzFpbm5vZGIucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9jc3Zf
bm90X251bGwucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9jdHlwZV9jcDEyNTBfY2gucmVzdWx0
CiAgICAgIG15c3FsLXRlc3Qvci9jdHlwZV9jcDEyNTEucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qv
ci9jdHlwZV9ldWNqcG1zLnJlc3VsdCoKICAgICAgbXlzcWwtdGVzdC9yL2RkbF9pMThuX2tvaThy
LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3IvZGRsX2kxOG5fdXRmOC5yZXN1bHQKICAgICAgbXlz
cWwtdGVzdC9yL2Z1bmNfdGltZS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL2dpcy5yZXN1bHQK
ICAgICAgbXlzcWwtdGVzdC9yL2dyYW50LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3IvZ3JvdXBf
YnkucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9pbnNlcnRfc2VsZWN0LnJlc3VsdAogICAgICBt
eXNxbC10ZXN0L3IvbXlzcWxkdW1wLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3Ivbm90X2VtYmVk
ZGVkX3NlcnZlci5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL29yZGVyX2J5LnJlc3VsdAogICAg
ICBteXNxbC10ZXN0L3IvcmFuZ2UucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci90eXBlX3llYXIu
cmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci91c2VyX3Zhci5yZXN1bHQKICAgICAgbXlzcWwtdGVz
dC9yL3htbC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9iaW5sb2cvci9iaW5sb2dfdW5z
YWZlLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2JpbmxvZy90L2JpbmxvZ191bnNhZmUu
dGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2VuZ2luZXMvZnVuY3Mvci9wc19zdHJpbmdfbm90
X251bGwucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvZW5naW5lcy9mdW5jcy90L3BzX3N0
cmluZ19ub3RfbnVsbC50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvZW5naW5lcy9pdWRzL3Iv
aW5zZXJ0X3llYXIucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2Ri
X2dpcy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2Ri
X2dpcy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvci9ycGxfY2lyY3VsYXJfZm9y
XzRfaG9zdHMucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3IvcnBsX2luc2VydF9p
Z25vcmUucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3QvZGlzYWJsZWQuZGVmCiAg
ICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3QvcnBsX2NpcmN1bGFyX2Zvcl80X2hvc3RzLnRlc3QK
ICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvdC9ycGxfaW5zZXJ0X2lnbm9yZS50ZXN0CiAgICAg
IG15c3FsLXRlc3QvdC9jc3Zfbm90X251bGwudGVzdAogICAgICBteXNxbC10ZXN0L3QvY3R5cGVf
Y3AxMjUwX2NoLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L2N0eXBlX2NwMTI1MS50ZXN0CiAgICAg
IG15c3FsLXRlc3QvdC9jdHlwZV9ldWNqcG1zLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L2Z1bmNf
dGltZS50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9naXMudGVzdAogICAgICBteXNxbC10ZXN0L3Qv
Z3JhbnQudGVzdAogICAgICBteXNxbC10ZXN0L3QvZ3JvdXBfYnkudGVzdAogICAgICBteXNxbC10
ZXN0L3QvaW5zZXJ0X3NlbGVjdC50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9teXNxbC50ZXN0CiAg
ICAgIG15c3FsLXRlc3QvdC9teXNxbGR1bXAudGVzdAogICAgICBteXNxbC10ZXN0L3Qvbm90X2Vt
YmVkZGVkX3NlcnZlci50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9vcmRlcl9ieS50ZXN0CiAgICAg
IG15c3FsLXRlc3QvdC9yYW5nZS50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC90eXBlX3llYXIudGVz
dAogICAgICBteXNxbC10ZXN0L3QvdXNlcl92YXIudGVzdAogICAgICBteXNxbC10ZXN0L3QvdmFy
aWFibGVzLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L3htbC50ZXN0CiAgICAgIG15c3lzL215X2Jp
dG1hcC5jCiAgICAgIG15c3lzL215X2ZvcGVuLmMKICAgICAgbXlzeXMvbXlfZ2V0c3lzdGltZS5j
CiAgICAgIHJlZ2V4L215X3JlZ2V4LmgKICAgICAgcmVnZXgvcmVnY29tcC5jCiAgICAgIHJlZ2V4
L3JlZ2luaXQuYwogICAgICBzcWwtY29tbW9uL215X3RpbWUuYwogICAgICBzcWwvZmllbGQuY2MK
ICAgICAgc3FsL2hhbmRsZXIuY2MKICAgICAgc3FsL2l0ZW0uaAogICAgICBzcWwvaXRlbV9jbXBm
dW5jLmNjCiAgICAgIHNxbC9pdGVtX2Z1bmMuY2MKICAgICAgc3FsL2l0ZW1fZ2VvZnVuYy5oCiAg
ICAgIHNxbC9sb2cuY2MKICAgICAgc3FsL215c3FsX3ByaXYuaAogICAgICBzcWwvbXlzcWxkLmNj
CiAgICAgIHNxbC9uZXRfc2Vydi5jYwogICAgICBzcWwvc2V0X3Zhci5jYwogICAgICBzcWwvc3Fs
X2Jhc2UuY2MKICAgICAgc3FsL3NxbF9jbGFzcy5oCiAgICAgIHNxbC9zcWxfY29ubmVjdC5jYwog
ICAgICBzcWwvc3FsX2luc2VydC5jYwogICAgICBzcWwvc3FsX2xvYWQuY2MKICAgICAgc3FsL3Nx
bF9wYXJzZS5jYwogICAgICBzcWwvc3FsX3JlcGwuY2MKICAgICAgc3FsL3NxbF9zZWxlY3QuY2MK
ICAgICAgc3FsL3NxbF9zaG93LmNjCiAgICAgIHNxbC9zcWxfc3RyaW5nLmgKICAgICAgc3FsL3Nx
bF92aWV3LmNjCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cKICAgICAgc3Rv
cmFnZS9pbm5vZGJfcGx1Z2luL2RpY3QvZGljdDBkaWN0LmMKICAgICAgc3RvcmFnZS9pbm5vZGJf
cGx1Z2luL2hhbmRsZXIvaGFfaW5ub2RiLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9o
YW5kbGVyL2lfcy5jYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS91bml2LmkK
ICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvdXQwdmVjLmgKICAgICAgc3RvcmFn
ZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvdXQwdmVjLmljCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi9sb2NrL2xvY2swbG9jay5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93
MG1lcmdlLmMKICAgICAgc3RvcmFnZS9teWlzYW0vbWlfY3JlYXRlLmMKICAgICAgc3RyaW5ncy94
bWwuYwogICAgICBzdXBwb3J0LWZpbGVzL215c3FsLnNwZWMuc2gKICAgICAgdGVzdHMvbXlzcWxf
Y2xpZW50X3Rlc3QuYwogICAgICB1bml0dGVzdC9teXN5cy9iaXRtYXAtdC5jCj09PSBtb2RpZmll
ZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nJwotLS0gYS9zdG9yYWdlL2lu
bm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTAz
MDIwODU5NDMtMnl3bHJ5NDJ1bWRmaHc1ZQorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hh
bmdlTG9nCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMzE1MTAwMTAyLXkxY3Jh
bHJhOWxheDZ3eWUKQEAgLTEsMyArMSw4IEBACisyMDExLTAzLTE1CVRoZSBJbm5vREIgVGVhbQor
CisJKiBidHIvYnRyMGN1ci5jLCBwYWdlL3BhZ2UwemlwLmM6CisJRml4IEJ1ZyMxMTg0OTIzMSBp
bmZsYXRlSW5pdCgpIGludm9rZWQgd2l0aG91dCBpbml0aWFsaXppbmcgYWxsIG1lbW9yeQorCiAy
MDExLTAyLTI4CVRoZSBJbm5vREIgVGVhbQogCiAJKiBidHIvYnRyMHNlYS5jLCBidWYvYnVmMGJ1
Zi5jLCBidWYvYnVmMGxydS5jOgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi9idHIvYnRyMGN1ci5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBj
dXIuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMzAyMDg1OTQzLTJ5d2xyeTQy
dW1kZmh3NWUKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwY3VyLmMJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAzMTUxMDAxMDIteTFjcmFscmE5bGF4Nnd5ZQpA
QCAtNDYyNywyNyArNDYyNyw0NSBAQCBidHJfY29weV9ibG9iX3ByZWZpeCgKIAogLyoqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KiovLyoqCiBDb3BpZXMgdGhlIHByZWZpeCBvZiBhIGNvbXByZXNzZWQgQkxPQi4gIFRoZSBjbHVz
dGVyZWQgaW5kZXggcmVjb3JkCi10aGF0IHBvaW50cyB0byB0aGlzIEJMT0IgbXVzdCBiZSBwcm90
ZWN0ZWQgYnkgYSBsb2NrIG9yIGEgcGFnZSBsYXRjaC4gKi8KK3RoYXQgcG9pbnRzIHRvIHRoaXMg
QkxPQiBtdXN0IGJlIHByb3RlY3RlZCBieSBhIGxvY2sgb3IgYSBwYWdlIGxhdGNoLgorQHJldHVy
bgludW1iZXIgb2YgYnl0ZXMgd3JpdHRlbiB0byBidWYgKi8KIHN0YXRpYwotdm9pZAordWxpbnQK
IGJ0cl9jb3B5X3pibG9iX3ByZWZpeCgKIC8qPT09PT09PT09PT09PT09PT09Ki8KLQl6X3N0cmVh
bSoJZF9zdHJlYW0sLyohPCBpbi9vdXQ6IHRoZSBkZWNvbXByZXNzaW5nIHN0cmVhbSAqLworCWJ5
dGUqCQlidWYsCS8qITwgb3V0OiB0aGUgZXh0ZXJuYWxseSBzdG9yZWQgcGFydCBvZgorCQkJCXRo
ZSBmaWVsZCwgb3IgYSBwcmVmaXggb2YgaXQgKi8KKwl1bGludAkJbGVuLAkvKiE8IGluOiBsZW5n
dGggb2YgYnVmLCBpbiBieXRlcyAqLwogCXVsaW50CQl6aXBfc2l6ZSwvKiE8IGluOiBjb21wcmVz
c2VkIEJMT0IgcGFnZSBzaXplICovCiAJdWxpbnQJCXNwYWNlX2lkLC8qITwgaW46IHNwYWNlIGlk
IG9mIHRoZSBCTE9CIHBhZ2VzICovCiAJdWxpbnQJCXBhZ2Vfbm8sLyohPCBpbjogcGFnZSBudW1i
ZXIgb2YgdGhlIGZpcnN0IEJMT0IgcGFnZSAqLwogCXVsaW50CQlvZmZzZXQpCS8qITwgaW46IG9m
ZnNldCBvbiB0aGUgZmlyc3QgQkxPQiBwYWdlICovCiB7Ci0JdWxpbnQJcGFnZV90eXBlID0gRklM
X1BBR0VfVFlQRV9aQkxPQjsKKwl1bGludAkJcGFnZV90eXBlID0gRklMX1BBR0VfVFlQRV9aQkxP
QjsKKwltZW1faGVhcF90KgloZWFwOworCWludAkJZXJyOworCXpfc3RyZWFtCWRfc3RyZWFtOwor
CisJZF9zdHJlYW0ubmV4dF9vdXQgPSBidWY7CisJZF9zdHJlYW0uYXZhaWxfb3V0ID0gbGVuOwor
CWRfc3RyZWFtLm5leHRfaW4gPSBaX05VTEw7CisJZF9zdHJlYW0uYXZhaWxfaW4gPSAwOworCisJ
LyogWmxpYiBpbmZsYXRlIG5lZWRzIDMyIGtpbG9ieXRlcyBmb3IgdGhlIGRlZmF1bHQKKwl3aW5k
b3cgc2l6ZSwgcGx1cyBhIGZldyBraWxvYnl0ZXMgZm9yIHNtYWxsIG9iamVjdHMuICovCisJaGVh
cCA9IG1lbV9oZWFwX2NyZWF0ZSg0MDAwMCk7CisJcGFnZV96aXBfc2V0X2FsbG9jKCZkX3N0cmVh
bSwgaGVhcCk7CiAKIAl1dF9hZCh1dF9pc18ycG93KHppcF9zaXplKSk7CiAJdXRfYWQoemlwX3Np
emUgPj0gUEFHRV9aSVBfTUlOX1NJWkUpOwogCXV0X2FkKHppcF9zaXplIDw9IFVOSVZfUEFHRV9T
SVpFKTsKIAl1dF9hZChzcGFjZV9pZCk7CiAKKwllcnIgPSBpbmZsYXRlSW5pdCgmZF9zdHJlYW0p
OworCXV0X2EoZXJyID09IFpfT0spOworCiAJZm9yICg7OykgewogCQlidWZfcGFnZV90KglicGFn
ZTsKLQkJaW50CQllcnI7CiAJCXVsaW50CQluZXh0X3BhZ2Vfbm87CiAKIAkJLyogVGhlcmUgaXMg
bm8gbGF0Y2ggb24gYnBhZ2UgZGlyZWN0bHkuICBJbnN0ZWFkLApAQCAtNDY2Myw3ICs0NjgxLDcg
QEAgYnRyX2NvcHlfemJsb2JfcHJlZml4KAogCQkJCSIgY29tcHJlc3NlZCBCTE9CIgogCQkJCSIg
cGFnZSAlbHUgc3BhY2UgJWx1XG4iLAogCQkJCSh1bG9uZykgcGFnZV9ubywgKHVsb25nKSBzcGFj
ZV9pZCk7Ci0JCQlyZXR1cm47CisJCQlnb3RvIGZ1bmNfZXhpdDsKIAkJfQogCiAJCWlmIChVTklW
X1VOTElLRUxZCkBAIC00Njg5LDEzICs0NzA3LDEzIEBAIGJ0cl9jb3B5X3pibG9iX3ByZWZpeCgK
IAkJCW9mZnNldCArPSA0OwogCQl9CiAKLQkJZF9zdHJlYW0tPm5leHRfaW4gPSBicGFnZS0+emlw
LmRhdGEgKyBvZmZzZXQ7Ci0JCWRfc3RyZWFtLT5hdmFpbF9pbiA9IHppcF9zaXplIC0gb2Zmc2V0
OworCQlkX3N0cmVhbS5uZXh0X2luID0gYnBhZ2UtPnppcC5kYXRhICsgb2Zmc2V0OworCQlkX3N0
cmVhbS5hdmFpbF9pbiA9IHppcF9zaXplIC0gb2Zmc2V0OwogCi0JCWVyciA9IGluZmxhdGUoZF9z
dHJlYW0sIFpfTk9fRkxVU0gpOworCQllcnIgPSBpbmZsYXRlKCZkX3N0cmVhbSwgWl9OT19GTFVT
SCk7CiAJCXN3aXRjaCAoZXJyKSB7CiAJCWNhc2UgWl9PSzoKLQkJCWlmICghZF9zdHJlYW0tPmF2
YWlsX291dCkgeworCQkJaWYgKCFkX3N0cmVhbS5hdmFpbF9vdXQpIHsKIAkJCQlnb3RvIGVuZF9v
Zl9ibG9iOwogCQkJfQogCQkJYnJlYWs7CkBAIC00NzEyLDEzICs0NzMwLDEzIEBAIGluZmxhdGVf
ZXJyb3I6CiAJCQkJIiBjb21wcmVzc2VkIEJMT0IiCiAJCQkJIiBwYWdlICVsdSBzcGFjZSAlbHUg
cmV0dXJuZWQgJWQgKCVzKVxuIiwKIAkJCQkodWxvbmcpIHBhZ2Vfbm8sICh1bG9uZykgc3BhY2Vf
aWQsCi0JCQkJZXJyLCBkX3N0cmVhbS0+bXNnKTsKKwkJCQllcnIsIGRfc3RyZWFtLm1zZyk7CiAJ
CWNhc2UgWl9CVUZfRVJST1I6CiAJCQlnb3RvIGVuZF9vZl9ibG9iOwogCQl9CiAKIAkJaWYgKG5l
eHRfcGFnZV9ubyA9PSBGSUxfTlVMTCkgewotCQkJaWYgKCFkX3N0cmVhbS0+YXZhaWxfaW4pIHsK
KwkJCWlmICghZF9zdHJlYW0uYXZhaWxfaW4pIHsKIAkJCQl1dF9wcmludF90aW1lc3RhbXAoc3Rk
ZXJyKTsKIAkJCQlmcHJpbnRmKHN0ZGVyciwKIAkJCQkJIiAgSW5ub0RCOiB1bmV4cGVjdGVkIGVu
ZCBvZiIKQEAgLTQ3MjcsNyArNDc0NSw3IEBAIGluZmxhdGVfZXJyb3I6CiAJCQkJCSh1bG9uZykg
cGFnZV9ubywKIAkJCQkJKHVsb25nKSBzcGFjZV9pZCk7CiAJCQl9IGVsc2UgewotCQkJCWVyciA9
IGluZmxhdGUoZF9zdHJlYW0sIFpfRklOSVNIKTsKKwkJCQllcnIgPSBpbmZsYXRlKCZkX3N0cmVh
bSwgWl9GSU5JU0gpOwogCQkJCXN3aXRjaCAoZXJyKSB7CiAJCQkJY2FzZSBaX1NUUkVBTV9FTkQ6
CiAJCQkJY2FzZSBaX0JVRl9FUlJPUjoKQEAgLTQ3MzksNyArNDc1Nyw3IEBAIGluZmxhdGVfZXJy
b3I6CiAKIGVuZF9vZl9ibG9iOgogCQkJYnVmX3BhZ2VfcmVsZWFzZV96aXAoYnBhZ2UpOwotCQkJ
cmV0dXJuOworCQkJZ290byBmdW5jX2V4aXQ7CiAJCX0KIAogCQlidWZfcGFnZV9yZWxlYXNlX3pp
cChicGFnZSk7CkBAIC00NzUxLDYgKzQ3NjksMTIgQEAgZW5kX29mX2Jsb2I6CiAJCW9mZnNldCA9
IEZJTF9QQUdFX05FWFQ7CiAJCXBhZ2VfdHlwZSA9IEZJTF9QQUdFX1RZUEVfWkJMT0IyOwogCX0K
KworZnVuY19leGl0OgorCWluZmxhdGVFbmQoJmRfc3RyZWFtKTsKKwltZW1faGVhcF9mcmVlKGhl
YXApOworCVVOSVZfTUVNX0FTU0VSVF9SVyhidWYsIGRfc3RyZWFtLnRvdGFsX291dCk7CisJcmV0
dXJuKGRfc3RyZWFtLnRvdGFsX291dCk7CiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgpAQCAtNDc3Niwy
OCArNDgwMCw4IEBAIGJ0cl9jb3B5X2V4dGVybmFsbHlfc3RvcmVkX2ZpZWxkX3ByZWZpeF8KIAl9
CiAKIAlpZiAoVU5JVl9VTkxJS0VMWSh6aXBfc2l6ZSkpIHsKLQkJaW50CQllcnI7Ci0JCXpfc3Ry
ZWFtCWRfc3RyZWFtOwotCQltZW1faGVhcF90KgloZWFwOwotCi0JCS8qIFpsaWIgaW5mbGF0ZSBu
ZWVkcyAzMiBraWxvYnl0ZXMgZm9yIHRoZSBkZWZhdWx0Ci0JCXdpbmRvdyBzaXplLCBwbHVzIGEg
ZmV3IGtpbG9ieXRlcyBmb3Igc21hbGwgb2JqZWN0cy4gKi8KLQkJaGVhcCA9IG1lbV9oZWFwX2Ny
ZWF0ZSg0MDAwMCk7Ci0JCXBhZ2VfemlwX3NldF9hbGxvYygmZF9zdHJlYW0sIGhlYXApOwotCi0J
CWVyciA9IGluZmxhdGVJbml0KCZkX3N0cmVhbSk7Ci0JCXV0X2EoZXJyID09IFpfT0spOwotCi0J
CWRfc3RyZWFtLm5leHRfb3V0ID0gYnVmOwotCQlkX3N0cmVhbS5hdmFpbF9vdXQgPSBsZW47Ci0J
CWRfc3RyZWFtLmF2YWlsX2luID0gMDsKLQotCQlidHJfY29weV96YmxvYl9wcmVmaXgoJmRfc3Ry
ZWFtLCB6aXBfc2l6ZSwKLQkJCQkgICAgICBzcGFjZV9pZCwgcGFnZV9ubywgb2Zmc2V0KTsKLQkJ
aW5mbGF0ZUVuZCgmZF9zdHJlYW0pOwotCQltZW1faGVhcF9mcmVlKGhlYXApOwotCQlVTklWX01F
TV9BU1NFUlRfUlcoYnVmLCBkX3N0cmVhbS50b3RhbF9vdXQpOwotCQlyZXR1cm4oZF9zdHJlYW0u
dG90YWxfb3V0KTsKKwkJcmV0dXJuKGJ0cl9jb3B5X3pibG9iX3ByZWZpeChidWYsIGxlbiwgemlw
X3NpemUsCisJCQkJCSAgICAgc3BhY2VfaWQsIHBhZ2Vfbm8sIG9mZnNldCkpOwogCX0gZWxzZSB7
CiAJCXJldHVybihidHJfY29weV9ibG9iX3ByZWZpeChidWYsIGxlbiwgc3BhY2VfaWQsCiAJCQkJ
CSAgICBwYWdlX25vLCBvZmZzZXQpKTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9k
Yl9wbHVnaW4vcGFnZS9wYWdlMHppcC5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcGFn
ZS9wYWdlMHppcC5jCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTAzMDIwODU5NDMt
Mnl3bHJ5NDJ1bWRmaHc1ZQorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcGFnZS9wYWdlMHpp
cC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMzE1MTAwMTAyLXkxY3JhbHJh
OWxheDZ3eWUKQEAgLTY1MywxMyArNjUzLDEzIEBAIHBhZ2VfemlwX2Rpcl9lbmNvZGUoCiBBbGxv
Y2F0ZSBtZW1vcnkgZm9yIHpsaWIuICovCiBzdGF0aWMKIHZvaWQqCi1wYWdlX3ppcF9tYWxsb2Mo
CitwYWdlX3ppcF96YWxsb2MoCiAvKj09PT09PT09PT09PSovCiAJdm9pZCoJb3BhcXVlLAkvKiE8
IGluL291dDogbWVtb3J5IGhlYXAgKi8KIAl1SW50CWl0ZW1zLAkvKiE8IGluOiBudW1iZXIgb2Yg
aXRlbXMgdG8gYWxsb2NhdGUgKi8KIAl1SW50CXNpemUpCS8qITwgaW46IHNpemUgb2YgYW4gaXRl
bSBpbiBieXRlcyAqLwogewotCXJldHVybihtZW1faGVhcF9hbGxvYyhvcGFxdWUsIGl0ZW1zICog
c2l6ZSkpOworCXJldHVybihtZW1faGVhcF96YWxsb2Mob3BhcXVlLCBpdGVtcyAqIHNpemUpKTsK
IH0KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKiovLyoqCkBAIC02ODQsNyArNjg0LDcgQEAgcGFnZV96aXBfc2V0
X2FsbG9jKAogewogCXpfc3RyZWFtKglzdHJtID0gc3RyZWFtOwogCi0Jc3RybS0+emFsbG9jID0g
cGFnZV96aXBfbWFsbG9jOworCXN0cm0tPnphbGxvYyA9IHBhZ2VfemlwX3phbGxvYzsKIAlzdHJt
LT56ZnJlZSA9IHBhZ2VfemlwX2ZyZWU7CiAJc3RybS0+b3BhcXVlID0gaGVhcDsKIH0KQEAgLTI5
MTIsMTkgKzI5MTIsMTggQEAgemxpYl9lcnJvcjoKIAogCXBhZ2VfemlwX3NldF9hbGxvYygmZF9z
dHJlYW0sIGhlYXApOwogCi0JaWYgKFVOSVZfVU5MSUtFTFkoaW5mbGF0ZUluaXQyKCZkX3N0cmVh
bSwgVU5JVl9QQUdFX1NJWkVfU0hJRlQpCi0JCQkgICE9IFpfT0spKSB7Ci0JCXV0X2Vycm9yOwot
CX0KLQogCWRfc3RyZWFtLm5leHRfaW4gPSBwYWdlX3ppcC0+ZGF0YSArIFBBR0VfREFUQTsKIAkv
KiBTdWJ0cmFjdCB0aGUgc3BhY2UgcmVzZXJ2ZWQgZm9yCiAJdGhlIHBhZ2UgaGVhZGVyIGFuZCB0
aGUgZW5kIG1hcmtlciBvZiB0aGUgbW9kaWZpY2F0aW9uIGxvZy4gKi8KIAlkX3N0cmVhbS5hdmFp
bF9pbiA9IHBhZ2VfemlwX2dldF9zaXplKHBhZ2VfemlwKSAtIChQQUdFX0RBVEEgKyAxKTsKLQog
CWRfc3RyZWFtLm5leHRfb3V0ID0gcGFnZSArIFBBR0VfWklQX1NUQVJUOwogCWRfc3RyZWFtLmF2
YWlsX291dCA9IFVOSVZfUEFHRV9TSVpFIC0gUEFHRV9aSVBfU1RBUlQ7CiAKKwlpZiAoVU5JVl9V
TkxJS0VMWShpbmZsYXRlSW5pdDIoJmRfc3RyZWFtLCBVTklWX1BBR0VfU0laRV9TSElGVCkKKwkJ
CSAgIT0gWl9PSykpIHsKKwkJdXRfZXJyb3I7CisJfQorCiAJLyogRGVjb2RlIHRoZSB6bGliIGhl
YWRlciBhbmQgdGhlIGluZGV4IGluZm9ybWF0aW9uLiAqLwogCWlmIChVTklWX1VOTElLRUxZKGlu
ZmxhdGUoJmRfc3RyZWFtLCBaX0JMT0NLKSAhPSBaX09LKSkgewogCgo=

--===============1718129190==
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: 7ac42249be6da212f3d6a1d7d292c86fe7011536
# timestamp: 2011-03-15 13:13:33 +0200
# base_revision_id: vasil.dimov@stripped\
#   2ywlry42umdfhw5e
# 
# Begin bundle
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


--===============1718129190==--