From: marko.makela
Date: May 9 2011 8:50am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3621 to 3622)
List-Archive: http://lists.mysql.com/commits/136927
Message-Id: <201105090850.p498oxHI019966@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0443287656=="

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

IDM2MjIgTWFya28gTcOka2Vsw6QJMjAxMS0wNS0wOSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNS1pbm5vZGIgdG8gbXlzcWwtdHJ1bmstaW5ub2RiLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBjcmVhLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9p
bmNsdWRlL3BhZ2UwcGFnZS5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9wYWdlMHBh
Z2UuaWMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9wYWdlL3BhZ2UwcGFnZS5jCiAgICAgIHN0b3Jh
Z2UvaW5ub2Jhc2Uvcm93L3JvdzBteXNxbC5jCiAzNjIxIFZhc2lsIERpbW92CTIwMTEtMDUtMDkg
W21lcmdlXQogICAgICBNZXJnZSBteXNxbC10cnVuayAtPiBteXNxbC10cnVuay1pbm5vZGIKCiAg
ICBhZGRlZDoKICAgICAgbXlzcWwtdGVzdC9jb2xsZWN0aW9ucy9teXNxbC10cnVuay1idWcyNzQ4
MC5wdXNoCiAgICAgIG15c3FsLXRlc3QvaW5jbHVkZS9pcHY2X2Z1bmMuaW5jCiAgICAgIG15c3Fs
LXRlc3QvaW5jbHVkZS9zdGFydF9zbGF2ZV9pby5pbmMKICAgICAgbXlzcWwtdGVzdC9pbmNsdWRl
L3N0YXJ0X3NsYXZlX3NxbC5pbmMKICAgIG1vZGlmaWVkOgogICAgICBCVUlMRC9TRVRVUC5zaAog
ICAgICBjbGllbnQvbXlzcWwuY2MqCiAgICAgIGNsaWVudC9teXNxbGJpbmxvZy5jYwogICAgICBj
bGllbnQvbXlzcWx0ZXN0LmNjCiAgICAgIGV4dHJhL3JlcGxhY2UuYwogICAgICBpbmNsdWRlL215
c3FsLmgKICAgICAgaW5jbHVkZS9teXNxbC5oLnBwCiAgICAgIGxpYm15c3FsL2xpYm15c3FsLmMK
ICAgICAgbXlzcWwtdGVzdC9jb2xsZWN0aW9ucy9kZWZhdWx0LmV4cGVyaW1lbnRhbAogICAgICBt
eXNxbC10ZXN0L2luY2x1ZGUvaGFuZGxlci5pbmMKICAgICAgbXlzcWwtdGVzdC9pbmNsdWRlL2lw
djYuaW5jCiAgICAgIG15c3FsLXRlc3Qvci9hbHRlcl90YWJsZS5yZXN1bHQKICAgICAgbXlzcWwt
dGVzdC9yL2V2ZW50c18xLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3IvZXZlbnRzX3Jlc3RhcnQu
cmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9mbHVzaF9yZWFkX2xvY2sucmVzdWx0CiAgICAgIG15
c3FsLXRlc3Qvci9mdW5jX21pc2MucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9ncmFudDIucmVz
dWx0CiAgICAgIG15c3FsLXRlc3Qvci9ncmFudDQucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9o
YW5kbGVyX2lubm9kYi5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL2hhbmRsZXJfbXlpc2FtLnJl
c3VsdAogICAgICBteXNxbC10ZXN0L3IvaXB2NF9hc19pcHY2LnJlc3VsdAogICAgICBteXNxbC10
ZXN0L3IvaXB2Ni5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL21lcmdlLnJlc3VsdAogICAgICBt
eXNxbC10ZXN0L3IvbXlzcWxiaW5sb2dfYmFzZTY0LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3Iv
bXlzcWxkdW1wLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3IvcHNfZGRsLnJlc3VsdAogICAgICBt
eXNxbC10ZXN0L3IvdGVtcF90YWJsZS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL3R5cGVfbmV3
ZGVjaW1hbC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9mdW5jc18xL3IvaXNfY29sdW1u
c19teXNxbC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9mdW5jc18xL3IvaXNfY29sdW1u
c19teXNxbF9lbWJlZGRlZC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9p
bm5vZGJfbXlzcWwucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2Ri
X215c3FsLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvci9ycGxfY3Jhc2hfc2FmZV9t
YXN0ZXIucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3IvcnBsX2NyZWF0ZV9pZl9u
b3RfZXhpc3RzLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3JwbC9yL3JwbF9yb3dfY3Jh
c2hfc2FmZS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvci9ycGxfc2VydmVyX2lk
Mi5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvci9ycGxfc3RtX21peGVkX2NyYXNo
X3NhZmUucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3QvcnBsX2NyYXNoX3NhZmVf
bWFzdGVyLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvdC9ycGxfY3JlYXRlX2lmX25v
dF9leGlzdHMudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3JwbC90L3JwbF9yb3dfdW50aWwu
dGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3JwbC90L3JwbF9zZXJ2ZXJfaWQyLnRlc3QKICAg
ICAgbXlzcWwtdGVzdC90L2FsdGVyX3RhYmxlLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L2V2ZW50
c18xLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L2V2ZW50c19yZXN0YXJ0LnRlc3QKICAgICAgbXlz
cWwtdGVzdC90L2ZsdXNoX3JlYWRfbG9jay50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9mdW5jX21p
c2MudGVzdAogICAgICBteXNxbC10ZXN0L3QvZ3JhbnQyLnRlc3QKICAgICAgbXlzcWwtdGVzdC90
L2dyYW50NC50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9oYW5kbGVyX215aXNhbS50ZXN0CiAgICAg
IG15c3FsLXRlc3QvdC9pcHY0X2FzX2lwdjYudGVzdAogICAgICBteXNxbC10ZXN0L3QvaXB2Ni50
ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9tZXJnZS50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9teXNx
bGJpbmxvZ19iYXNlNjQudGVzdAogICAgICBteXNxbC10ZXN0L3QvbXlzcWxiaW5sb2dfcmF3X21v
ZGUudGVzdAogICAgICBteXNxbC10ZXN0L3QvbXlzcWxkdW1wLnRlc3QKICAgICAgbXlzcWwtdGVz
dC90L3BzX2RkbC50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC90ZW1wX3RhYmxlLnRlc3QKICAgICAg
bXlzcWwtdGVzdC90L3R5cGVfbmV3ZGVjaW1hbC50ZXN0CiAgICAgIHNjcmlwdHMvbWFrZV93aW5f
YmluX2Rpc3QKICAgICAgc2NyaXB0cy9teXNxbF9zeXN0ZW1fdGFibGVzLnNxbAogICAgICBzcWwv
ZXZlbnRfZGJfcmVwb3NpdG9yeS5jYwogICAgICBzcWwvZmllbGQuY2MKICAgICAgc3FsL2hhbmRs
ZXIuaAogICAgICBzcWwvaXRlbS5jYwogICAgICBzcWwvaXRlbV9jbXBmdW5jLmNjCiAgICAgIHNx
bC9pdGVtX2NyZWF0ZS5jYwogICAgICBzcWwvaXRlbV9mdW5jLmNjCiAgICAgIHNxbC9pdGVtX2lu
ZXRmdW5jLmNjCiAgICAgIHNxbC9pdGVtX2luZXRmdW5jLmgKICAgICAgc3FsL2l0ZW1fcm93LmNj
CiAgICAgIHNxbC9pdGVtX3N0cmZ1bmMuY2MKICAgICAgc3FsL2xvZ19ldmVudC5jYwogICAgICBz
cWwvbXlfZGVjaW1hbC5jYwogICAgICBzcWwvbXlfZGVjaW1hbC5oCiAgICAgIHNxbC9vcHRfcmFu
Z2UuY2MKICAgICAgc3FsL3Byb3RvY29sLmNjCiAgICAgIHNxbC9ycGxfc2xhdmUuY2MKICAgICAg
c3FsL3NwX2hlYWQuY2MKICAgICAgc3FsL3NxbF9hY2wuY2MKICAgICAgc3FsL3NxbF9hY2wuaAog
ICAgICBzcWwvc3FsX2FkbWluLmNjCiAgICAgIHNxbC9zcWxfYWx0ZXIuY2MKICAgICAgc3FsL3Nx
bF9hbmFseXNlLmNjCiAgICAgIHNxbC9zcWxfYmFzZS5jYwogICAgICBzcWwvc3FsX2Jhc2UuaAog
ICAgICBzcWwvc3FsX2NsYXNzLmgKICAgICAgc3FsL3NxbF9kYi5jYwogICAgICBzcWwvc3FsX2hh
bmRsZXIuY2MKICAgICAgc3FsL3NxbF9oYW5kbGVyLmgKICAgICAgc3FsL3NxbF9pbnNlcnQuY2MK
ICAgICAgc3FsL3NxbF9sZXguaAogICAgICBzcWwvc3FsX3BhcnNlLmNjCiAgICAgIHNxbC9zcWxf
cGFyc2UuaAogICAgICBzcWwvc3FsX3BhcnRpdGlvbi5jYwogICAgICBzcWwvc3FsX3BhcnRpdGlv
bl9hZG1pbi5jYwogICAgICBzcWwvc3FsX3ByZXBhcmUuY2MKICAgICAgc3FsL3NxbF9yZW5hbWUu
Y2MKICAgICAgc3FsL3NxbF9zZWxlY3QuY2MKICAgICAgc3FsL3NxbF9zZWxlY3QuaAogICAgICBz
cWwvc3FsX3Nob3cuY2MKICAgICAgc3FsL3NxbF90YWJsZS5jYwogICAgICBzcWwvc3FsX3RydW5j
YXRlLmNjCiAgICAgIHNxbC9zcWxfdmlldy5jYwogICAgICBzcWwvc3FsX3lhY2MueXkKICAgICAg
c3FsL3RhYmxlLmNjCiAgICAgIHNxbC90YWJsZS5oCiAgICAgIHN0b3JhZ2UvYXJjaGl2ZS9oYV9h
cmNoaXZlLmNjCiAgICAgIHN0b3JhZ2UvbXlpc2FtbXJnL2hhX215aXNhbW1yZy5jYwogICAgICBz
dG9yYWdlL25kYi9zcmMva2VybmVsL2Jsb2Nrcy9sZ21hbi5jcHAKICAgICAgc3RyaW5ncy9kZWNp
bWFsLmMKICAgICAgdmlvL3Zpb3NvY2tldC5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lu
bm9iYXNlL2RpY3QvZGljdDBjcmVhLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0
MGNyZWEuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwNTA5MDY1NDM0LWJmbG0z
NXpjM3FxNG41NTAKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3QwY3JlYS5jCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTA5MDg0ODQ3LWo5cXZxbnA5ZWV2aGRrNnAK
QEAgLTY3Nyw5ICs2NzcsOSBAQCBkaWN0X2NyZWF0ZV9pbmRleF90cmVlX3N0ZXAoCiAJLyogcHJp
bnRmKCJDcmVhdGVkIGEgbmV3IGluZGV4IHRyZWUgaW4gc3BhY2UgJWx1IHJvb3QgcGFnZSAlbHVc
biIsCiAJaW5kZXgtPnNwYWNlLCBpbmRleC0+cGFnZV9ubyk7ICovCiAKLQlwYWdlX3JlY193cml0
ZV9pbmRleF9wYWdlX25vKGJ0cl9wY3VyX2dldF9yZWMoJnBjdXIpLAotCQkJCSAgICAgRElDVF9T
WVNfSU5ERVhFU19QQUdFX05PX0ZJRUxELAotCQkJCSAgICAgbm9kZS0+cGFnZV9ubywgJm10cik7
CisJcGFnZV9yZWNfd3JpdGVfZmllbGQoYnRyX3BjdXJfZ2V0X3JlYygmcGN1ciksCisJCQkgICAg
IERJQ1RfU1lTX0lOREVYRVNfUEFHRV9OT19GSUVMRCwKKwkJCSAgICAgbm9kZS0+cGFnZV9ubywg
Jm10cik7CiAJYnRyX3BjdXJfY2xvc2UoJnBjdXIpOwogCW10cl9jb21taXQoJm10cik7CiAKQEAg
LTc0OSw5ICs3NDksOCBAQCBkaWN0X2Ryb3BfaW5kZXhfdHJlZSgKIAlyb290X3BhZ2Vfbm8pOyAq
LwogCWJ0cl9mcmVlX3Jvb3Qoc3BhY2UsIHppcF9zaXplLCByb290X3BhZ2Vfbm8sIG10cik7CiAK
LQlwYWdlX3JlY193cml0ZV9pbmRleF9wYWdlX25vKHJlYywKLQkJCQkgICAgIERJQ1RfU1lTX0lO
REVYRVNfUEFHRV9OT19GSUVMRCwKLQkJCQkgICAgIEZJTF9OVUxMLCBtdHIpOworCXBhZ2VfcmVj
X3dyaXRlX2ZpZWxkKHJlYywgRElDVF9TWVNfSU5ERVhFU19QQUdFX05PX0ZJRUxELAorCQkJICAg
ICBGSUxfTlVMTCwgbXRyKTsKIH0KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCkBAIC04NTQsOCArODUzLDgg
QEAgY3JlYXRlOgogCWluIFNZU19JTkRFWEVTLCBzbyB0aGF0IHRoZSBkYXRhYmFzZSB3aWxsIG5v
dCBnZXQgaW50byBhbgogCWluY29uc2lzdGVudCBzdGF0ZSBpbiBjYXNlIGl0IGNyYXNoZXMgYmV0
d2VlbiB0aGUgbXRyX2NvbW1pdCgpCiAJYmVsb3cgYW5kIHRoZSBmb2xsb3dpbmcgbXRyX2NvbW1p
dCgpIGNhbGwuICovCi0JcGFnZV9yZWNfd3JpdGVfaW5kZXhfcGFnZV9ubyhyZWMsIERJQ1RfU1lT
X0lOREVYRVNfUEFHRV9OT19GSUVMRCwKLQkJCQkgICAgIEZJTF9OVUxMLCBtdHIpOworCXBhZ2Vf
cmVjX3dyaXRlX2ZpZWxkKHJlYywgRElDVF9TWVNfSU5ERVhFU19QQUdFX05PX0ZJRUxELAorCQkJ
ICAgICBGSUxfTlVMTCwgbXRyKTsKIAogCS8qIFdlIHdpbGwgbmVlZCB0byBjb21taXQgdGhlIG1p
bmktdHJhbnNhY3Rpb24gaW4gb3JkZXIgdG8gYXZvaWQKIAlkZWFkbG9ja3MgaW4gdGhlIGJ0cl9j
cmVhdGUoKSBjYWxsLCBiZWNhdXNlIG90aGVyd2lzZSB3ZSB3b3VsZAoKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9wYWdlMHBhZ2UuaCcKLS0tIGEvc3RvcmFnZS9p
bm5vYmFzZS9pbmNsdWRlL3BhZ2UwcGFnZS5oCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20t
MjAxMTA1MDkwNjU0MzQtYmZsbTM1emMzcXE0bjU1MAorKysgYi9zdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvcGFnZTBwYWdlLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MDkw
ODQ4NDctajlxdnFucDllZXZoZGs2cApAQCAtNjE5LDE3ICs2MTksMTYgQEAgcGFnZV9yZWNfZmlu
ZF9vd25lcl9yZWMoCiAvKj09PT09PT09PT09PT09PT09PT09Ki8KIAlyZWNfdCoJcmVjKTsJLyoh
PCBpbjogdGhlIHBoeXNpY2FsIHJlY29yZCAqLwogLyoqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgotVGhpcyBp
cyBhIGxvdy1sZXZlbCBvcGVyYXRpb24gd2hpY2ggaXMgdXNlZCBpbiBhIGRhdGFiYXNlIGluZGV4
IGNyZWF0aW9uCi10byB1cGRhdGUgdGhlIHBhZ2UgbnVtYmVyIG9mIGEgY3JlYXRlZCBCLXRyZWUg
dG8gYSBkYXRhIGRpY3Rpb25hcnkKLXJlY29yZC4gKi8KLVVOSVZfSU5URVJOCitXcml0ZSBhIDMy
LWJpdCBmaWVsZCBpbiBhIGRhdGEgZGljdGlvbmFyeSByZWNvcmQuICovCitVTklWX0lOTElORQog
dm9pZAotcGFnZV9yZWNfd3JpdGVfaW5kZXhfcGFnZV9ubygKLS8qPT09PT09PT09PT09PT09PT09
PT09PT09PSovCi0JcmVjX3QqCXJlYywJLyohPCBpbjogcmVjb3JkIHRvIHVwZGF0ZSAqLworcGFn
ZV9yZWNfd3JpdGVfZmllbGQoCisvKj09PT09PT09PT09PT09PT09Ki8KKwlyZWNfdCoJcmVjLAkv
KiE8IGluL291dDogcmVjb3JkIHRvIHVwZGF0ZSAqLwogCXVsaW50CWksCS8qITwgaW46IGluZGV4
IG9mIHRoZSBmaWVsZCB0byB1cGRhdGUgKi8KIAl1bGludAlwYWdlX25vLC8qITwgaW46IHZhbHVl
IHRvIHdyaXRlICovCi0JbXRyX3QqCW10cik7CS8qITwgaW46IG10ciAqLworCW10cl90KgltdHIp
CS8qITwgaW4vb3V0OiBtaW5pLXRyYW5zYWN0aW9uICovCisJX19hdHRyaWJ1dGVfXygobm9ubnVs
bCkpOwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKi8vKioKIFJldHVybnMgdGhlIG1heGltdW0gY29tYmluZWQgc2l6ZSBvZiByZWNv
cmRzIHdoaWNoIGNhbiBiZSBpbnNlcnRlZCBvbiB0b3AKIG9mIHJlY29yZCBoZWFwLgoKPT09IG1v
ZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9wYWdlMHBhZ2UuaWMnCi0tLSBh
L3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9wYWdlMHBhZ2UuaWMJcmV2aWQ6dmFzaWwuZGltb3ZA
b3JhY2xlLmNvbS0yMDExMDUwOTA2NTQzNC1iZmxtMzV6YzNxcTRuNTUwCisrKyBiL3N0b3JhZ2Uv
aW5ub2Jhc2UvaW5jbHVkZS9wYWdlMHBhZ2UuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMTA1MDkwODQ4NDctajlxdnFucDllZXZoZGs2cApAQCAtOTU5LDYgKzk1OSwyNyBAQCBw
YWdlX2dldF9mcmVlX3NwYWNlX29mX2VtcHR5KAogCQkgICAgICAgLSAyICogUEFHRV9ESVJfU0xP
VF9TSVpFKSk7CiB9CiAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKK1dyaXRlIGEgMzItYml0IGZpZWxk
IGluIGEgZGF0YSBkaWN0aW9uYXJ5IHJlY29yZC4gKi8KK1VOSVZfSU5MSU5FCit2b2lkCitwYWdl
X3JlY193cml0ZV9maWVsZCgKKy8qPT09PT09PT09PT09PT09PT0qLworCXJlY190KglyZWMsCS8q
ITwgaW4vb3V0OiByZWNvcmQgdG8gdXBkYXRlICovCisJdWxpbnQJaSwJLyohPCBpbjogaW5kZXgg
b2YgdGhlIGZpZWxkIHRvIHVwZGF0ZSAqLworCXVsaW50CXZhbCwJLyohPCBpbjogdmFsdWUgdG8g
d3JpdGUgKi8KKwltdHJfdCoJbXRyKQkvKiE8IGluL291dDogbWluaS10cmFuc2FjdGlvbiAqLwor
eworCWJ5dGUqCWRhdGE7CisJdWxpbnQJbGVuOworCisJZGF0YSA9IHJlY19nZXRfbnRoX2ZpZWxk
X29sZChyZWMsIGksICZsZW4pOworCisJdXRfYWQobGVuID09IDQpOworCisJbWxvZ193cml0ZV91
bGludChkYXRhLCB2YWwsIE1MT0dfNEJZVEVTLCBtdHIpOworfQorCiAvKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogRWFjaCB1
c2VyIHJlY29yZCBvbiBhIHBhZ2UsIGFuZCBhbHNvIHRoZSBkZWxldGVkIHVzZXIgcmVjb3JkcyBp
biB0aGUgaGVhcAogdGFrZXMgaXRzIHNpemUgcGx1cyB0aGUgZnJhY3Rpb24gb2YgdGhlIGRpciBj
ZWxsIHNpemUgLwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvcGFnZS9wYWdl
MHBhZ2UuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9wYWdlL3BhZ2UwcGFnZS5jCXJldmlkOnZh
c2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTA1MDkwNjU0MzQtYmZsbTM1emMzcXE0bjU1MAorKysg
Yi9zdG9yYWdlL2lubm9iYXNlL3BhZ2UvcGFnZTBwYWdlLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTA1MDkwODQ4NDctajlxdnFucDllZXZoZGs2cApAQCAtMTI1MywyOCArMTI1
Myw2IEBAIHBhZ2VfbW92ZV9yZWNfbGlzdF9zdGFydCgKIAogCXJldHVybihUUlVFKTsKIH0KLQot
LyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqLy8qKgotVGhpcyBpcyBhIGxvdy1sZXZlbCBvcGVyYXRpb24gd2hpY2gg
aXMgdXNlZCBpbiBhIGRhdGFiYXNlIGluZGV4IGNyZWF0aW9uCi10byB1cGRhdGUgdGhlIHBhZ2Ug
bnVtYmVyIG9mIGEgY3JlYXRlZCBCLXRyZWUgdG8gYSBkYXRhIGRpY3Rpb25hcnkgcmVjb3JkLiAq
LwotVU5JVl9JTlRFUk4KLXZvaWQKLXBhZ2VfcmVjX3dyaXRlX2luZGV4X3BhZ2Vfbm8oCi0vKj09
PT09PT09PT09PT09PT09PT09PT09PT0qLwotCXJlY190KglyZWMsCS8qITwgaW46IHJlY29yZCB0
byB1cGRhdGUgKi8KLQl1bGludAlpLAkvKiE8IGluOiBpbmRleCBvZiB0aGUgZmllbGQgdG8gdXBk
YXRlICovCi0JdWxpbnQJcGFnZV9ubywvKiE8IGluOiB2YWx1ZSB0byB3cml0ZSAqLwotCW10cl90
KgltdHIpCS8qITwgaW46IG10ciAqLwotewotCWJ5dGUqCWRhdGE7Ci0JdWxpbnQJbGVuOwotCi0J
ZGF0YSA9IHJlY19nZXRfbnRoX2ZpZWxkX29sZChyZWMsIGksICZsZW4pOwotCi0JdXRfYWQobGVu
ID09IDQpOwotCi0JbWxvZ193cml0ZV91bGludChkYXRhLCBwYWdlX25vLCBNTE9HXzRCWVRFUywg
bXRyKTsKLX0KICNlbmRpZiAvKiAhVU5JVl9IT1RCQUNLVVAgKi8KIAogLyoqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgoKPT09
IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBteXNxbC5jJwotLS0gYS9z
dG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbXlzcWwuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUu
Y29tLTIwMTEwNTA5MDY1NDM0LWJmbG0zNXpjM3FxNG41NTAKKysrIGIvc3RvcmFnZS9pbm5vYmFz
ZS9yb3cvcm93MG15c3FsLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MDkw
ODQ4NDctajlxdnFucDllZXZoZGs2cApAQCAtMjk2Niw3ICsyOTY2LDcgQEAgcm93X3RydW5jYXRl
X3RhYmxlX2Zvcl9teXNxbCgKIAkJcmVjID0gYnRyX3BjdXJfZ2V0X3JlYygmcGN1cik7CiAKIAkJ
aWYgKHJvb3RfcGFnZV9ubyAhPSBGSUxfTlVMTCkgewotCQkJcGFnZV9yZWNfd3JpdGVfaW5kZXhf
cGFnZV9ubygKKwkJCXBhZ2VfcmVjX3dyaXRlX2ZpZWxkKAogCQkJCXJlYywgRElDVF9TWVNfSU5E
RVhFU19QQUdFX05PX0ZJRUxELAogCQkJCXJvb3RfcGFnZV9ubywgJm10cik7CiAJCQkvKiBXZSB3
aWxsIG5lZWQgdG8gY29tbWl0IGFuZCByZXN0YXJ0IHRoZQoK

--===============0443287656==
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.6-innodb/
# testament_sha1: 63712c7b7c62b9acdf40af8ff56bfeb41b7b1e79
# timestamp: 2011-05-09 11:50:54 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: vasil.dimov@stripped\
#   bflm35zc3qq4n550
# 
# Begin bundle
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
7mXynORpeti3v/Fo5T/F3JFOFCQJcc8QAA==


--===============0443287656==--