From: marko.makela
Date: December 13 2010 3:22pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3382) Bug#58015
List-Archive: http://lists.mysql.com/commits/126661
X-Bug: 58015
Message-Id: <201012131523.oBDF48LN027095@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0818827405=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAxMjEzMTMxODQxLThydHN0
NDBpbTZzMTVsaHoKCiAzMzgyIE1hcmtvIE3DpGtlbMOkCTIwMTAtMTItMTMKICAgICAgQnVnIzU4
MDE1IEFzc2VydCBpbiByb3dfc2VsX2ZpZWxkX3N0b3JlX2luX215c3FsX2Zvcm1hdCB3aGVuIHJ1
bm5pbmcgSUNQIHRlc3QKICAgICAgCiAgICAgIHJvd19zZWxfZmllbGRfc3RvcmVfaW5fbXlzcWxf
Zm9ybWF0X2Z1bmMoKTogUmVwbGFjZSB0aGUgcGFyYW1ldGVyCiAgICAgIGRpY3RfZmllbGRfdCog
ZmllbGQgd2l0aCBkaWN0X2luZGV4X3QqIGluZGV4LCB1bGludCBmaWVsZF9uby4gUmVsYXgKICAg
ICAgdGhlIGRlYnVnIGFzc2VydGlvbiBzbyB0aGF0IGEgY29sdW1uIHByZWZpeCBjYW4gYmUgcmV0
dXJuZWQgZHVyaW5nCiAgICAgIGluZGV4IGNvbmRpdGlvbiBwdXNoZG93biAoZmllbGRfbm8gPT0g
dGVtcGwtPmljcF9yZWNfZmllbGRfbm8pLgogICAgICAKICAgICAgQWRkIGEgdGVzdCBjYXNlIHRv
IG15c3FsLXRlc3QvaW5jbHVkZS9pY3BfdGVzdHMuaW5jIGFuZCBhZGp1c3QgdGhlCiAgICAgIHJl
c3VsdHMgZm9yIE15SVNBTSBhbmQgSW5ub0RCLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10
ZXN0L2luY2x1ZGUvaWNwX3Rlc3RzLmluYwogICAgICBteXNxbC10ZXN0L3IvaW5ub2RiX2ljcC5y
ZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL2lubm9kYl9pY3BfYWxsLnJlc3VsdAogICAgICBteXNx
bC10ZXN0L3IvaW5ub2RiX2ljcF9ub25lLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3IvbXlpc2Ft
X2ljcC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL215aXNhbV9pY3BfYWxsLnJlc3VsdAogICAg
ICBteXNxbC10ZXN0L3IvbXlpc2FtX2ljcF9ub25lLnJlc3VsdAogICAgICBzdG9yYWdlL2lubm9i
YXNlL3Jvdy9yb3cwc2VsLmMKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3QvaW5jbHVkZS9p
Y3BfdGVzdHMuaW5jJwotLS0gYS9teXNxbC10ZXN0L2luY2x1ZGUvaWNwX3Rlc3RzLmluYwlyZXZp
ZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAxMjEzMTMxODQxLThydHN0NDBpbTZzMTVsaHoK
KysrIGIvbXlzcWwtdGVzdC9pbmNsdWRlL2ljcF90ZXN0cy5pbmMJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMDEyMTMxNTIyNDUtN2k4OTE1cTNmZnYzMWxpeQpAQCAtNjQzLDMgKzY0
MywxMyBAQCBldmFsIEVYUExBSU4gJHF1ZXJ5OwogZXZhbCAkcXVlcnk7CiAKIERST1AgVEFCTEUg
dDEsdDIsdDM7CisKKy0tZWNobyAjCistLWVjaG8gIyBCdWcjNTgwMTUgIkFzc2VydCBpbiByb3df
c2VsX2ZpZWxkX3N0b3JlX2luX215c3FsX2Zvcm1hdAorLS1lY2hvICMgICAgICAgICAgICB3aGVu
IHJ1bm5pbmcgaW5ub2RiX21ycl9pY3AgdGVzdCIKKy0tZWNobyAjCisKK2NyZWF0ZSB0YWJsZSB0
MSAoYSBjaGFyKDIpIGNoYXJzZXQgdXRmOCxiIGRvdWJsZSwgcHJpbWFyeSBrZXkgKGEoMSkpLGtl
eSAoYikpOworaW5zZXJ0IGludG8gdDEgdmFsdWVzICgnJywxKTsKK3NlbGVjdCAxIGZyb20gdDEg
d2hlcmUgYiA8PSAxIGFuZCBhIDw+ICcnOworZHJvcCB0YWJsZSB0MTsKCj09PSBtb2RpZmllZCBm
aWxlICdteXNxbC10ZXN0L3IvaW5ub2RiX2ljcC5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvci9p
bm5vZGJfaWNwLnJlc3VsdAlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAxMjEzMTMx
ODQxLThydHN0NDBpbTZzMTVsaHoKKysrIGIvbXlzcWwtdGVzdC9yL2lubm9kYl9pY3AucmVzdWx0
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMjEzMTUyMjQ1LTdpODkxNXEzZmZ2
MzFsaXkKQEAgLTU4OSw1ICs1ODksMTQgQEAgRlJPTSB0MykpOwogaTEKIDIKIERST1AgVEFCTEUg
dDEsdDIsdDM7CisjCisjIEJ1ZyM1ODAxNSAiQXNzZXJ0IGluIHJvd19zZWxfZmllbGRfc3RvcmVf
aW5fbXlzcWxfZm9ybWF0CisjICAgICAgICAgICAgd2hlbiBydW5uaW5nIGlubm9kYl9tcnJfaWNw
IHRlc3QiCisjCitjcmVhdGUgdGFibGUgdDEgKGEgY2hhcigyKSBjaGFyc2V0IHV0ZjgsYiBkb3Vi
bGUsIHByaW1hcnkga2V5IChhKDEpKSxrZXkgKGIpKTsKK2luc2VydCBpbnRvIHQxIHZhbHVlcyAo
JycsMSk7CitzZWxlY3QgMSBmcm9tIHQxIHdoZXJlIGIgPD0gMSBhbmQgYSA8PiAnJzsKKzEKK2Ry
b3AgdGFibGUgdDE7CiBzZXQgZGVmYXVsdF9zdG9yYWdlX2VuZ2luZT0gQHNhdmVfc3RvcmFnZV9l
bmdpbmU7CiBzZXQgb3B0aW1pemVyX3N3aXRjaD1kZWZhdWx0OwoKPT09IG1vZGlmaWVkIGZpbGUg
J215c3FsLXRlc3Qvci9pbm5vZGJfaWNwX2FsbC5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvci9p
bm5vZGJfaWNwX2FsbC5yZXN1bHQJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMTIx
MzEzMTg0MS04cnRzdDQwaW02czE1bGh6CisrKyBiL215c3FsLXRlc3Qvci9pbm5vZGJfaWNwX2Fs
bC5yZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEyMTMxNTIyNDUtN2k4
OTE1cTNmZnYzMWxpeQpAQCAtNTg5LDUgKzU4OSwxNCBAQCBGUk9NIHQzKSk7CiBpMQogMgogRFJP
UCBUQUJMRSB0MSx0Mix0MzsKKyMKKyMgQnVnIzU4MDE1ICJBc3NlcnQgaW4gcm93X3NlbF9maWVs
ZF9zdG9yZV9pbl9teXNxbF9mb3JtYXQKKyMgICAgICAgICAgICB3aGVuIHJ1bm5pbmcgaW5ub2Ri
X21ycl9pY3AgdGVzdCIKKyMKK2NyZWF0ZSB0YWJsZSB0MSAoYSBjaGFyKDIpIGNoYXJzZXQgdXRm
OCxiIGRvdWJsZSwgcHJpbWFyeSBrZXkgKGEoMSkpLGtleSAoYikpOworaW5zZXJ0IGludG8gdDEg
dmFsdWVzICgnJywxKTsKK3NlbGVjdCAxIGZyb20gdDEgd2hlcmUgYiA8PSAxIGFuZCBhIDw+ICcn
OworMQorZHJvcCB0YWJsZSB0MTsKIHNldCBkZWZhdWx0X3N0b3JhZ2VfZW5naW5lPSBAc2F2ZV9z
dG9yYWdlX2VuZ2luZTsKIHNldCBvcHRpbWl6ZXJfc3dpdGNoPWRlZmF1bHQ7Cgo9PT0gbW9kaWZp
ZWQgZmlsZSAnbXlzcWwtdGVzdC9yL2lubm9kYl9pY3Bfbm9uZS5yZXN1bHQnCi0tLSBhL215c3Fs
LXRlc3Qvci9pbm5vZGJfaWNwX25vbmUucmVzdWx0CXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5j
b20tMjAxMDEyMTMxMzE4NDEtOHJ0c3Q0MGltNnMxNWxoegorKysgYi9teXNxbC10ZXN0L3IvaW5u
b2RiX2ljcF9ub25lLnJlc3VsdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIx
MzE1MjI0NS03aTg5MTVxM2ZmdjMxbGl5CkBAIC01ODgsNSArNTg4LDE0IEBAIEZST00gdDMpKTsK
IGkxCiAyCiBEUk9QIFRBQkxFIHQxLHQyLHQzOworIworIyBCdWcjNTgwMTUgIkFzc2VydCBpbiBy
b3dfc2VsX2ZpZWxkX3N0b3JlX2luX215c3FsX2Zvcm1hdAorIyAgICAgICAgICAgIHdoZW4gcnVu
bmluZyBpbm5vZGJfbXJyX2ljcCB0ZXN0IgorIworY3JlYXRlIHRhYmxlIHQxIChhIGNoYXIoMikg
Y2hhcnNldCB1dGY4LGIgZG91YmxlLCBwcmltYXJ5IGtleSAoYSgxKSksa2V5IChiKSk7CitpbnNl
cnQgaW50byB0MSB2YWx1ZXMgKCcnLDEpOworc2VsZWN0IDEgZnJvbSB0MSB3aGVyZSBiIDw9IDEg
YW5kIGEgPD4gJyc7CisxCitkcm9wIHRhYmxlIHQxOwogc2V0IGRlZmF1bHRfc3RvcmFnZV9lbmdp
bmU9IEBzYXZlX3N0b3JhZ2VfZW5naW5lOwogc2V0IG9wdGltaXplcl9zd2l0Y2g9ZGVmYXVsdDsK
Cj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3IvbXlpc2FtX2ljcC5yZXN1bHQnCi0tLSBh
L215c3FsLXRlc3Qvci9teWlzYW1faWNwLnJlc3VsdAlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUu
Y29tLTIwMTAxMjEzMTMxODQxLThydHN0NDBpbTZzMTVsaHoKKysrIGIvbXlzcWwtdGVzdC9yL215
aXNhbV9pY3AucmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMjEzMTUy
MjQ1LTdpODkxNXEzZmZ2MzFsaXkKQEAgLTU4Nyw0ICs1ODcsMTMgQEAgRlJPTSB0MykpOwogaTEK
IDIKIERST1AgVEFCTEUgdDEsdDIsdDM7CisjCisjIEJ1ZyM1ODAxNSAiQXNzZXJ0IGluIHJvd19z
ZWxfZmllbGRfc3RvcmVfaW5fbXlzcWxfZm9ybWF0CisjICAgICAgICAgICAgd2hlbiBydW5uaW5n
IGlubm9kYl9tcnJfaWNwIHRlc3QiCisjCitjcmVhdGUgdGFibGUgdDEgKGEgY2hhcigyKSBjaGFy
c2V0IHV0ZjgsYiBkb3VibGUsIHByaW1hcnkga2V5IChhKDEpKSxrZXkgKGIpKTsKK2luc2VydCBp
bnRvIHQxIHZhbHVlcyAoJycsMSk7CitzZWxlY3QgMSBmcm9tIHQxIHdoZXJlIGIgPD0gMSBhbmQg
YSA8PiAnJzsKKzEKK2Ryb3AgdGFibGUgdDE7CiBzZXQgb3B0aW1pemVyX3N3aXRjaD1kZWZhdWx0
OwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvci9teWlzYW1faWNwX2FsbC5yZXN1bHQn
Ci0tLSBhL215c3FsLXRlc3Qvci9teWlzYW1faWNwX2FsbC5yZXN1bHQJcmV2aWQ6dmFzaWwuZGlt
b3ZAb3JhY2xlLmNvbS0yMDEwMTIxMzEzMTg0MS04cnRzdDQwaW02czE1bGh6CisrKyBiL215c3Fs
LXRlc3Qvci9teWlzYW1faWNwX2FsbC5yZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMDEyMTMxNTIyNDUtN2k4OTE1cTNmZnYzMWxpeQpAQCAtNTg3LDQgKzU4NywxMyBAQCBG
Uk9NIHQzKSk7CiBpMQogMgogRFJPUCBUQUJMRSB0MSx0Mix0MzsKKyMKKyMgQnVnIzU4MDE1ICJB
c3NlcnQgaW4gcm93X3NlbF9maWVsZF9zdG9yZV9pbl9teXNxbF9mb3JtYXQKKyMgICAgICAgICAg
ICB3aGVuIHJ1bm5pbmcgaW5ub2RiX21ycl9pY3AgdGVzdCIKKyMKK2NyZWF0ZSB0YWJsZSB0MSAo
YSBjaGFyKDIpIGNoYXJzZXQgdXRmOCxiIGRvdWJsZSwgcHJpbWFyeSBrZXkgKGEoMSkpLGtleSAo
YikpOworaW5zZXJ0IGludG8gdDEgdmFsdWVzICgnJywxKTsKK3NlbGVjdCAxIGZyb20gdDEgd2hl
cmUgYiA8PSAxIGFuZCBhIDw+ICcnOworMQorZHJvcCB0YWJsZSB0MTsKIHNldCBvcHRpbWl6ZXJf
c3dpdGNoPWRlZmF1bHQ7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL215aXNhbV9p
Y3Bfbm9uZS5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvci9teWlzYW1faWNwX25vbmUucmVzdWx0
CXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMDEyMTMxMzE4NDEtOHJ0c3Q0MGltNnMx
NWxoegorKysgYi9teXNxbC10ZXN0L3IvbXlpc2FtX2ljcF9ub25lLnJlc3VsdAlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIxMzE1MjI0NS03aTg5MTVxM2ZmdjMxbGl5CkBAIC01
ODYsNCArNTg2LDEzIEBAIEZST00gdDMpKTsKIGkxCiAyCiBEUk9QIFRBQkxFIHQxLHQyLHQzOwor
IworIyBCdWcjNTgwMTUgIkFzc2VydCBpbiByb3dfc2VsX2ZpZWxkX3N0b3JlX2luX215c3FsX2Zv
cm1hdAorIyAgICAgICAgICAgIHdoZW4gcnVubmluZyBpbm5vZGJfbXJyX2ljcCB0ZXN0IgorIwor
Y3JlYXRlIHRhYmxlIHQxIChhIGNoYXIoMikgY2hhcnNldCB1dGY4LGIgZG91YmxlLCBwcmltYXJ5
IGtleSAoYSgxKSksa2V5IChiKSk7CitpbnNlcnQgaW50byB0MSB2YWx1ZXMgKCcnLDEpOworc2Vs
ZWN0IDEgZnJvbSB0MSB3aGVyZSBiIDw9IDEgYW5kIGEgPD4gJyc7CisxCitkcm9wIHRhYmxlIHQx
Owogc2V0IG9wdGltaXplcl9zd2l0Y2g9ZGVmYXVsdDsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9iYXNlL3Jvdy9yb3cwc2VsLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3Jv
dzBzZWwuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAxMjEzMTMxODQxLThydHN0
NDBpbTZzMTVsaHoKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMjEzMTUyMjQ1LTdpODkxNXEzZmZ2MzFsaXkKQEAg
LTI1MjgsMTEgKzI1MjgsMTEgQEAgcm93X3NlbF9zdG9yZV9yb3dfaWRfdG9fcHJlYnVpbHQoCiAK
ICNpZmRlZiBVTklWX0RFQlVHCiAvKiogQ29udmVydCBhIG5vbi1TUUwtTlVMTCBmaWVsZCBmcm9t
IElubm9iYXNlIGZvcm1hdCB0byBNeVNRTCBmb3JtYXQuICovCi0jIGRlZmluZSByb3dfc2VsX2Zp
ZWxkX3N0b3JlX2luX215c3FsX2Zvcm1hdChkZXN0LHRlbXBsLGZpZWxkLHNyYyxsZW4pCVwKLQly
b3dfc2VsX2ZpZWxkX3N0b3JlX2luX215c3FsX2Zvcm1hdF9mdW5jKGRlc3QsdGVtcGwsZmllbGQs
c3JjLGxlbikKKyMgZGVmaW5lIHJvd19zZWxfZmllbGRfc3RvcmVfaW5fbXlzcWxfZm9ybWF0KGRl
c3QsdGVtcGwsaWR4LGZpZWxkLHNyYyxsZW4pIFwKKwlyb3dfc2VsX2ZpZWxkX3N0b3JlX2luX215
c3FsX2Zvcm1hdF9mdW5jKGRlc3QsdGVtcGwsaWR4LGZpZWxkLHNyYyxsZW4pCiAjZWxzZSAvKiBV
TklWX0RFQlVHICovCiAvKiogQ29udmVydCBhIG5vbi1TUUwtTlVMTCBmaWVsZCBmcm9tIElubm9i
YXNlIGZvcm1hdCB0byBNeVNRTCBmb3JtYXQuICovCi0jIGRlZmluZSByb3dfc2VsX2ZpZWxkX3N0
b3JlX2luX215c3FsX2Zvcm1hdChkZXN0LHRlbXBsLGZpZWxkLHNyYyxsZW4pCVwKKyMgZGVmaW5l
IHJvd19zZWxfZmllbGRfc3RvcmVfaW5fbXlzcWxfZm9ybWF0KGRlc3QsdGVtcGwsaWR4LGZpZWxk
LHNyYyxsZW4pIFwKIAlyb3dfc2VsX2ZpZWxkX3N0b3JlX2luX215c3FsX2Zvcm1hdF9mdW5jKGRl
c3QsdGVtcGwsc3JjLGxlbikKICNlbmRpZiAvKiBVTklWX0RFQlVHICovCiAKQEAgLTI1NTUsMTMg
KzI1NTUsMjEgQEAgcm93X3NlbF9maWVsZF9zdG9yZV9pbl9teXNxbF9mb3JtYXRfZnVuYwogCQkJ
CXR5cGUsIGlzX3Vuc2lnbmVkLCBteXNxbF9jb2xfbGVuLAogCQkJCW1ibWlubGVuLCBtYm1heGxl
biAqLwogI2lmZGVmIFVOSVZfREVCVUcKLQljb25zdCBkaWN0X2ZpZWxkX3QqIGZpZWxkLAotCQkJ
CS8qITwgaW46IElubm9EQiBpbmRleCBmaWVsZCAqLworCWNvbnN0IGRpY3RfaW5kZXhfdCogaW5k
ZXgsCisJCQkJLyohPCBpbjogSW5ub0RCIGluZGV4ICovCisJdWxpbnQJCWZpZWxkX25vLAorCQkJ
CS8qITwgaW46IHRlbXBsLT5yZWNfZmllbGRfbm8gb3IKKwkJCQl0ZW1wbC0+Y2x1c3RfcmVjX2Zp
ZWxkX25vIG9yCisJCQkJdGVtcGwtPmljcF9yZWNfZmllbGRfbm8gKi8KICNlbmRpZiAvKiBVTklW
X0RFQlVHICovCiAJY29uc3QgYnl0ZSoJZGF0YSwJLyohPCBpbjogZGF0YSB0byBzdG9yZSAqLwog
CXVsaW50CQlsZW4pCS8qITwgaW46IGxlbmd0aCBvZiB0aGUgZGF0YSAqLwogewotCWJ5dGUqCXB0
cjsKKwlieXRlKgkJCXB0cjsKKyNpZmRlZiBVTklWX0RFQlVHCisJY29uc3QgZGljdF9maWVsZF90
KglmaWVsZAorCQk9IGRpY3RfaW5kZXhfZ2V0X250aF9maWVsZChpbmRleCwgZmllbGRfbm8pOwor
I2VuZGlmIC8qIFVOSVZfREVCVUcgKi8KIAogCXV0X2FkKGxlbiAhPSBVTklWX1NRTF9OVUxMKTsK
IAlVTklWX01FTV9BU1NFUlRfUlcoZGF0YSwgbGVuKTsKQEAgLTI2NjAsNyArMjY2OCwxMCBAQCBy
b3dfc2VsX2ZpZWxkX3N0b3JlX2luX215c3FsX2Zvcm1hdF9mdW5jCiAJCWNvbnRhaW5pbmcgVVRG
LTggRU5VTSBjb2x1bW5zIGR1ZSB0byBCdWcgIzk1MjYuICovCiAJCXV0X2FkKCF0ZW1wbC0+bWJt
YXhsZW4KIAkJICAgICAgfHwgISh0ZW1wbC0+bXlzcWxfY29sX2xlbiAlIHRlbXBsLT5tYm1heGxl
bikpOwotCQl1dF9hZChsZW4gKiB0ZW1wbC0+bWJtYXhsZW4gPj0gdGVtcGwtPm15c3FsX2NvbF9s
ZW4pOworCQl1dF9hZChsZW4gKiB0ZW1wbC0+bWJtYXhsZW4gPj0gdGVtcGwtPm15c3FsX2NvbF9s
ZW4KKwkJICAgICAgfHwgKGZpZWxkX25vID09IHRlbXBsLT5pY3BfcmVjX2ZpZWxkX25vCisJCQkg
ICYmIGZpZWxkLT5wcmVmaXhfbGVuID4gMCkpOworCQl1dF9hZCghKGZpZWxkLT5wcmVmaXhfbGVu
ICUgdGVtcGwtPm1ibWF4bGVuKSk7CiAKIAkJaWYgKHRlbXBsLT5tYm1pbmxlbiA9PSAxICYmIHRl
bXBsLT5tYm1heGxlbiAhPSAxKSB7CiAJCQkvKiBQYWQgd2l0aCBzcGFjZXMuIFRoaXMgdW5kb2Vz
IHRoZSBzdHJpcHBpbmcKQEAgLTI3ODIsOCArMjc5Myw3IEBAIHJvd19zZWxfc3RvcmVfbXlzcWxf
ZmllbGRfZnVuYygKIAogCQlyb3dfc2VsX2ZpZWxkX3N0b3JlX2luX215c3FsX2Zvcm1hdCgKIAkJ
CW15c3FsX3JlYyArIHRlbXBsLT5teXNxbF9jb2xfb2Zmc2V0LAotCQkJdGVtcGwsIGRpY3RfaW5k
ZXhfZ2V0X250aF9maWVsZChpbmRleCwgZmllbGRfbm8pLAotCQkJZGF0YSwgbGVuKTsKKwkJCXRl
bXBsLCBpbmRleCwgZmllbGRfbm8sIGRhdGEsIGxlbik7CiAKIAkJaWYgKGhlYXAgIT0gcHJlYnVp
bHQtPmJsb2JfaGVhcCkgewogCQkJbWVtX2hlYXBfZnJlZShoZWFwKTsKQEAgLTI4MzIsOCArMjg0
Miw3IEBAIHJvd19zZWxfc3RvcmVfbXlzcWxfZmllbGRfZnVuYygKIAogCQlyb3dfc2VsX2ZpZWxk
X3N0b3JlX2luX215c3FsX2Zvcm1hdCgKIAkJCW15c3FsX3JlYyArIHRlbXBsLT5teXNxbF9jb2xf
b2Zmc2V0LAotCQkJdGVtcGwsIGRpY3RfaW5kZXhfZ2V0X250aF9maWVsZChpbmRleCwgZmllbGRf
bm8pLAotCQkJZGF0YSwgbGVuKTsKKwkJCXRlbXBsLCBpbmRleCwgZmllbGRfbm8sIGRhdGEsIGxl
bik7CiAJfQogCiAJdXRfYWQobGVuICE9IFVOSVZfU1FMX05VTEwpOwoK

--===============0818827405==
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: 287d21de3a07bdc9c5d6a79e7a81cae989e9f6c4
# timestamp: 2010-12-13 17:22:54 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: vasil.dimov@stripped\
#   8rtst40im6s15lhz
# 
# Begin bundle
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
F3JFOFCQGMgLJg==


--===============0818827405==--