From: marko.makela
Date: June 1 2010 2:04pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3132 to 3133)
List-Archive: http://lists.mysql.com/commits/109773
Message-Id: <201006011404.o51E4SP4021581@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0217482108=="

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

IDMxMzMgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0wMQogICAgICBNZXJnZSBhIGNoYW5nZSBmcm9t
IG15c3FsLTUuMS1pbm5vZGI6CiAgICAgIAogICAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICAgIHJldm5vOiAzNDkx
CiAgICAgICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAxMTM0
MzM1LWNjdGh3d3J1MjNrbjA5cXcKICAgICAgICBwYXJlbnQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTAwNjAxMTIwNzUxLTF1cTdiYnRhNW43dHMwcXIKICAgICAgICBjb21taXR0ZXI6IE1h
cmtvIE3DpGtlbMOkIDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgICBicmFuY2ggbmlj
azogNS4xLWlubm9kYgogICAgICAgIHRpbWVzdGFtcDogVHVlIDIwMTAtMDYtMDEgMTY6NDM6MzUg
KzAzMDAKICAgICAgICBtZXNzYWdlOgogICAgICAgICAgQnVnIzQ4MTk3OiBDb25jdXJyZW50IHJ3
X2xvY2tfZnJlZSBtYXkgY2F1c2UgYXNzZXJ0aW9uIGZhaWx1cmUKICAgICAgCiAgICAgICAgICBy
d19sb2NrX3Q6IFJlbW92ZSBtYWdpY19uIHVubGVzcyBVTklWX0RFQlVHIGlzIGRlZmluZWQuCiAg
ICAgICAgICByd19sb2NrX2ZyZWUoKTogSW52YWxpZGF0ZSBtYWdpY19uIG9ubHkgYWZ0ZXIgcmVt
b3ZpbmcgZnJvbSByd19sb2NrX2xpc3QuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS9zeW5jMHJ3LmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMw
cncuYwogMzEzMiBBbGV4YW5kZXIgTm96ZHJpbgkyMDEwLTA2LTAxIFttZXJnZV0KICAgICAgQXV0
by1tZXJnZSBmcm9tIG15c3FsLXRydW5rLWJ1Z2ZpeGluZy4KICAgICAgCiAgICAgIER1ZSB0byBh
IEJaUiBidWcsIHRoYXQgbWVyZ2Ugd2FzIGRvbmUgYnkgdGhlIGZvbGxvd2luZyBjb21tYW5kOgog
ICAgICBienIgbWVyZ2UgLXIgJ3JldmlkOnRvci5kaWRyaWtzZW5Ac3VuLmNvbS0yMDEwMDUyNzA3
NDI0OC02cXR2MHAxdWd5Nm8xaGpvLi4nIDxteXNxbC10cnVuay1idWdmaXhpbmcgcGF0aD4KCiAg
ICByZW1vdmVkOgogICAgICBCVUlMRC9jb21waWxlLWFscGhhLWNjYwogICAgICBCVUlMRC9jb21w
aWxlLWFscGhhLWN4eAogICAgICBzdG9yYWdlL215aXNhbS9mdF9ldmFsLmMKICAgICAgc3RvcmFn
ZS9teWlzYW0vZnRfZXZhbC5oCiAgICAgIHN0b3JhZ2UvbXlpc2FtL2Z0X3N0ZW0uYwogICAgICBz
dG9yYWdlL215aXNhbS9mdF90ZXN0MS5jCiAgICAgIHN0b3JhZ2UvbXlpc2FtL2Z0X3Rlc3QxLmgK
ICAgICAgc3RyaW5ncy9DaGFuZ2VMb2cKICAgICAgc3RyaW5ncy9iY29weS1kdWZmLmMKICAgICAg
c3RyaW5ncy9iemVyby5jCiAgICAgIHN0cmluZ3MvbWFjcm9zLmFzbQogICAgICBzdHJpbmdzL21l
bWNtcC5jCiAgICAgIHN0cmluZ3MvbWVtY3B5LmMKICAgICAgc3RyaW5ncy9tZW1zZXQuYwogICAg
ICBzdHJpbmdzL3B0cl9jbXAuYXNtCiAgICAgIHN0cmluZ3Mvc3RyY2F0LmMKICAgICAgc3RyaW5n
cy9zdHJjaHIuYwogICAgICBzdHJpbmdzL3N0cmNtcC5jCiAgICAgIHN0cmluZ3Mvc3RyaW5ncy5h
c20KICAgICAgc3RyaW5ncy9zdHJsZW4uYwogICAgICBzdHJpbmdzL3N0cnJjaHIuYwogICAgICBz
dHJpbmdzL3N0cnhtb3YuYXNtCiAgICAgIHN0cmluZ3MvdWRpdi5jCiAgICBhZGRlZDoKICAgICAg
bXlzcWwtdGVzdC9leHRyYS9ycGxfdGVzdHMvcnBsX3JlY29yZF9jb21wYXJlLnRlc3QKICAgICAg
bXlzcWwtdGVzdC9yL2J1ZzQ2MjYxLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N0ZF9kYXRhL2Jp
bmxvZ19zYXZlcG9pbnQuMDAwMDAxCiAgICAgIG15c3FsLXRlc3Qvc3RkX2RhdGEvYnVnNDY1NjUu
QVJaCiAgICAgIG15c3FsLXRlc3Qvc3RkX2RhdGEvYnVnNDY1NjUuZnJtCiAgICAgIG15c3FsLXRl
c3Qvc3VpdGUvcGFydHMvci9wYXJ0aXRpb25fZGVidWdfc3luY19pbm5vZGIucmVzdWx0CiAgICAg
IG15c3FsLXRlc3Qvc3VpdGUvcGFydHMvdC9wYXJ0aXRpb25fZGVidWdfc3luY19pbm5vZGItbWFz
dGVyLm9wdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BhcnRzL3QvcGFydGl0aW9uX2RlYnVnX3N5
bmNfaW5ub2RiLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvci9ycGxfcm93X3JlY19j
b21wX2lubm9kYi5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvci9ycGxfcm93X3Jl
Y19jb21wX215aXNhbS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvdC9ycGxfYmVn
aW5fY29tbWl0X3JvbGxiYWNrLW1hc3Rlci5vcHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwv
dC9ycGxfcm93X3JlY19jb21wX2lubm9kYi50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBs
L3QvcnBsX3Jvd19yZWNfY29tcF9teWlzYW0udGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5
c192YXJzL3Ivc2VjdXJlX2ZpbGVfcHJpdi5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9z
eXNfdmFycy9yL3NraXBfbmFtZV9yZXNvbHZlX2Jhc2ljLnJlc3VsdAogICAgICBteXNxbC10ZXN0
L3N1aXRlL3N5c192YXJzL3Qvc2VjdXJlX2ZpbGVfcHJpdi1tYXN0ZXIub3B0CiAgICAgIG15c3Fs
LXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC9zZWN1cmVfZmlsZV9wcml2LnRlc3QKICAgICAgbXlzcWwt
dGVzdC9zdWl0ZS9zeXNfdmFycy90L3NraXBfbmFtZV9yZXNvbHZlX2Jhc2ljLW1hc3Rlci5vcHQK
ICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L3NraXBfbmFtZV9yZXNvbHZlX2Jhc2lj
LnRlc3QKICAgICAgbXlzcWwtdGVzdC90L2J1ZzQ2MjYxLW1hc3Rlci5vcHQKICAgICAgbXlzcWwt
dGVzdC90L2J1ZzQ2MjYxLnRlc3QKICAgIHJlbmFtZWQ6CiAgICAgIG15c3lzL215X21lc3NuYy5j
ID0+IG15c3lzL215X21lc3MuYwogICAgbW9kaWZpZWQ6CiAgICAgIEJVSUxEL01ha2VmaWxlLmFt
CiAgICAgIE1ha2VmaWxlLmFtCiAgICAgIGNsaWVudC9teXNxbC5jYwogICAgICBjbGllbnQvbXlz
cWxiaW5sb2cuY2MKICAgICAgY2xpZW50L3NxbF9zdHJpbmcuY2MKICAgICAgY21ha2Uvb3MvRnJl
ZUJTRC5jbWFrZQogICAgICBjb25maWd1cmUuaW4KICAgICAgaW5jbHVkZS9teV9nbG9iYWwuaAog
ICAgICBpbmNsdWRlL215X3B0aHJlYWQuaAogICAgICBpbmNsdWRlL215X3N5cy5oCiAgICAgIGlu
Y2x1ZGUvbXlzcWwvcGx1Z2luLmgKICAgICAgaW5jbHVkZS9teXNxbC9wbHVnaW4uaC5wcAogICAg
ICBpbmNsdWRlL215c3FsX2NvbS5oCiAgICAgIGxpYm15c3FsL01ha2VmaWxlLnNoYXJlZAogICAg
ICBteXNxbC10ZXN0L2V4dHJhL2JpbmxvZ190ZXN0cy9taXhfaW5ub2RiX215aXNhbV9zaWRlX2Vm
ZmVjdHMudGVzdAogICAgICBteXNxbC10ZXN0L215c3FsLXRlc3QtcnVuLnBsCiAgICAgIG15c3Fs
LXRlc3Qvci9hcmNoaXZlLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3IvY3R5cGVfdWNzLnJlc3Vs
dAogICAgICBteXNxbC10ZXN0L3IvZGVsZXRlLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3IvZXJy
b3Jfc2ltdWxhdGlvbi5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL2Vycm9ycy5yZXN1bHQKICAg
ICAgbXlzcWwtdGVzdC9yL2V4cGxhaW4ucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9mdWxsdGV4
dC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL2Z1bmNfY29uY2F0LnJlc3VsdAogICAgICBteXNx
bC10ZXN0L3IvZnVuY19nY29uY2F0LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3IvZnVuY19zdHIu
cmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9naXMtcnRyZWUucmVzdWx0CiAgICAgIG15c3FsLXRl
c3Qvci9ncmFudC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL2dyb3VwX2J5LnJlc3VsdAogICAg
ICBteXNxbC10ZXN0L3IvaGFuZGxlcl9teWlzYW0ucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9o
YXZpbmcucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9pbm5vZGJfbXlzcWwucmVzdWx0CiAgICAg
IG15c3FsLXRlc3Qvci9qb2luLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3Ivam9pbl9vdXRlci5y
ZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL2xvYWRkYXRhLnJlc3VsdAogICAgICBteXNxbC10ZXN0
L3IvbG9nX3N0YXRlLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3IvbWRsX3N5bmMucmVzdWx0CiAg
ICAgIG15c3FsLXRlc3Qvci9tZXJnZS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL215aXNhbS5y
ZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL215c3FsYmlubG9nLnJlc3VsdAogICAgICBteXNxbC10
ZXN0L3IvbXlzcWxkLS1oZWxwLW5vdHdpbi5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL215c3Fs
ZC0taGVscC13aW4ucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9teXNxbGR1bXAucmVzdWx0CiAg
ICAgIG15c3FsLXRlc3Qvci9vcmRlcl9ieS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL291dGZp
bGVfbG9hZGRhdGEucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9wYXJ0aXRpb24ucmVzdWx0CiAg
ICAgIG15c3FsLXRlc3Qvci9wcy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL3F1ZXJ5X2NhY2hl
X3dpdGhfdmlld3MucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9yYW5nZS5yZXN1bHQKICAgICAg
bXlzcWwtdGVzdC9yL3JlbmFtZWRiLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3Ivcm93LnJlc3Vs
dAogICAgICBteXNxbC10ZXN0L3Ivc2tpcF9uYW1lX3Jlc29sdmUucmVzdWx0CiAgICAgIG15c3Fs
LXRlc3Qvci9zdWJzZWxlY3QucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9zeW1saW5rLnJlc3Vs
dAogICAgICBteXNxbC10ZXN0L3IvdHJpZ2dlci5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL3R5
cGVfYmluYXJ5LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3IvdHlwZV9kZWNpbWFsLnJlc3VsdAog
ICAgICBteXNxbC10ZXN0L3IvdXBncmFkZS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL3Zhcmlh
Ymxlcy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL3ZhcmlhYmxlc19kZWJ1Zy5yZXN1bHQKICAg
ICAgbXlzcWwtdGVzdC9yL3ZpZXcucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvYmlubG9n
L3IvYmlubG9nX3Jvd19taXhfaW5ub2RiX215aXNhbS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9z
dWl0ZS9iaW5sb2cvci9iaW5sb2dfc3RtX21peF9pbm5vZGJfbXlpc2FtLnJlc3VsdAogICAgICBt
eXNxbC10ZXN0L3N1aXRlL2VuZ2luZXMvUkVBRE1FCiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvZW5n
aW5lcy9pdWRzL3IvdXBkYXRlX2RlbGV0ZV9jYWxlbmRhci5yZXN1bHQKICAgICAgbXlzcWwtdGVz
dC9zdWl0ZS9lbmdpbmVzL2l1ZHMvdC9kaXNhYmxlZC5kZWYKICAgICAgbXlzcWwtdGVzdC9zdWl0
ZS9lbmdpbmVzL2l1ZHMvdC9pbnNlcnRfbnVtYmVyLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0
ZS9lbmdpbmVzL2l1ZHMvdC91cGRhdGVfZGVsZXRlX2NhbGVuZGFyLnRlc3QKICAgICAgbXlzcWwt
dGVzdC9zdWl0ZS9ycGwvci9ycGxfYmVnaW5fY29tbWl0X3JvbGxiYWNrLnJlc3VsdAogICAgICBt
eXNxbC10ZXN0L3N1aXRlL3JwbC9yL3JwbF9kb19ncmFudC5yZXN1bHQKICAgICAgbXlzcWwtdGVz
dC9zdWl0ZS9ycGwvci9ycGxfZXZlbnRzLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3Jw
bC9yL3JwbF9pbm5vZGJfbWl4ZWRfZG1sLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3Jw
bC9yL3JwbF9taXhlZF9taXhpbmdfZW5naW5lcy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0
ZS9ycGwvci9ycGxfbm9uX2RpcmVjdF9taXhlZF9taXhpbmdfZW5naW5lcy5yZXN1bHQKICAgICAg
bXlzcWwtdGVzdC9zdWl0ZS9ycGwvci9ycGxfbm9uX2RpcmVjdF9yb3dfbWl4aW5nX2VuZ2luZXMu
cmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3IvcnBsX25vbl9kaXJlY3Rfc3RtX21p
eGluZ19lbmdpbmVzLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3JwbC9yL3JwbF9yb3df
bWl4aW5nX2VuZ2luZXMucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3IvcnBsX3N0
bV9taXhpbmdfZW5naW5lcy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvdC9ycGxf
YmVnaW5fY29tbWl0X3JvbGxiYWNrLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvdC9y
cGxfZG9fZ3JhbnQudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3JwbC90L3JwbF9ldmVudHMu
dGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3JwbC90L3JwbF9zZW1pX3N5bmMudGVzdAogICAg
ICBteXNxbC10ZXN0L3N1aXRlL3JwbC90L3JwbF9zdG1fbWl4aW5nX2VuZ2luZXMudGVzdAogICAg
ICBteXNxbC10ZXN0L3N1aXRlL3JwbF9uZGIvbXkuY25mCiAgICAgIG15c3FsLXRlc3Qvc3VpdGUv
cnBsX25kYi9yL3JwbF9uZGJfc3RtX2lubm9kYi5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0
ZS9ycGxfbmRiL3QvcnBsX25kYl9zdG1faW5ub2RiLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0
ZS9zeXNfdmFycy9yL215aXNhbV9zb3J0X2J1ZmZlcl9zaXplX2Jhc2ljXzMyLnJlc3VsdAogICAg
ICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3IvbXlpc2FtX3NvcnRfYnVmZmVyX3NpemVfYmFz
aWNfNjQucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC9zZWN1cmVfZmls
ZV9wcml2X2Jhc2ljLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L2FyY2hpdmUudGVzdAogICAgICBt
eXNxbC10ZXN0L3QvY3R5cGVfdWNzLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L2RlbGV0ZS50ZXN0
CiAgICAgIG15c3FsLXRlc3QvdC9lcnJvcl9zaW11bGF0aW9uLnRlc3QKICAgICAgbXlzcWwtdGVz
dC90L2Vycm9ycy50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9leHBsYWluLnRlc3QKICAgICAgbXlz
cWwtdGVzdC90L2Z1bGx0ZXh0LnRlc3QKICAgICAgbXlzcWwtdGVzdC90L2Z1bmNfY29uY2F0LnRl
c3QKICAgICAgbXlzcWwtdGVzdC90L2Z1bmNfZ2NvbmNhdC50ZXN0CiAgICAgIG15c3FsLXRlc3Qv
dC9mdW5jX3N0ci50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9naXMtcnRyZWUudGVzdAogICAgICBt
eXNxbC10ZXN0L3QvZ3JhbnQudGVzdAogICAgICBteXNxbC10ZXN0L3QvZ3JvdXBfYnkudGVzdAog
ICAgICBteXNxbC10ZXN0L3QvaGFuZGxlcl9teWlzYW0udGVzdAogICAgICBteXNxbC10ZXN0L3Qv
aGF2aW5nLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L2lubm9kYl9teXNxbC50ZXN0CiAgICAgIG15
c3FsLXRlc3QvdC9qb2luLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L2pvaW5fb3V0ZXIudGVzdAog
ICAgICBteXNxbC10ZXN0L3QvbG9hZGRhdGEudGVzdAogICAgICBteXNxbC10ZXN0L3QvbG9nX3N0
YXRlLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L21kbF9zeW5jLnRlc3QKICAgICAgbXlzcWwtdGVz
dC90L21lcmdlLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L215c3FsYmlubG9nLnRlc3QKICAgICAg
bXlzcWwtdGVzdC90L215c3FsZHVtcC50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9vcmRlcl9ieS50
ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9vdXRmaWxlX2xvYWRkYXRhLnRlc3QKICAgICAgbXlzcWwt
dGVzdC90L3BhcnRpdGlvbi50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9wcy50ZXN0CiAgICAgIG15
c3FsLXRlc3QvdC9xdWVyeV9jYWNoZV93aXRoX3ZpZXdzLnRlc3QKICAgICAgbXlzcWwtdGVzdC90
L3JhbmdlLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L3JlbmFtZWRiLnRlc3QKICAgICAgbXlzcWwt
dGVzdC90L3Jvdy50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9za2lwX25hbWVfcmVzb2x2ZS50ZXN0
CiAgICAgIG15c3FsLXRlc3QvdC9zdWJzZWxlY3QudGVzdAogICAgICBteXNxbC10ZXN0L3Qvc3lt
bGluay50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC90cmlnZ2VyLnRlc3QKICAgICAgbXlzcWwtdGVz
dC90L3R5cGVfZGVjaW1hbC50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC91cGdyYWRlLnRlc3QKICAg
ICAgbXlzcWwtdGVzdC90L3ZhcmlhYmxlcy50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC92YXJpYWJs
ZXNfZGVidWcudGVzdAogICAgICBteXNxbC10ZXN0L3Qvdmlldy50ZXN0CiAgICAgIG15c3lzL0NN
YWtlTGlzdHMudHh0CiAgICAgIG15c3lzL01ha2VmaWxlLmFtCiAgICAgIG15c3lzL21mX2xvYWRw
YXRoLmMKICAgICAgbXlzeXMvbWZfcGFjay5jCiAgICAgIG15c3lzL215X2ZpbGUuYwogICAgICBt
eXN5cy9teV9nZXR3ZC5jCiAgICAgIG15c3lzL215X2luaXQuYwogICAgICBteXN5cy9teV9wdGhy
ZWFkLmMKICAgICAgbXlzeXMvbXlfc3RhdGljLmMKICAgICAgcGx1Z2luL2RhZW1vbl9leGFtcGxl
L2RhZW1vbl9leGFtcGxlLmNjCiAgICAgIHBsdWdpbi9zZW1pc3luYy9zZW1pc3luY19tYXN0ZXIu
Y2MKICAgICAgc2NyaXB0cy9teXNxbGRfc2FmZS5zaAogICAgICBzY3JpcHRzL215c3FsaG90Y29w
eS5zaAogICAgICBzcWwtY29tbW9uL2NsaWVudC5jCiAgICAgIHNxbC9DTWFrZUxpc3RzLnR4dAog
ICAgICBzcWwvYXV0aG9ycy5oCiAgICAgIHNxbC9ldmVudHMuY2MKICAgICAgc3FsL2ZpZWxkLmNj
CiAgICAgIHNxbC9maWVsZC5oCiAgICAgIHNxbC9maWVsZF9jb252LmNjCiAgICAgIHNxbC9oYV9w
YXJ0aXRpb24uY2MKICAgICAgc3FsL2hhbmRsZXIuY2MKICAgICAgc3FsL2hhbmRsZXIuaAogICAg
ICBzcWwvaW5pdC5jYwogICAgICBzcWwvaXRlbS5jYwogICAgICBzcWwvaXRlbS5oCiAgICAgIHNx
bC9pdGVtX2NtcGZ1bmMuY2MKICAgICAgc3FsL2l0ZW1fY21wZnVuYy5oCiAgICAgIHNxbC9pdGVt
X3N0cmZ1bmMuY2MKICAgICAgc3FsL2l0ZW1fc3RyZnVuYy5oCiAgICAgIHNxbC9pdGVtX3N1YnNl
bGVjdC5jYwogICAgICBzcWwvaXRlbV9zdWJzZWxlY3QuaAogICAgICBzcWwvaXRlbV9zdW0uY2MK
ICAgICAgc3FsL2l0ZW1fc3VtLmgKICAgICAgc3FsL2tleS5jYwogICAgICBzcWwvbG9jay5jYwog
ICAgICBzcWwvbG9jay5oCiAgICAgIHNxbC9sb2cuY2MKICAgICAgc3FsL2xvZy5oCiAgICAgIHNx
bC9sb2dfZXZlbnQuY2MKICAgICAgc3FsL2xvZ19ldmVudC5oCiAgICAgIHNxbC9sb2dfZXZlbnRf
b2xkLmNjCiAgICAgIHNxbC9teXNxbGQuY2MKICAgICAgc3FsL215c3FsZC5oCiAgICAgIHNxbC9u
ZXRfc2Vydi5jYwogICAgICBzcWwvb3B0X3JhbmdlLmNjCiAgICAgIHNxbC9vcHRfcmFuZ2UuaAog
ICAgICBzcWwvb3B0X3N1bS5jYwogICAgICBzcWwvcGFydGl0aW9uX2luZm8uY2MKICAgICAgc3Fs
L3Byb3RvY29sLmNjCiAgICAgIHNxbC9zbGF2ZS5jYwogICAgICBzcWwvc3BfaGVhZC5jYwogICAg
ICBzcWwvc3BfaGVhZC5oCiAgICAgIHNxbC9zcWxfYWNsLmNjCiAgICAgIHNxbC9zcWxfYmFzZS5j
YwogICAgICBzcWwvc3FsX2Jhc2UuaAogICAgICBzcWwvc3FsX2NsYXNzLmNjCiAgICAgIHNxbC9z
cWxfY2xhc3MuaAogICAgICBzcWwvc3FsX2Nvbm5lY3QuY2MKICAgICAgc3FsL3NxbF9jb25zdC5o
CiAgICAgIHNxbC9zcWxfZGVsZXRlLmNjCiAgICAgIHNxbC9zcWxfaW5zZXJ0LmNjCiAgICAgIHNx
bC9zcWxfbGV4LmNjCiAgICAgIHNxbC9zcWxfbGV4LmgKICAgICAgc3FsL3NxbF9sb2FkLmNjCiAg
ICAgIHNxbC9zcWxfcGFyc2UuY2MKICAgICAgc3FsL3NxbF9wYXJ0aXRpb24uY2MKICAgICAgc3Fs
L3NxbF9wbHVnaW4uY2MKICAgICAgc3FsL3NxbF9wcml2LmgKICAgICAgc3FsL3NxbF9yZXBsLmNj
CiAgICAgIHNxbC9zcWxfc2VsZWN0LmNjCiAgICAgIHNxbC9zcWxfc2hvdy5jYwogICAgICBzcWwv
c3FsX3N0cmluZy5jYwogICAgICBzcWwvc3FsX3RhYmxlLmNjCiAgICAgIHNxbC9zcWxfdGFibGUu
aAogICAgICBzcWwvc3FsX3VwZGF0ZS5jYwogICAgICBzcWwvc3FsX3lhY2MueXkKICAgICAgc3Fs
L3N5c192YXJzLmNjCiAgICAgIHNxbC90YWJsZS5jYwogICAgICBzcWwvdGFibGUuaAogICAgICBz
cWwvdGhyX21hbGxvYy5jYwogICAgICBzcWwvdGhyX21hbGxvYy5oCiAgICAgIHN0b3JhZ2UvYXJj
aGl2ZS9oYV9hcmNoaXZlLmNjCiAgICAgIHN0b3JhZ2UvbXlpc2FtL0NNYWtlTGlzdHMudHh0CiAg
ICAgIHN0b3JhZ2UvbXlpc2FtL01ha2VmaWxlLmFtCiAgICAgIHN0b3JhZ2UvbXlpc2FtL2hhX215
aXNhbS5jYwogICAgICBzdG9yYWdlL215aXNhbS9taV9jaGVjay5jCiAgICAgIHN0b3JhZ2UvbXlp
c2FtL21pX2RlbGV0ZV9hbGwuYwogICAgICBzdG9yYWdlL215aXNhbS9taV9kZWxldGVfdGFibGUu
YwogICAgICBzdG9yYWdlL215aXNhbS9taV9keW5yZWMuYwogICAgICBzdG9yYWdlL215aXNhbS9t
aV9leHRyYS5jCiAgICAgIHN0b3JhZ2UvbXlpc2FtL21pX29wZW4uYwogICAgICBzdG9yYWdlL215
aXNhbS9taV9wYWdlLmMKICAgICAgc3RvcmFnZS9teWlzYW0vbWlfcm5leHQuYwogICAgICBzdG9y
YWdlL215aXNhbS9taV93cml0ZS5jCiAgICAgIHN0b3JhZ2UvbXlpc2FtL215aXNhbWRlZi5oCiAg
ICAgIHN0b3JhZ2UvbXlpc2FtL3J0X2luZGV4LmMKICAgICAgc3RvcmFnZS9teWlzYW0vcnRfc3Bs
aXQuYwogICAgICBzdG9yYWdlL215aXNhbS9zb3J0LmMKICAgICAgc3RvcmFnZS9teWlzYW1tcmcv
bXlyZ19xdWV1ZS5jCiAgICAgIHN1cHBvcnQtZmlsZXMvbXlzcWwuc3BlYy5zaAogICAgICB0ZXN0
cy9teXNxbF9jbGllbnRfdGVzdC5jCiAgICAgIG15c3lzL215X21lc3MuYwo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3N5bmMwcncuaCcKLS0tIGEvc3RvcmFnZS9p
bm5vYmFzZS9pbmNsdWRlL3N5bmMwcncuaAlyZXZpZDphbGlrQHN1bi5jb20tMjAxMDA2MDExMjM4
MDEteTlxdjdpZ28xNm53MHVtbgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvc3luYzBy
dy5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAxMTQwMzU1LXUza3hsMHls
MGxqbDV0eDkKQEAgLTYyMiwxMSArNjIyLDEyIEBAIHN0cnVjdCByd19sb2NrX3N0cnVjdCB7CiAJ
dW5zaWduZWQJY2xpbmU6MTQ7CS8qITwgTGluZSB3aGVyZSBjcmVhdGVkICovCiAJdW5zaWduZWQJ
bGFzdF9zX2xpbmU6MTQ7CS8qITwgTGluZSBudW1iZXIgd2hlcmUgbGFzdCB0aW1lIHMtbG9ja2Vk
ICovCiAJdW5zaWduZWQJbGFzdF94X2xpbmU6MTQ7CS8qITwgTGluZSBudW1iZXIgd2hlcmUgbGFz
dCB0aW1lIHgtbG9ja2VkICovCisjaWZkZWYgVU5JVl9ERUJVRwogCXVsaW50CW1hZ2ljX247CS8q
ITwgUldfTE9DS19NQUdJQ19OICovCi19OwotCiAvKiogVmFsdWUgb2YgcndfbG9ja19zdHJ1Y3Q6
Om1hZ2ljX24gKi8KICNkZWZpbmUJUldfTE9DS19NQUdJQ19OCTIyNjQzCisjZW5kaWYgLyogVU5J
Vl9ERUJVRyAqLworfTsKIAogI2lmZGVmIFVOSVZfU1lOQ19ERUJVRwogLyoqIFRoZSBzdHJ1Y3R1
cmUgZm9yIHN0b3JpbmcgZGVidWcgaW5mbyBvZiBhbiBydy1sb2NrICovCgo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwcncuYycKLS0tIGEvc3RvcmFnZS9pbm5v
YmFzZS9zeW5jL3N5bmMwcncuYwlyZXZpZDphbGlrQHN1bi5jb20tMjAxMDA2MDExMjM4MDEteTlx
djdpZ28xNm53MHVtbgorKysgYi9zdG9yYWdlL2lubm9iYXNlL3N5bmMvc3luYzBydy5jCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAxMTQwMzU1LXUza3hsMHlsMGxqbDV0eDkK
QEAgLTI3OCw3ICsyNzgsNyBAQCByd19sb2NrX2NyZWF0ZV9mdW5jKAogCWxvY2stPmxldmVsID0g
bGV2ZWw7CiAjZW5kaWYgLyogVU5JVl9TWU5DX0RFQlVHICovCiAKLQlsb2NrLT5tYWdpY19uID0g
UldfTE9DS19NQUdJQ19OOworCXV0X2QobG9jay0+bWFnaWNfbiA9IFJXX0xPQ0tfTUFHSUNfTik7
CiAKIAlsb2NrLT5jZmlsZV9uYW1lID0gY2ZpbGVfbmFtZTsKIAlsb2NrLT5jbGluZSA9ICh1bnNp
Z25lZCBpbnQpIGNsaW5lOwpAQCAtMjkzLDEwICsyOTMsOCBAQCByd19sb2NrX2NyZWF0ZV9mdW5j
KAogCiAJbXV0ZXhfZW50ZXIoJnJ3X2xvY2tfbGlzdF9tdXRleCk7CiAKLQlpZiAoVVRfTElTVF9H
RVRfTEVOKHJ3X2xvY2tfbGlzdCkgPiAwKSB7Ci0JCXV0X2EoVVRfTElTVF9HRVRfRklSU1Qocndf
bG9ja19saXN0KS0+bWFnaWNfbgotCQkgICAgID09IFJXX0xPQ0tfTUFHSUNfTik7Ci0JfQorCXV0
X2FkKFVUX0xJU1RfR0VUX0ZJUlNUKHJ3X2xvY2tfbGlzdCkgPT0gTlVMTAorCSAgICAgIHx8IFVU
X0xJU1RfR0VUX0ZJUlNUKHJ3X2xvY2tfbGlzdCktPm1hZ2ljX24gPT0gUldfTE9DS19NQUdJQ19O
KTsKIAogCVVUX0xJU1RfQUREX0ZJUlNUKGxpc3QsIHJ3X2xvY2tfbGlzdCwgbG9jayk7CiAKQEAg
LTMxNiw4ICszMTQsNiBAQCByd19sb2NrX2ZyZWVfZnVuYygKIAl1dF9hZChyd19sb2NrX3ZhbGlk
YXRlKGxvY2spKTsKIAl1dF9hKGxvY2stPmxvY2tfd29yZCA9PSBYX0xPQ0tfREVDUik7CiAKLQls
b2NrLT5tYWdpY19uID0gMDsKLQogI2lmbmRlZiBJTk5PREJfUldfTE9DS1NfVVNFX0FUT01JQ1MK
IAltdXRleF9mcmVlKHJ3X2xvY2tfZ2V0X211dGV4KGxvY2spKTsKICNlbmRpZiAvKiBJTk5PREJf
UldfTE9DS1NfVVNFX0FUT01JQ1MgKi8KQEAgLTMyNywxNiArMzIzLDE2IEBAIHJ3X2xvY2tfZnJl
ZV9mdW5jKAogCiAJb3NfZXZlbnRfZnJlZShsb2NrLT53YWl0X2V4X2V2ZW50KTsKIAotCWlmIChV
VF9MSVNUX0dFVF9QUkVWKGxpc3QsIGxvY2spKSB7Ci0JCXV0X2EoVVRfTElTVF9HRVRfUFJFVihs
aXN0LCBsb2NrKS0+bWFnaWNfbiA9PSBSV19MT0NLX01BR0lDX04pOwotCX0KLQlpZiAoVVRfTElT
VF9HRVRfTkVYVChsaXN0LCBsb2NrKSkgewotCQl1dF9hKFVUX0xJU1RfR0VUX05FWFQobGlzdCwg
bG9jayktPm1hZ2ljX24gPT0gUldfTE9DS19NQUdJQ19OKTsKLQl9CisJdXRfYWQoVVRfTElTVF9H
RVRfUFJFVihsaXN0LCBsb2NrKSA9PSBOVUxMCisJICAgICAgfHwgVVRfTElTVF9HRVRfUFJFVihs
aXN0LCBsb2NrKS0+bWFnaWNfbiA9PSBSV19MT0NLX01BR0lDX04pOworCXV0X2FkKFVUX0xJU1Rf
R0VUX05FWFQobGlzdCwgbG9jaykgPT0gTlVMTAorCSAgICAgIHx8IFVUX0xJU1RfR0VUX05FWFQo
bGlzdCwgbG9jayktPm1hZ2ljX24gPT0gUldfTE9DS19NQUdJQ19OKTsKIAogCVVUX0xJU1RfUkVN
T1ZFKGxpc3QsIHJ3X2xvY2tfbGlzdCwgbG9jayk7CiAKIAltdXRleF9leGl0KCZyd19sb2NrX2xp
c3RfbXV0ZXgpOworCisJdXRfZChsb2NrLT5tYWdpY19uID0gMCk7CiB9CiAKICNpZmRlZiBVTklW
X0RFQlVHCkBAIC0zNTgsNyArMzU0LDcgQEAgcndfbG9ja192YWxpZGF0ZSgKIAl3YWl0ZXJzID0g
cndfbG9ja19nZXRfd2FpdGVycyhsb2NrKTsKIAlsb2NrX3dvcmQgPSBsb2NrLT5sb2NrX3dvcmQ7
CiAKLQl1dF9hKGxvY2stPm1hZ2ljX24gPT0gUldfTE9DS19NQUdJQ19OKTsKKwl1dF9hZChsb2Nr
LT5tYWdpY19uID09IFJXX0xPQ0tfTUFHSUNfTik7CiAJdXRfYSh3YWl0ZXJzID09IDAgfHwgd2Fp
dGVycyA9PSAxKTsKIAl1dF9hKGxvY2tfd29yZCA+IC1YX0xPQ0tfREVDUiB8fCgtbG9ja193b3Jk
KSAlIFhfTE9DS19ERUNSID09IDApOwogCgo=

--===============0217482108==
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: e64b568691e5d7cba3f63b16b53081d43059d442
# timestamp: 2010-06-01 17:04:18 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: alik@stripped
# 
# Begin bundle
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
gpBjAkg9lFwU96/y9viEjgP+LuSKcKEgeTMiJA==


--===============0217482108==--