From: marko.makela
Date: November 11 2010 10:43am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3654 to 3656) Bug#57802
List-Archive: http://lists.mysql.com/commits/123666
X-Bug: 57802
Message-Id: <201011111044.oABA99Sb017084@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1170371820=="

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

IDM2NTYgTWFya28gTcOka2Vsw6QJMjAxMC0xMS0xMQogICAgICBCdWcjNTc4MDIgRW1wdHkgQVNT
RVJUSU9OIHBhcmFtZXRlciBwYXNzZWQgdG8gdGhlIEhBU0hfU0VBUkNIIG1hY3JvCiAgICAgIAog
ICAgICB0aHJfbG9jYWxfdmFsaWRhdGUoKSwgaV9zX2xvY2tzX3Jvd192YWxpZGF0ZSgpOiBOZXcg
dmFsaWRhdGUKICAgICAgZnVuY3Rpb25zLCB1c2VkIGluIFVOSVZfREVCVUcgY29kZSBmb3IgY2hl
Y2tpbmcgdGhlIHN0YXRlIG9mIGludGVybmFsCiAgICAgIG1lbW9yeSBzdHJ1Y3R1cmVzLgoKICAg
IG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCiAgICAgIHN0
b3JhZ2UvaW5ub2RiX3BsdWdpbi90aHIvdGhyMGxvYy5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi90cngvdHJ4MGlfcy5jCiAzNjU1IE1hcmtvIE3DpGtlbMOkCTIwMTAtMTEtMTEKICAgICAg
RGVjbGFyYXRpb25zIGFuZCBjb2RlIGRvIG5vdCBtaXggaW4gQzkwLCBub3QgZXZlbiB3aXRoaW4g
VU5JVl9ERUJVRy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1
Zi9idWYwZmx1LmMKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3N5bmMvc3luYzBydy5jCiAz
NjU0IEppbW15IFlhbmcJMjAxMC0xMS0xMAogICAgICBGaXggQnVnICM0ODAyNiBMb2cgc3RhcnQg
YW5kIGVuZCBvZiBJbm5vREIgYnVmZmVyIHBvb2wgaW5pdGlhbGl6YXRpb24KICAgICAgdG8gdGhl
IGVycm9yIGxvZwogICAgICAKICAgICAgcmI6Ly81MTMgYXBwcm92ZWQgYnkgU3VubnkgQmFpbnMK
CiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwogICAg
ICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vZGljdC9kaWN0MGRpY3QuYwogICAgICBzdG9yYWdlL2lu
bm9kYl9wbHVnaW4vaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9pbmNsdWRlL2RpY3QwZGljdC5oCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9y
b3cvcm93MG1lcmdlLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9D
aGFuZ2VMb2cnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6amlt
bXkueWFuZ0BvcmFjbGUuY29tLTIwMTAxMTExMDUzMjEyLWxvNW5tYm44aG5yamt3bTAKKysrIGIv
c3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEwMTExMTA5NTUzNS1ubXdiamZjZW5mamhkcGcxCkBAIC0xLDEzICsxLDE3IEBACisy
MDEwLTExLTExCVRoZSBJbm5vREIgVGVhbQorCSogdGhyL3RocjBsb2MuYywgdHJ4L3RyeDBpX3Mu
YzoKKwlGaXggQnVnIzU3ODAyIEVtcHR5IEFTU0VSVElPTiBwYXJhbWV0ZXIgcGFzc2VkIHRvIHRo
ZSBIQVNIX1NFQVJDSCBtYWNybworCiAyMDEwLTExLTEwCVRoZSBJbm5vREIgVGVhbQogCiAJKiBk
aWN0L2RpY3QwZGljdC5jLCBoYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MsIGluY2x1ZGUvZGljdDBk
aWN0LmgKIAlyb3cvcm93MG1lcmdlLmM6Ci0JRml4IEJ1ZyAjNTUwODQgSW5ub2RiIGNyYXNoIGFu
ZCBjb3JydXB0aW9uIGFmdGVyIGFsdGVyIHRhYmxlCisJRml4IEJ1ZyM1NTA4NCBJbm5vREIgY3Jh
c2ggYW5kIGNvcnJ1cHRpb24gYWZ0ZXIgQUxURVIgVEFCTEUKIAogMjAxMC0xMS0xMAlUaGUgSW5u
b0RCIFRlYW0KIAogCSogc3J2L3NydjBzdGFydC5jOgotCUZpeCBCdWcgIzQ4MDI2IExvZyBzdGFy
dCBhbmQgZW5kIG9mIElubm9EQiBidWZmZXIgcG9vbAorCUZpeCBCdWcjNDgwMjYgTG9nIHN0YXJ0
IGFuZCBlbmQgb2YgSW5ub0RCIGJ1ZmZlciBwb29sCiAJaW5pdGlhbGl6YXRpb24gdG8gdGhlIGVy
cm9yIGxvZwogCiAyMDEwLTExLTAzCVRoZSBJbm5vREIgVGVhbQoKPT09IG1vZGlmaWVkIGZpbGUg
J3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGZsdS5jJwotLS0gYS9zdG9yYWdlL2lubm9k
Yl9wbHVnaW4vYnVmL2J1ZjBmbHUuYwlyZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMDEx
MTEwNTMyMTItbG81bm1ibjhobnJqa3dtMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVm
L2J1ZjBmbHUuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTExMTA5NTUzNS1u
bXdiamZjZW5mamhkcGcxCkBAIC0xNzEwLDkgKzE3MTAsOSBAQCBidWZfZmx1c2hfdmFsaWRhdGVf
bG93KHZvaWQpCiAJCXV0X2Eob20gPiAwKTsKIAogCQlpZiAoVU5JVl9MSUtFTFlfTlVMTChidWZf
cG9vbC0+Zmx1c2hfcmJ0KSkgeworCQkJYnVmX3BhZ2VfdCogcnBhZ2U7CiAJCQl1dF9hKHJub2Rl
KTsKLQkJCWJ1Zl9wYWdlX3QqIHJwYWdlID0gKnJidF92YWx1ZShidWZfcGFnZV90KiwKLQkJCQkJ
CSAgICAgICBybm9kZSk7CisJCQlycGFnZSA9ICpyYnRfdmFsdWUoYnVmX3BhZ2VfdCosIHJub2Rl
KTsKIAkJCXV0X2EocnBhZ2UpOwogCQkJdXRfYShycGFnZSA9PSBicGFnZSk7CiAJCQlybm9kZSA9
IHJidF9uZXh0KGJ1Zl9wb29sLT5mbHVzaF9yYnQsIHJub2RlKTsKCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vc3luYy9zeW5jMHJ3LmMnCi0tLSBhL3N0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9zeW5jL3N5bmMwcncuYwlyZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAx
MDExMTEwNTMyMTItbG81bm1ibjhobnJqa3dtMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4v
c3luYy9zeW5jMHJ3LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDExMTEwOTU1
MzUtbm13YmpmY2VuZmpoZHBnMQpAQCAtMzM1LDEwICszMzUsMTMgQEAgcndfbG9ja192YWxpZGF0
ZSgKIC8qPT09PT09PT09PT09PSovCiAJcndfbG9ja190Kglsb2NrKQkvKiE8IGluOiBydy1sb2Nr
ICovCiB7CisJdWxpbnQJd2FpdGVyczsKKwlsaW50CWxvY2tfd29yZDsKKwogCXV0X2EobG9jayk7
CiAKLQl1bGludCB3YWl0ZXJzID0gcndfbG9ja19nZXRfd2FpdGVycyhsb2NrKTsKLQlsaW50IGxv
Y2tfd29yZCA9IGxvY2stPmxvY2tfd29yZDsKKwl3YWl0ZXJzID0gcndfbG9ja19nZXRfd2FpdGVy
cyhsb2NrKTsKKwlsb2NrX3dvcmQgPSBsb2NrLT5sb2NrX3dvcmQ7CiAKIAl1dF9hZChsb2NrLT5t
YWdpY19uID09IFJXX0xPQ0tfTUFHSUNfTik7CiAJdXRfYSh3YWl0ZXJzID09IDAgfHwgd2FpdGVy
cyA9PSAxKTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vdGhyL3Ro
cjBsb2MuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Roci90aHIwbG9jLmMJcmV2aWQ6
amltbXkueWFuZ0BvcmFjbGUuY29tLTIwMTAxMTExMDUzMjEyLWxvNW5tYm44aG5yamt3bTAKKysr
IGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Roci90aHIwbG9jLmMJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMDExMTEwOTU1MzUtbm13YmpmY2VuZmpoZHBnMQpAQCAtNzEsNiArNzEs
MjMgQEAgc3RydWN0IHRocl9sb2NhbF9zdHJ1Y3R7CiAvKiogVGhlIHZhbHVlIG9mIHRocl9sb2Nh
bF9zdHJ1Y3Q6Om1hZ2ljX24gKi8KICNkZWZpbmUgVEhSX0xPQ0FMX01BR0lDX04JMTIzMTIzNAog
CisjaWZkZWYgVU5JVl9ERUJVRworLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCitWYWxpZGF0ZXMgdGhyZWFkIGxv
Y2FsIGRhdGEuCitAcmV0dXJuCVRSVUUgaWYgdmFsaWQgKi8KK3N0YXRpYworaWJvb2wKK3Rocl9s
b2NhbF92YWxpZGF0ZSgKKy8qPT09PT09PT09PT09PT09Ki8KKwljb25zdCB0aHJfbG9jYWxfdCoJ
bG9jYWwpCS8qITwgaW46IGRhdGEgdG8gdmFsaWRhdGUgKi8KK3sKKwl1dF9hZChsb2NhbC0+bWFn
aWNfbiA9PSBUSFJfTE9DQUxfTUFHSUNfTik7CisJdXRfYWQobG9jYWwtPnNsb3Rfbm8gPCBPU19U
SFJFQURfTUFYX04pOworCXV0X2FkKGxvY2FsLT5pbl9pYnVmID09IEZBTFNFIHx8IGxvY2FsLT5p
bl9pYnVmID09IFRSVUUpOworCXJldHVybihUUlVFKTsKK30KKyNlbmRpZiAvKiBVTklWX0RFQlVH
ICovCisKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqLy8qKgogUmV0dXJucyB0aGUgbG9jYWwgc3RvcmFnZSBzdHJ1Y3Qg
Zm9yIGEgdGhyZWFkLgogQHJldHVybglsb2NhbCBzdG9yYWdlICovCkBAIC05MSw3ICsxMDgsOCBA
QCB0cnlfYWdhaW46CiAJbG9jYWwgPSBOVUxMOwogCiAJSEFTSF9TRUFSQ0goaGFzaCwgdGhyX2xv
Y2FsX2hhc2gsIG9zX3RocmVhZF9wZihpZCksCi0JCSAgICB0aHJfbG9jYWxfdCosIGxvY2FsLCwg
b3NfdGhyZWFkX2VxKGxvY2FsLT5pZCwgaWQpKTsKKwkJICAgIHRocl9sb2NhbF90KiwgbG9jYWws
IHV0X2FkKHRocl9sb2NhbF92YWxpZGF0ZShsb2NhbCkpLAorCQkgICAgb3NfdGhyZWFkX2VxKGxv
Y2FsLT5pZCwgaWQpKTsKIAlpZiAobG9jYWwgPT0gTlVMTCkgewogCQltdXRleF9leGl0KCZ0aHJf
bG9jYWxfbXV0ZXgpOwogCkBAIC0xMDIsNyArMTIwLDcgQEAgdHJ5X2FnYWluOgogCQlnb3RvIHRy
eV9hZ2FpbjsKIAl9CiAKLQl1dF9hZChsb2NhbC0+bWFnaWNfbiA9PSBUSFJfTE9DQUxfTUFHSUNf
Tik7CisJdXRfYWQodGhyX2xvY2FsX3ZhbGlkYXRlKGxvY2FsKSk7CiAKIAlyZXR1cm4obG9jYWwp
OwogfQpAQCAtMjE1LDcgKzIzMyw4IEBAIHRocl9sb2NhbF9mcmVlKAogCS8qIExvb2sgZm9yIHRo
ZSBsb2NhbCBzdHJ1Y3QgaW4gdGhlIGhhc2ggdGFibGUgKi8KIAogCUhBU0hfU0VBUkNIKGhhc2gs
IHRocl9sb2NhbF9oYXNoLCBvc190aHJlYWRfcGYoaWQpLAotCQkgICAgdGhyX2xvY2FsX3QqLCBs
b2NhbCwsIG9zX3RocmVhZF9lcShsb2NhbC0+aWQsIGlkKSk7CisJCSAgICB0aHJfbG9jYWxfdCos
IGxvY2FsLCB1dF9hZCh0aHJfbG9jYWxfdmFsaWRhdGUobG9jYWwpKSwKKwkJICAgIG9zX3RocmVh
ZF9lcShsb2NhbC0+aWQsIGlkKSk7CiAJaWYgKGxvY2FsID09IE5VTEwpIHsKIAkJbXV0ZXhfZXhp
dCgmdGhyX2xvY2FsX211dGV4KTsKIApAQCAtMjI4LDYgKzI0Nyw3IEBAIHRocl9sb2NhbF9mcmVl
KAogCW11dGV4X2V4aXQoJnRocl9sb2NhbF9tdXRleCk7CiAKIAl1dF9hKGxvY2FsLT5tYWdpY19u
ID09IFRIUl9MT0NBTF9NQUdJQ19OKTsKKwl1dF9hZCh0aHJfbG9jYWxfdmFsaWRhdGUobG9jYWwp
KTsKIAogCW1lbV9mcmVlKGxvY2FsKTsKIH0KQEAgLTI3MCw2ICsyOTAsNyBAQCB0aHJfbG9jYWxf
Y2xvc2Uodm9pZCkKIAogCQkJbG9jYWwgPSBIQVNIX0dFVF9ORVhUKGhhc2gsIHByZXZfbG9jYWwp
OwogCQkJdXRfYShwcmV2X2xvY2FsLT5tYWdpY19uID09IFRIUl9MT0NBTF9NQUdJQ19OKTsKKwkJ
CXV0X2FkKHRocl9sb2NhbF92YWxpZGF0ZShwcmV2X2xvY2FsKSk7CiAJCQltZW1fZnJlZShwcmV2
X2xvY2FsKTsKIAkJfQogCX0KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVn
aW4vdHJ4L3RyeDBpX3MuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3RyeC90cngwaV9z
LmMJcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUuY29tLTIwMTAxMTExMDUzMjEyLWxvNW5tYm44aG5y
amt3bTAKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3RyeC90cngwaV9zLmMJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDExMTEwOTU1MzUtbm13YmpmY2VuZmpoZHBnMQpAQCAt
NDA4LDYgKzQwOCw0MiBAQCB0YWJsZV9jYWNoZV9jcmVhdGVfZW1wdHlfcm93KAogCXJldHVybihy
b3cpOwogfQogCisjaWZkZWYgVU5JVl9ERUJVRworLyoqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCitWYWxpZGF0ZXMg
YSByb3cgaW4gdGhlIGxvY2tzIGNhY2hlLgorQHJldHVybglUUlVFIGlmIHZhbGlkICovCitzdGF0
aWMKK2lib29sCitpX3NfbG9ja3Nfcm93X3ZhbGlkYXRlKAorLyo9PT09PT09PT09PT09PT09PT09
Ki8KKwljb25zdCBpX3NfbG9ja3Nfcm93X3QqCXJvdykJLyohPCBpbjogcm93IHRvIHZhbGlkYXRl
ICovCit7CisJdXRfYWQocm93LT5sb2NrX3RyeF9pZCAhPSAwKTsKKwl1dF9hZChyb3ctPmxvY2tf
bW9kZSAhPSBOVUxMKTsKKwl1dF9hZChyb3ctPmxvY2tfdHlwZSAhPSBOVUxMKTsKKwl1dF9hZChy
b3ctPmxvY2tfdGFibGUgIT0gTlVMTCk7CisJdXRfYWQocm93LT5sb2NrX3RhYmxlX2lkICE9IDAp
OworCisJaWYgKHJvdy0+bG9ja19zcGFjZSA9PSBVTElOVF9VTkRFRklORUQpIHsKKwkJLyogdGFi
bGUgbG9jayAqLworCQl1dF9hZCghc3RyY21wKCJUQUJMRSIsIHJvdy0+bG9ja190eXBlKSk7CisJ
CXV0X2FkKHJvdy0+bG9ja19pbmRleCA9PSBOVUxMKTsKKwkJdXRfYWQocm93LT5sb2NrX2RhdGEg
PT0gTlVMTCk7CisJCXV0X2FkKHJvdy0+bG9ja19wYWdlID09IFVMSU5UX1VOREVGSU5FRCk7CisJ
CXV0X2FkKHJvdy0+bG9ja19yZWMgPT0gVUxJTlRfVU5ERUZJTkVEKTsKKwl9IGVsc2UgeworCQkv
KiByZWNvcmQgbG9jayAqLworCQl1dF9hZCghc3RyY21wKCJSRUNPUkQiLCByb3ctPmxvY2tfdHlw
ZSkpOworCQl1dF9hZChyb3ctPmxvY2tfaW5kZXggIT0gTlVMTCk7CisJCXV0X2FkKHJvdy0+bG9j
a19kYXRhICE9IE5VTEwpOworCQl1dF9hZChyb3ctPmxvY2tfcGFnZSAhPSBVTElOVF9VTkRFRklO
RUQpOworCQl1dF9hZChyb3ctPmxvY2tfcmVjICE9IFVMSU5UX1VOREVGSU5FRCk7CisJfQorCisJ
cmV0dXJuKFRSVUUpOworfQorI2VuZGlmIC8qIFVOSVZfREVCVUcgKi8KKwogLyoqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiov
LyoqCiBGaWxscyBpX3NfdHJ4X3Jvd190IG9iamVjdC4KIElmIG1lbW9yeSBjYW4gbm90IGJlIGFs
bG9jYXRlZCB0aGVuIEZBTFNFIGlzIHJldHVybmVkLgpAQCAtNDM1LDE4ICs0NzEsMTUgQEAgZmls
bF90cnhfcm93KAogCXJvdy0+dHJ4X2lkID0gdHJ4X2dldF9pZCh0cngpOwogCXJvdy0+dHJ4X3N0
YXJ0ZWQgPSAoaWJfdGltZV90KSB0cngtPnN0YXJ0X3RpbWU7CiAJcm93LT50cnhfc3RhdGUgPSB0
cnhfZ2V0X3F1ZV9zdGF0ZV9zdHIodHJ4KTsKKwlyb3ctPnJlcXVlc3RlZF9sb2NrX3JvdyA9IHJl
cXVlc3RlZF9sb2NrX3JvdzsKKwl1dF9hZChyZXF1ZXN0ZWRfbG9ja19yb3cgPT0gTlVMTAorCSAg
ICAgIHx8IGlfc19sb2Nrc19yb3dfdmFsaWRhdGUocmVxdWVzdGVkX2xvY2tfcm93KSk7CiAKIAlp
ZiAodHJ4LT53YWl0X2xvY2sgIT0gTlVMTCkgewotCiAJCXV0X2EocmVxdWVzdGVkX2xvY2tfcm93
ICE9IE5VTEwpOwotCi0JCXJvdy0+cmVxdWVzdGVkX2xvY2tfcm93ID0gcmVxdWVzdGVkX2xvY2tf
cm93OwogCQlyb3ctPnRyeF93YWl0X3N0YXJ0ZWQgPSAoaWJfdGltZV90KSB0cngtPndhaXRfc3Rh
cnRlZDsKIAl9IGVsc2UgewotCiAJCXV0X2EocmVxdWVzdGVkX2xvY2tfcm93ID09IE5VTEwpOwot
Ci0JCXJvdy0+cmVxdWVzdGVkX2xvY2tfcm93ID0gTlVMTDsKIAkJcm93LT50cnhfd2FpdF9zdGFy
dGVkID0gMDsKIAl9CiAKQEAgLTcyOSw2ICs3NjIsNyBAQCBmaWxsX2xvY2tzX3JvdygKIAlyb3ct
PmxvY2tfdGFibGVfaWQgPSBsb2NrX2dldF90YWJsZV9pZChsb2NrKTsKIAogCXJvdy0+aGFzaF9j
aGFpbi52YWx1ZSA9IHJvdzsKKwl1dF9hZChpX3NfbG9ja3Nfcm93X3ZhbGlkYXRlKHJvdykpOwog
CiAJcmV0dXJuKFRSVUUpOwogfQpAQCAtNzQ5LDYgKzc4Myw5IEBAIGZpbGxfbG9ja193YWl0c19y
b3coCiAJCQkJCQlyZWxldmFudCBibG9ja2luZyBsb2NrCiAJCQkJCQlyb3cgaW4gaW5ub2RiX2xv
Y2tzICovCiB7CisJdXRfYWQoaV9zX2xvY2tzX3Jvd192YWxpZGF0ZShyZXF1ZXN0ZWRfbG9ja19y
b3cpKTsKKwl1dF9hZChpX3NfbG9ja3Nfcm93X3ZhbGlkYXRlKGJsb2NraW5nX2xvY2tfcm93KSk7
CisKIAlyb3ctPnJlcXVlc3RlZF9sb2NrX3JvdyA9IHJlcXVlc3RlZF9sb2NrX3JvdzsKIAlyb3ct
PmJsb2NraW5nX2xvY2tfcm93ID0gYmxvY2tpbmdfbG9ja19yb3c7CiAKQEAgLTgyMCw2ICs4NTcs
NyBAQCBsb2Nrc19yb3dfZXFfbG9jaygKIAkJCQkJb3IgVUxJTlRfVU5ERUZJTkVEIGlmIHRoZSBs
b2NrCiAJCQkJCWlzIGEgdGFibGUgbG9jayAqLwogeworCXV0X2FkKGlfc19sb2Nrc19yb3dfdmFs
aWRhdGUocm93KSk7CiAjaWZkZWYgVEVTVF9OT19MT0NLU19ST1dfSVNfRVZFUl9FUVVBTF9UT19M
T0NLX1QKIAlyZXR1cm4oMCk7CiAjZWxzZQpAQCAtODc3LDcgKzkxNSw3IEBAIHNlYXJjaF9pbm5v
ZGJfbG9ja3MoCiAJCS8qIGF1eGlsaWFyeSB2YXJpYWJsZSAqLwogCQloYXNoX2NoYWluLAogCQkv
KiBhc3NlcnRpb24gb24gZXZlcnkgdHJhdmVyc2VkIGl0ZW0gKi8KLQkJLAorCQl1dF9hZChpX3Nf
bG9ja3Nfcm93X3ZhbGlkYXRlKGhhc2hfY2hhaW4tPnZhbHVlKSksCiAJCS8qIHRoaXMgZGV0ZXJt
aW5lcyBpZiB3ZSBoYXZlIGZvdW5kIHRoZSBsb2NrICovCiAJCWxvY2tzX3Jvd19lcV9sb2NrKGhh
c2hfY2hhaW4tPnZhbHVlLCBsb2NrLCBoZWFwX25vKSk7CiAKQEAgLTkxNyw2ICs5NTUsNyBAQCBh
ZGRfbG9ja190b19jYWNoZSgKIAlkc3Rfcm93ID0gc2VhcmNoX2lubm9kYl9sb2NrcyhjYWNoZSwg
bG9jaywgaGVhcF9ubyk7CiAJaWYgKGRzdF9yb3cgIT0gTlVMTCkgewogCisJCXV0X2FkKGlfc19s
b2Nrc19yb3dfdmFsaWRhdGUoZHN0X3JvdykpOwogCQlyZXR1cm4oZHN0X3Jvdyk7CiAJfQogI2Vu
ZGlmCkBAIC05NTQsNiArOTkzLDcgQEAgYWRkX2xvY2tfdG9fY2FjaGUoCiAJfSAvKiBmb3IoKS1s
b29wICovCiAjZW5kaWYKIAorCXV0X2FkKGlfc19sb2Nrc19yb3dfdmFsaWRhdGUoZHN0X3Jvdykp
OwogCXJldHVybihkc3Rfcm93KTsKIH0KIAoK

--===============1170371820==
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: 52aa642dd995e4b51c017726ada7d2b87f7a91af
# timestamp: 2010-11-11 12:43:52 +0200
# base_revision_id: jimmy.yang@stripped\
#   lo5nmbn8hnrjkwm0
# 
# Begin bundle
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


--===============1170371820==--