From: marko.makela
Date: December 13 2010 3:44pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3381 to 3382) Bug#58015
List-Archive: http://lists.mysql.com/commits/126666
X-Bug: 58015
Message-Id: <201012131544.oBDDZhfo002359@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1787281564=="

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

IDMzODIgTWFya28gTcOka2Vsw6QJMjAxMC0xMi0xMwogICAgICBCdWcjNTgwMTUgQXNzZXJ0IGlu
IHJvd19zZWxfZmllbGRfc3RvcmVfaW5fbXlzcWxfZm9ybWF0IHdoZW4gcnVubmluZyBJQ1AgdGVz
dAogICAgICAKICAgICAgcm93X3NlbF9maWVsZF9zdG9yZV9pbl9teXNxbF9mb3JtYXRfZnVuYygp
OiBSZXBsYWNlIHRoZSBwYXJhbWV0ZXIKICAgICAgZGljdF9maWVsZF90KiBmaWVsZCB3aXRoIGRp
Y3RfaW5kZXhfdCogaW5kZXgsIHVsaW50IGZpZWxkX25vLiBSZWxheAogICAgICB0aGUgZGVidWcg
YXNzZXJ0aW9uIHNvIHRoYXQgYSBjb2x1bW4gcHJlZml4IGNhbiBiZSByZXR1cm5lZCBkdXJpbmcK
ICAgICAgaW5kZXggY29uZGl0aW9uIHB1c2hkb3duIChmaWVsZF9ubyA9PSB0ZW1wbC0+aWNwX3Jl
Y19maWVsZF9ubykuCiAgICAgIAogICAgICBBZGQgYSB0ZXN0IGNhc2UgdG8gbXlzcWwtdGVzdC9p
bmNsdWRlL2ljcF90ZXN0cy5pbmMgYW5kIGFkanVzdCB0aGUKICAgICAgcmVzdWx0cyBmb3IgTXlJ
U0FNIGFuZCBJbm5vREIuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3QvaW5jbHVkZS9p
Y3BfdGVzdHMuaW5jCiAgICAgIG15c3FsLXRlc3Qvci9pbm5vZGJfaWNwLnJlc3VsdAogICAgICBt
eXNxbC10ZXN0L3IvaW5ub2RiX2ljcF9hbGwucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9pbm5v
ZGJfaWNwX25vbmUucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9teWlzYW1faWNwLnJlc3VsdAog
ICAgICBteXNxbC10ZXN0L3IvbXlpc2FtX2ljcF9hbGwucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qv
ci9teWlzYW1faWNwX25vbmUucmVzdWx0CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBz
ZWwuYwogMzM4MSBWYXNpbCBEaW1vdgkyMDEwLTEyLTEzCiAgICAgIEluY3JlbWVudCBJbm5vREIg
dmVyc2lvbiBmcm9tIDEuMi4wIHRvIDEuMi4xCiAgICAgIAogICAgICBJbm5vREIgMS4yLjAgd2Fz
IG5vdCByZWxlYXNlZCB0byBwdWJsaWMsIGJ1dCB3ZSB3YW50IHRvIGJlCiAgICAgIGluIGxpbmUg
d2l0aCBNeVNRTCB2ZXJzaW9uIHdoaWNoIGlzIG5vdyBhdCA1LjYuMS4KICAgICAgCiAgICAgIFN1
Z2dlc3RlZCBieToJQ2FsdmluIFN1bgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvdW5pdi5pCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L2luY2x1ZGUv
aWNwX3Rlc3RzLmluYycKLS0tIGEvbXlzcWwtdGVzdC9pbmNsdWRlL2ljcF90ZXN0cy5pbmMJcmV2
aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMTIxMzEzMTg0MS04cnRzdDQwaW02czE1bGh6
CisrKyBiL215c3FsLXRlc3QvaW5jbHVkZS9pY3BfdGVzdHMuaW5jCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTAxMjEzMTUyMjQ1LTdpODkxNXEzZmZ2MzFsaXkKQEAgLTY0MywzICs2
NDMsMTMgQEAgZXZhbCBFWFBMQUlOICRxdWVyeTsKIGV2YWwgJHF1ZXJ5OwogCiBEUk9QIFRBQkxF
IHQxLHQyLHQzOworCistLWVjaG8gIworLS1lY2hvICMgQnVnIzU4MDE1ICJBc3NlcnQgaW4gcm93
X3NlbF9maWVsZF9zdG9yZV9pbl9teXNxbF9mb3JtYXQKKy0tZWNobyAjICAgICAgICAgICAgd2hl
biBydW5uaW5nIGlubm9kYl9tcnJfaWNwIHRlc3QiCistLWVjaG8gIworCitjcmVhdGUgdGFibGUg
dDEgKGEgY2hhcigyKSBjaGFyc2V0IHV0ZjgsYiBkb3VibGUsIHByaW1hcnkga2V5IChhKDEpKSxr
ZXkgKGIpKTsKK2luc2VydCBpbnRvIHQxIHZhbHVlcyAoJycsMSk7CitzZWxlY3QgMSBmcm9tIHQx
IHdoZXJlIGIgPD0gMSBhbmQgYSA8PiAnJzsKK2Ryb3AgdGFibGUgdDE7Cgo9PT0gbW9kaWZpZWQg
ZmlsZSAnbXlzcWwtdGVzdC9yL2lubm9kYl9pY3AucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3Iv
aW5ub2RiX2ljcC5yZXN1bHQJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMTIxMzEz
MTg0MS04cnRzdDQwaW02czE1bGh6CisrKyBiL215c3FsLXRlc3Qvci9pbm5vZGJfaWNwLnJlc3Vs
dAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIxMzE1MjI0NS03aTg5MTVxM2Zm
djMxbGl5CkBAIC01ODksNSArNTg5LDE0IEBAIEZST00gdDMpKTsKIGkxCiAyCiBEUk9QIFRBQkxF
IHQxLHQyLHQzOworIworIyBCdWcjNTgwMTUgIkFzc2VydCBpbiByb3dfc2VsX2ZpZWxkX3N0b3Jl
X2luX215c3FsX2Zvcm1hdAorIyAgICAgICAgICAgIHdoZW4gcnVubmluZyBpbm5vZGJfbXJyX2lj
cCB0ZXN0IgorIworY3JlYXRlIHRhYmxlIHQxIChhIGNoYXIoMikgY2hhcnNldCB1dGY4LGIgZG91
YmxlLCBwcmltYXJ5IGtleSAoYSgxKSksa2V5IChiKSk7CitpbnNlcnQgaW50byB0MSB2YWx1ZXMg
KCcnLDEpOworc2VsZWN0IDEgZnJvbSB0MSB3aGVyZSBiIDw9IDEgYW5kIGEgPD4gJyc7CisxCitk
cm9wIHRhYmxlIHQxOwogc2V0IGRlZmF1bHRfc3RvcmFnZV9lbmdpbmU9IEBzYXZlX3N0b3JhZ2Vf
ZW5naW5lOwogc2V0IG9wdGltaXplcl9zd2l0Y2g9ZGVmYXVsdDsKCj09PSBtb2RpZmllZCBmaWxl
ICdteXNxbC10ZXN0L3IvaW5ub2RiX2ljcF9hbGwucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3Iv
aW5ub2RiX2ljcF9hbGwucmVzdWx0CXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMDEy
MTMxMzE4NDEtOHJ0c3Q0MGltNnMxNWxoegorKysgYi9teXNxbC10ZXN0L3IvaW5ub2RiX2ljcF9h
bGwucmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMjEzMTUyMjQ1LTdp
ODkxNXEzZmZ2MzFsaXkKQEAgLTU4OSw1ICs1ODksMTQgQEAgRlJPTSB0MykpOwogaTEKIDIKIERS
T1AgVEFCTEUgdDEsdDIsdDM7CisjCisjIEJ1ZyM1ODAxNSAiQXNzZXJ0IGluIHJvd19zZWxfZmll
bGRfc3RvcmVfaW5fbXlzcWxfZm9ybWF0CisjICAgICAgICAgICAgd2hlbiBydW5uaW5nIGlubm9k
Yl9tcnJfaWNwIHRlc3QiCisjCitjcmVhdGUgdGFibGUgdDEgKGEgY2hhcigyKSBjaGFyc2V0IHV0
ZjgsYiBkb3VibGUsIHByaW1hcnkga2V5IChhKDEpKSxrZXkgKGIpKTsKK2luc2VydCBpbnRvIHQx
IHZhbHVlcyAoJycsMSk7CitzZWxlY3QgMSBmcm9tIHQxIHdoZXJlIGIgPD0gMSBhbmQgYSA8PiAn
JzsKKzEKK2Ryb3AgdGFibGUgdDE7CiBzZXQgZGVmYXVsdF9zdG9yYWdlX2VuZ2luZT0gQHNhdmVf
c3RvcmFnZV9lbmdpbmU7CiBzZXQgb3B0aW1pemVyX3N3aXRjaD1kZWZhdWx0OwoKPT09IG1vZGlm
aWVkIGZpbGUgJ215c3FsLXRlc3Qvci9pbm5vZGJfaWNwX25vbmUucmVzdWx0JwotLS0gYS9teXNx
bC10ZXN0L3IvaW5ub2RiX2ljcF9ub25lLnJlc3VsdAlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUu
Y29tLTIwMTAxMjEzMTMxODQxLThydHN0NDBpbTZzMTVsaHoKKysrIGIvbXlzcWwtdGVzdC9yL2lu
bm9kYl9pY3Bfbm9uZS5yZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEy
MTMxNTIyNDUtN2k4OTE1cTNmZnYzMWxpeQpAQCAtNTg4LDUgKzU4OCwxNCBAQCBGUk9NIHQzKSk7
CiBpMQogMgogRFJPUCBUQUJMRSB0MSx0Mix0MzsKKyMKKyMgQnVnIzU4MDE1ICJBc3NlcnQgaW4g
cm93X3NlbF9maWVsZF9zdG9yZV9pbl9teXNxbF9mb3JtYXQKKyMgICAgICAgICAgICB3aGVuIHJ1
bm5pbmcgaW5ub2RiX21ycl9pY3AgdGVzdCIKKyMKK2NyZWF0ZSB0YWJsZSB0MSAoYSBjaGFyKDIp
IGNoYXJzZXQgdXRmOCxiIGRvdWJsZSwgcHJpbWFyeSBrZXkgKGEoMSkpLGtleSAoYikpOworaW5z
ZXJ0IGludG8gdDEgdmFsdWVzICgnJywxKTsKK3NlbGVjdCAxIGZyb20gdDEgd2hlcmUgYiA8PSAx
IGFuZCBhIDw+ICcnOworMQorZHJvcCB0YWJsZSB0MTsKIHNldCBkZWZhdWx0X3N0b3JhZ2VfZW5n
aW5lPSBAc2F2ZV9zdG9yYWdlX2VuZ2luZTsKIHNldCBvcHRpbWl6ZXJfc3dpdGNoPWRlZmF1bHQ7
Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL215aXNhbV9pY3AucmVzdWx0JwotLS0g
YS9teXNxbC10ZXN0L3IvbXlpc2FtX2ljcC5yZXN1bHQJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xl
LmNvbS0yMDEwMTIxMzEzMTg0MS04cnRzdDQwaW02czE1bGh6CisrKyBiL215c3FsLXRlc3Qvci9t
eWlzYW1faWNwLnJlc3VsdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIxMzE1
MjI0NS03aTg5MTVxM2ZmdjMxbGl5CkBAIC01ODcsNCArNTg3LDEzIEBAIEZST00gdDMpKTsKIGkx
CiAyCiBEUk9QIFRBQkxFIHQxLHQyLHQzOworIworIyBCdWcjNTgwMTUgIkFzc2VydCBpbiByb3df
c2VsX2ZpZWxkX3N0b3JlX2luX215c3FsX2Zvcm1hdAorIyAgICAgICAgICAgIHdoZW4gcnVubmlu
ZyBpbm5vZGJfbXJyX2ljcCB0ZXN0IgorIworY3JlYXRlIHRhYmxlIHQxIChhIGNoYXIoMikgY2hh
cnNldCB1dGY4LGIgZG91YmxlLCBwcmltYXJ5IGtleSAoYSgxKSksa2V5IChiKSk7CitpbnNlcnQg
aW50byB0MSB2YWx1ZXMgKCcnLDEpOworc2VsZWN0IDEgZnJvbSB0MSB3aGVyZSBiIDw9IDEgYW5k
IGEgPD4gJyc7CisxCitkcm9wIHRhYmxlIHQxOwogc2V0IG9wdGltaXplcl9zd2l0Y2g9ZGVmYXVs
dDsKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3IvbXlpc2FtX2ljcF9hbGwucmVzdWx0
JwotLS0gYS9teXNxbC10ZXN0L3IvbXlpc2FtX2ljcF9hbGwucmVzdWx0CXJldmlkOnZhc2lsLmRp
bW92QG9yYWNsZS5jb20tMjAxMDEyMTMxMzE4NDEtOHJ0c3Q0MGltNnMxNWxoegorKysgYi9teXNx
bC10ZXN0L3IvbXlpc2FtX2ljcF9hbGwucmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTAxMjEzMTUyMjQ1LTdpODkxNXEzZmZ2MzFsaXkKQEAgLTU4Nyw0ICs1ODcsMTMgQEAg
RlJPTSB0MykpOwogaTEKIDIKIERST1AgVEFCTEUgdDEsdDIsdDM7CisjCisjIEJ1ZyM1ODAxNSAi
QXNzZXJ0IGluIHJvd19zZWxfZmllbGRfc3RvcmVfaW5fbXlzcWxfZm9ybWF0CisjICAgICAgICAg
ICAgd2hlbiBydW5uaW5nIGlubm9kYl9tcnJfaWNwIHRlc3QiCisjCitjcmVhdGUgdGFibGUgdDEg
KGEgY2hhcigyKSBjaGFyc2V0IHV0ZjgsYiBkb3VibGUsIHByaW1hcnkga2V5IChhKDEpKSxrZXkg
KGIpKTsKK2luc2VydCBpbnRvIHQxIHZhbHVlcyAoJycsMSk7CitzZWxlY3QgMSBmcm9tIHQxIHdo
ZXJlIGIgPD0gMSBhbmQgYSA8PiAnJzsKKzEKK2Ryb3AgdGFibGUgdDE7CiBzZXQgb3B0aW1pemVy
X3N3aXRjaD1kZWZhdWx0OwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvci9teWlzYW1f
aWNwX25vbmUucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3IvbXlpc2FtX2ljcF9ub25lLnJlc3Vs
dAlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAxMjEzMTMxODQxLThydHN0NDBpbTZz
MTVsaHoKKysrIGIvbXlzcWwtdGVzdC9yL215aXNhbV9pY3Bfbm9uZS5yZXN1bHQJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEyMTMxNTIyNDUtN2k4OTE1cTNmZnYzMWxpeQpAQCAt
NTg2LDQgKzU4NiwxMyBAQCBGUk9NIHQzKSk7CiBpMQogMgogRFJPUCBUQUJMRSB0MSx0Mix0MzsK
KyMKKyMgQnVnIzU4MDE1ICJBc3NlcnQgaW4gcm93X3NlbF9maWVsZF9zdG9yZV9pbl9teXNxbF9m
b3JtYXQKKyMgICAgICAgICAgICB3aGVuIHJ1bm5pbmcgaW5ub2RiX21ycl9pY3AgdGVzdCIKKyMK
K2NyZWF0ZSB0YWJsZSB0MSAoYSBjaGFyKDIpIGNoYXJzZXQgdXRmOCxiIGRvdWJsZSwgcHJpbWFy
eSBrZXkgKGEoMSkpLGtleSAoYikpOworaW5zZXJ0IGludG8gdDEgdmFsdWVzICgnJywxKTsKK3Nl
bGVjdCAxIGZyb20gdDEgd2hlcmUgYiA8PSAxIGFuZCBhIDw+ICcnOworMQorZHJvcCB0YWJsZSB0
MTsKIHNldCBvcHRpbWl6ZXJfc3dpdGNoPWRlZmF1bHQ7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9y
b3cwc2VsLmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMTIxMzEzMTg0MS04cnRz
dDQwaW02czE1bGh6CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIxMzE1MjI0NS03aTg5MTVxM2ZmdjMxbGl5CkBA
IC0yNTI4LDExICsyNTI4LDExIEBAIHJvd19zZWxfc3RvcmVfcm93X2lkX3RvX3ByZWJ1aWx0KAog
CiAjaWZkZWYgVU5JVl9ERUJVRwogLyoqIENvbnZlcnQgYSBub24tU1FMLU5VTEwgZmllbGQgZnJv
bSBJbm5vYmFzZSBmb3JtYXQgdG8gTXlTUUwgZm9ybWF0LiAqLwotIyBkZWZpbmUgcm93X3NlbF9m
aWVsZF9zdG9yZV9pbl9teXNxbF9mb3JtYXQoZGVzdCx0ZW1wbCxmaWVsZCxzcmMsbGVuKQlcCi0J
cm93X3NlbF9maWVsZF9zdG9yZV9pbl9teXNxbF9mb3JtYXRfZnVuYyhkZXN0LHRlbXBsLGZpZWxk
LHNyYyxsZW4pCisjIGRlZmluZSByb3dfc2VsX2ZpZWxkX3N0b3JlX2luX215c3FsX2Zvcm1hdChk
ZXN0LHRlbXBsLGlkeCxmaWVsZCxzcmMsbGVuKSBcCisJcm93X3NlbF9maWVsZF9zdG9yZV9pbl9t
eXNxbF9mb3JtYXRfZnVuYyhkZXN0LHRlbXBsLGlkeCxmaWVsZCxzcmMsbGVuKQogI2Vsc2UgLyog
VU5JVl9ERUJVRyAqLwogLyoqIENvbnZlcnQgYSBub24tU1FMLU5VTEwgZmllbGQgZnJvbSBJbm5v
YmFzZSBmb3JtYXQgdG8gTXlTUUwgZm9ybWF0LiAqLwotIyBkZWZpbmUgcm93X3NlbF9maWVsZF9z
dG9yZV9pbl9teXNxbF9mb3JtYXQoZGVzdCx0ZW1wbCxmaWVsZCxzcmMsbGVuKQlcCisjIGRlZmlu
ZSByb3dfc2VsX2ZpZWxkX3N0b3JlX2luX215c3FsX2Zvcm1hdChkZXN0LHRlbXBsLGlkeCxmaWVs
ZCxzcmMsbGVuKSBcCiAJcm93X3NlbF9maWVsZF9zdG9yZV9pbl9teXNxbF9mb3JtYXRfZnVuYyhk
ZXN0LHRlbXBsLHNyYyxsZW4pCiAjZW5kaWYgLyogVU5JVl9ERUJVRyAqLwogCkBAIC0yNTU1LDEz
ICsyNTU1LDIxIEBAIHJvd19zZWxfZmllbGRfc3RvcmVfaW5fbXlzcWxfZm9ybWF0X2Z1bmMKIAkJ
CQl0eXBlLCBpc191bnNpZ25lZCwgbXlzcWxfY29sX2xlbiwKIAkJCQltYm1pbmxlbiwgbWJtYXhs
ZW4gKi8KICNpZmRlZiBVTklWX0RFQlVHCi0JY29uc3QgZGljdF9maWVsZF90KiBmaWVsZCwKLQkJ
CQkvKiE8IGluOiBJbm5vREIgaW5kZXggZmllbGQgKi8KKwljb25zdCBkaWN0X2luZGV4X3QqIGlu
ZGV4LAorCQkJCS8qITwgaW46IElubm9EQiBpbmRleCAqLworCXVsaW50CQlmaWVsZF9ubywKKwkJ
CQkvKiE8IGluOiB0ZW1wbC0+cmVjX2ZpZWxkX25vIG9yCisJCQkJdGVtcGwtPmNsdXN0X3JlY19m
aWVsZF9ubyBvcgorCQkJCXRlbXBsLT5pY3BfcmVjX2ZpZWxkX25vICovCiAjZW5kaWYgLyogVU5J
Vl9ERUJVRyAqLwogCWNvbnN0IGJ5dGUqCWRhdGEsCS8qITwgaW46IGRhdGEgdG8gc3RvcmUgKi8K
IAl1bGludAkJbGVuKQkvKiE8IGluOiBsZW5ndGggb2YgdGhlIGRhdGEgKi8KIHsKLQlieXRlKglw
dHI7CisJYnl0ZSoJCQlwdHI7CisjaWZkZWYgVU5JVl9ERUJVRworCWNvbnN0IGRpY3RfZmllbGRf
dCoJZmllbGQKKwkJPSBkaWN0X2luZGV4X2dldF9udGhfZmllbGQoaW5kZXgsIGZpZWxkX25vKTsK
KyNlbmRpZiAvKiBVTklWX0RFQlVHICovCiAKIAl1dF9hZChsZW4gIT0gVU5JVl9TUUxfTlVMTCk7
CiAJVU5JVl9NRU1fQVNTRVJUX1JXKGRhdGEsIGxlbik7CkBAIC0yNjYwLDcgKzI2NjgsMTAgQEAg
cm93X3NlbF9maWVsZF9zdG9yZV9pbl9teXNxbF9mb3JtYXRfZnVuYwogCQljb250YWluaW5nIFVU
Ri04IEVOVU0gY29sdW1ucyBkdWUgdG8gQnVnICM5NTI2LiAqLwogCQl1dF9hZCghdGVtcGwtPm1i
bWF4bGVuCiAJCSAgICAgIHx8ICEodGVtcGwtPm15c3FsX2NvbF9sZW4gJSB0ZW1wbC0+bWJtYXhs
ZW4pKTsKLQkJdXRfYWQobGVuICogdGVtcGwtPm1ibWF4bGVuID49IHRlbXBsLT5teXNxbF9jb2xf
bGVuKTsKKwkJdXRfYWQobGVuICogdGVtcGwtPm1ibWF4bGVuID49IHRlbXBsLT5teXNxbF9jb2xf
bGVuCisJCSAgICAgIHx8IChmaWVsZF9ubyA9PSB0ZW1wbC0+aWNwX3JlY19maWVsZF9ubworCQkJ
ICAmJiBmaWVsZC0+cHJlZml4X2xlbiA+IDApKTsKKwkJdXRfYWQoIShmaWVsZC0+cHJlZml4X2xl
biAlIHRlbXBsLT5tYm1heGxlbikpOwogCiAJCWlmICh0ZW1wbC0+bWJtaW5sZW4gPT0gMSAmJiB0
ZW1wbC0+bWJtYXhsZW4gIT0gMSkgewogCQkJLyogUGFkIHdpdGggc3BhY2VzLiBUaGlzIHVuZG9l
cyB0aGUgc3RyaXBwaW5nCkBAIC0yNzgyLDggKzI3OTMsNyBAQCByb3dfc2VsX3N0b3JlX215c3Fs
X2ZpZWxkX2Z1bmMoCiAKIAkJcm93X3NlbF9maWVsZF9zdG9yZV9pbl9teXNxbF9mb3JtYXQoCiAJ
CQlteXNxbF9yZWMgKyB0ZW1wbC0+bXlzcWxfY29sX29mZnNldCwKLQkJCXRlbXBsLCBkaWN0X2lu
ZGV4X2dldF9udGhfZmllbGQoaW5kZXgsIGZpZWxkX25vKSwKLQkJCWRhdGEsIGxlbik7CisJCQl0
ZW1wbCwgaW5kZXgsIGZpZWxkX25vLCBkYXRhLCBsZW4pOwogCiAJCWlmIChoZWFwICE9IHByZWJ1
aWx0LT5ibG9iX2hlYXApIHsKIAkJCW1lbV9oZWFwX2ZyZWUoaGVhcCk7CkBAIC0yODMyLDggKzI4
NDIsNyBAQCByb3dfc2VsX3N0b3JlX215c3FsX2ZpZWxkX2Z1bmMoCiAKIAkJcm93X3NlbF9maWVs
ZF9zdG9yZV9pbl9teXNxbF9mb3JtYXQoCiAJCQlteXNxbF9yZWMgKyB0ZW1wbC0+bXlzcWxfY29s
X29mZnNldCwKLQkJCXRlbXBsLCBkaWN0X2luZGV4X2dldF9udGhfZmllbGQoaW5kZXgsIGZpZWxk
X25vKSwKLQkJCWRhdGEsIGxlbik7CisJCQl0ZW1wbCwgaW5kZXgsIGZpZWxkX25vLCBkYXRhLCBs
ZW4pOwogCX0KIAogCXV0X2FkKGxlbiAhPSBVTklWX1NRTF9OVUxMKTsKCg==

--===============1787281564==
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:44:20 +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==


--===============1787281564==--