From: marko.makela
Date: May 14 2010 1:41pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3468) Bug#53593
List-Archive: http://lists.mysql.com/commits/108344
X-Bug: 53593
Message-Id: <201005141342.o4ECViLK021763@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1831969072=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTQxMzEwNTAtbWtobHZs
dWkxdTUyaXJvYgoKIDM0NjggTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xNAogICAgICBJbXBsZW1l
bnQgVmFsZ3JpbmQgbWVtY2hlY2sgaW5zdHJ1bWVudGF0aW9uIGluIHRoZSBNeVNRTCBjb3JlLiAo
QnVnICM1MzU5MykKICAgICAgCiAgICAgIEJVSUxELyo6IEFkZCB2YWxncmluZF9jb25maWdzPS0t
d2l0aC12YWxncmluZC4KICAgICAgQlVJTEQvKjogUmVtb3ZlIC1VU0FGRU1BTExPQyBmcm9tIHZh
bGdyaW5kX2ZsYWdzLgogICAgICAKICAgICAgY29uZmlndXJlLmluOiBBZGQgQUNfQVJHX1dJVEgo
dmFsZ3JpbmQpIGFuZCBIQVZFX1ZBTEdSSU5ELgogICAgICAKICAgICAgaW5jbHVkZS9teV9zeXMu
aDogRGVmaW5lIGEgbnVtYmVyIG9mIE1FTV8gd3JhcHBlcnMgZm9yIFZBTEdSSU5EXyBmdW5jdGlv
bnMuCiAgICAgIGluY2x1ZGUvbXlfc3lzLmg6IE1ha2UgVFJBU0ggZG8gTUVNX1VOREVGSU5FRCgp
LgogICAgICAKICAgICAgX215bWFsbG9jKCk6IERlY2xhcmUgTUVNX1VOREVGSU5FRCgpIG9uIHRo
ZSBhbGxvY2F0ZWQgbWVtb3J5LgogICAgICAKICAgICAgX215ZnJlZSgpOiBEZWNsYXJlIE1FTV9O
T0FDQ0VTUygpIG9uIHRoZSBmcmVlZCBtZW1vcnkuCiAgICAgIAogICAgICBzdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvdW5pdi5pOiBFbmFibGUgVU5JVl9ERUJVR19WQUxHUklORCBiYXNlZCBvbgog
ICAgICBIQVZFX1ZBTEdSSU5EIHJhdGhlciB0aGFuIEhBVkVfcHVyaWZ5LgoKICAgIG1vZGlmaWVk
OgogICAgICBCVUlMRC9TRVRVUC5zaAogICAgICBCVUlMRC9idWlsZF9tY2NnZS5zaAogICAgICBC
VUlMRC9jb21waWxlLWFtZDY0LXZhbGdyaW5kLW1heAogICAgICBCVUlMRC9jb21waWxlLXBlbnRp
dW0taWNjLXZhbGdyaW5kLW1heAogICAgICBCVUlMRC9jb21waWxlLXBlbnRpdW0tdmFsZ3JpbmQt
bWF4CiAgICAgIEJVSUxEL2NvbXBpbGUtcGVudGl1bS12YWxncmluZC1tYXgtbm8tbmRiCiAgICAg
IEJVSUxEL2NvbXBpbGUtcGVudGl1bTY0LXZhbGdyaW5kLW1heAogICAgICBjb25maWd1cmUuaW4K
ICAgICAgaW5jbHVkZS9teV9zeXMuaAogICAgICBteXN5cy9zYWZlbWFsbG9jLmMKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4v
aW5jbHVkZS91bml2LmkKPT09IG1vZGlmaWVkIGZpbGUgJ0JVSUxEL1NFVFVQLnNoJwotLS0gYS9C
VUlMRC9TRVRVUC5zaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxNDEzMTA1
MC1ta2hsdmx1aTF1NTJpcm9iCisrKyBiL0JVSUxEL1NFVFVQLnNoCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTAwNTE0MTM0MTAxLWk1dnExYzl5cWx6Znc5N2IKQEAgLTExOSw4ICsx
MTksOSBAQCBmaQogCiAjIFNldCBmbGFncyBmb3IgdmFyaW91cyBidWlsZCBjb25maWd1cmF0aW9u
cy4KICMgVXNlZCBpbiAtdmFsZ3JpbmQgYnVpbGRzCi12YWxncmluZF9mbGFncz0iLVVTQUZFTUFM
TE9DIC1VRk9SQ0VfSU5JVF9PRl9WQVJTIC1ESEFWRV9wdXJpZnkgIgordmFsZ3JpbmRfZmxhZ3M9
Ii1VRk9SQ0VfSU5JVF9PRl9WQVJTIC1ESEFWRV9wdXJpZnkgIgogdmFsZ3JpbmRfZmxhZ3M9IiR2
YWxncmluZF9mbGFncyAtRE1ZU1FMX1NFUlZFUl9TVUZGSVg9LXZhbGdyaW5kLW1heCIKK3ZhbGdy
aW5kX2NvbmZpZ3M9Ii0td2l0aC12YWxncmluZCIKICMKICMgVXNlZCBpbiAtZGVidWcgYnVpbGRz
CiBkZWJ1Z19jZmxhZ3M9Ii1EVU5JVl9NVVNUX05PVF9JTkxJTkUgLURFWFRSQV9ERUJVRyAtREZP
UkNFX0lOSVRfT0ZfVkFSUyAiCgo9PT0gbW9kaWZpZWQgZmlsZSAnQlVJTEQvYnVpbGRfbWNjZ2Uu
c2gnCi0tLSBhL0JVSUxEL2J1aWxkX21jY2dlLnNoCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTAwNTE0MTMxMDUwLW1raGx2bHVpMXU1Mmlyb2IKKysrIGIvQlVJTEQvYnVpbGRfbWNj
Z2Uuc2gJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTQxMzQxMDEtaTV2cTFj
OXlxbHpmdzk3YgpAQCAtOTM4LDkgKzkzOCwxMCBAQCBzZXRfdXBfY2NhY2hlKCkKIHNldF92YWxn
cmluZF9mbGFncygpCiB7CiAgIGlmIHRlc3QgIngkdmFsZ3JpbmRfZmxhZyIgPSAieHllcyIgOyB0
aGVuCi0gICAgbG9jX3ZhbGdyaW5kX2ZsYWdzPSItVVNBRkVNQUxMT0MgLVVGT1JDRV9JTklUX09G
X1ZBUlMgLURIQVZFX3B1cmlmeSAiCisgICAgbG9jX3ZhbGdyaW5kX2ZsYWdzPSItVUZPUkNFX0lO
SVRfT0ZfVkFSUyAtREhBVkVfcHVyaWZ5ICIKICAgICBsb2NfdmFsZ3JpbmRfZmxhZ3M9IiRsb2Nf
dmFsZ3JpbmRfZmxhZ3MgLURNWVNRTF9TRVJWRVJfU1VGRklYPS12YWxncmluZC1tYXgiCiAgICAg
Y29tcGlsZXJfZmxhZ3M9IiRjb21waWxlcl9mbGFncyAkbG9jX3ZhbGdyaW5kX2ZsYWdzIgorICAg
IHdpdGhfZmxhZ3M9IiR3aXRoX2ZsYWdzIC0td2l0aC12YWxncmluZCIKICAgZmkKIH0KIAoKPT09
IG1vZGlmaWVkIGZpbGUgJ0JVSUxEL2NvbXBpbGUtYW1kNjQtdmFsZ3JpbmQtbWF4JwotLS0gYS9C
VUlMRC9jb21waWxlLWFtZDY0LXZhbGdyaW5kLW1heAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEwMDUxNDEzMTA1MC1ta2hsdmx1aTF1NTJpcm9iCisrKyBiL0JVSUxEL2NvbXBpbGUt
YW1kNjQtdmFsZ3JpbmQtbWF4CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE0
MTM0MTAxLWk1dnExYzl5cWx6Znc5N2IKQEAgLTQsNyArNCw3IEBAIHBhdGg9YGRpcm5hbWUgJDBg
CiAuICIkcGF0aC9TRVRVUC5zaCIKIAogZXh0cmFfZmxhZ3M9IiRhbWQ2NF9jZmxhZ3MgJGRlYnVn
X2NmbGFncyAkdmFsZ3JpbmRfZmxhZ3MiCi1leHRyYV9jb25maWdzPSIkYW1kNjRfY29uZmlncyAk
ZGVidWdfY29uZmlncyAkbWF4X2NvbmZpZ3MiCitleHRyYV9jb25maWdzPSIkYW1kNjRfY29uZmln
cyAkZGVidWdfY29uZmlncyAkdmFsZ3JpbmRfY29uZmlncyAkbWF4X2NvbmZpZ3MiCiAKIC4gIiRw
YXRoL0ZJTklTSC5zaCIKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ0JVSUxEL2NvbXBpbGUtcGVudGl1
bS1pY2MtdmFsZ3JpbmQtbWF4JwotLS0gYS9CVUlMRC9jb21waWxlLXBlbnRpdW0taWNjLXZhbGdy
aW5kLW1heAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxNDEzMTA1MC1ta2hs
dmx1aTF1NTJpcm9iCisrKyBiL0JVSUxEL2NvbXBpbGUtcGVudGl1bS1pY2MtdmFsZ3JpbmQtbWF4
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE0MTM0MTAxLWk1dnExYzl5cWx6
Znc5N2IKQEAgLTI5LDYgKzI5LDYgQEAgZXh0cmFfZmxhZ3M9IiRwZW50aXVtX2NmbGFncyAkZGVi
dWdfY2ZsYQogY193YXJuaW5ncz0iLVdhbGwgLVdjaGVjayAtd2QxNjEsNDQ0LDI3OSw4MTAsOTgx
LDEyOTIsMTQ2OSwxNTcyIgogY3h4X3dhcm5pbmdzPSIkY193YXJuaW5ncyAtd2Q4NjksODc0Igog
YmFzZV9jeHhmbGFncz0iLWZuby1leGNlcHRpb25zIC1mbm8tcnR0aSIKLWV4dHJhX2NvbmZpZ3M9
IiRwZW50aXVtX2NvbmZpZ3MgJGRlYnVnX2NvbmZpZ3MiCitleHRyYV9jb25maWdzPSIkcGVudGl1
bV9jb25maWdzICRkZWJ1Z19jb25maWdzICR2YWxncmluZF9jb25maWdzIgogCiAuICIkcGF0aC9G
SU5JU0guc2giCgo9PT0gbW9kaWZpZWQgZmlsZSAnQlVJTEQvY29tcGlsZS1wZW50aXVtLXZhbGdy
aW5kLW1heCcKLS0tIGEvQlVJTEQvY29tcGlsZS1wZW50aXVtLXZhbGdyaW5kLW1heAlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxNDEzMTA1MC1ta2hsdmx1aTF1NTJpcm9iCisr
KyBiL0JVSUxEL2NvbXBpbGUtcGVudGl1bS12YWxncmluZC1tYXgJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMDA1MTQxMzQxMDEtaTV2cTFjOXlxbHpmdzk3YgpAQCAtNCw3ICs0LDcg
QEAgcGF0aD1gZGlybmFtZSAkMGAKIC4gIiRwYXRoL1NFVFVQLnNoIgogCiBleHRyYV9mbGFncz0i
JHBlbnRpdW1fY2ZsYWdzICRkZWJ1Z19jZmxhZ3MgJHZhbGdyaW5kX2ZsYWdzIgotZXh0cmFfY29u
Zmlncz0iJHBlbnRpdW1fY29uZmlncyAkZGVidWdfY29uZmlncyAkbWF4X2NvbmZpZ3MiCitleHRy
YV9jb25maWdzPSIkcGVudGl1bV9jb25maWdzICRkZWJ1Z19jb25maWdzICR2YWxncmluZF9jb25m
aWdzICRtYXhfY29uZmlncyIKIAogLiAiJHBhdGgvRklOSVNILnNoIgogCgo9PT0gbW9kaWZpZWQg
ZmlsZSAnQlVJTEQvY29tcGlsZS1wZW50aXVtLXZhbGdyaW5kLW1heC1uby1uZGInCi0tLSBhL0JV
SUxEL2NvbXBpbGUtcGVudGl1bS12YWxncmluZC1tYXgtbm8tbmRiCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTAwNTE0MTMxMDUwLW1raGx2bHVpMXU1Mmlyb2IKKysrIGIvQlVJTEQv
Y29tcGlsZS1wZW50aXVtLXZhbGdyaW5kLW1heC1uby1uZGIJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMDA1MTQxMzQxMDEtaTV2cTFjOXlxbHpmdzk3YgpAQCAtNCw3ICs0LDcgQEAg
cGF0aD1gZGlybmFtZSAkMGAKIC4gIiRwYXRoL1NFVFVQLnNoIgogCiBleHRyYV9mbGFncz0iJHBl
bnRpdW1fY2ZsYWdzICRkZWJ1Z19jZmxhZ3MgJHZhbGdyaW5kX2ZsYWdzIgotZXh0cmFfY29uZmln
cz0iJHBlbnRpdW1fY29uZmlncyAkZGVidWdfY29uZmlncyAkbWF4X25vX25kYl9jb25maWdzIgor
ZXh0cmFfY29uZmlncz0iJHBlbnRpdW1fY29uZmlncyAkZGVidWdfY29uZmlncyAkdmFsZ3JpbmRf
Y29uZmlncyAkbWF4X25vX25kYl9jb25maWdzIgogCiAuICIkcGF0aC9GSU5JU0guc2giCiAKCj09
PSBtb2RpZmllZCBmaWxlICdCVUlMRC9jb21waWxlLXBlbnRpdW02NC12YWxncmluZC1tYXgnCi0t
LSBhL0JVSUxEL2NvbXBpbGUtcGVudGl1bTY0LXZhbGdyaW5kLW1heAlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDEwMDUxNDEzMTA1MC1ta2hsdmx1aTF1NTJpcm9iCisrKyBiL0JVSUxE
L2NvbXBpbGUtcGVudGl1bTY0LXZhbGdyaW5kLW1heAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEwMDUxNDEzNDEwMS1pNXZxMWM5eXFsemZ3OTdiCkBAIC00LDcgKzQsNyBAQCBwYXRo
PWBkaXJuYW1lICQwYAogLiAiJHBhdGgvU0VUVVAuc2giCiAKIGV4dHJhX2ZsYWdzPSIkcGVudGl1
bTY0X2NmbGFncyAkZGVidWdfY2ZsYWdzICR2YWxncmluZF9mbGFncyIKLWV4dHJhX2NvbmZpZ3M9
IiRwZW50aXVtX2NvbmZpZ3MgJGRlYnVnX2NvbmZpZ3MgJG1heF9jb25maWdzIgorZXh0cmFfY29u
Zmlncz0iJHBlbnRpdW1fY29uZmlncyAkZGVidWdfY29uZmlncyAkdmFsZ3JpbmRfY29uZmlncyAk
bWF4X2NvbmZpZ3MiCiAKIC4gIiRwYXRoL0ZJTklTSC5zaCIKIAoKPT09IG1vZGlmaWVkIGZpbGUg
J2NvbmZpZ3VyZS5pbicKLS0tIGEvY29uZmlndXJlLmluCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTAwNTE0MTMxMDUwLW1raGx2bHVpMXU1Mmlyb2IKKysrIGIvY29uZmlndXJlLmlu
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE0MTM0MTAxLWk1dnExYzl5cWx6
Znc5N2IKQEAgLTE3MjksNiArMTcyOSwxNyBAQCBlbHNlCiAgIENYWEZMQUdTPSIkT1BUSU1JWkVf
Q1hYRkxBR1MgJENYWEZMQUdTIgogZmkKIAorQUNfQVJHX1dJVEgoW3ZhbGdyaW5kXSwKKyAgW0FT
X0hFTFBfU1RSSU5HKFstLXdpdGgtdmFsZ3JpbmRdLAorICAgIFtWYWxncmluZCBpbnN0cnVtZW50
YXRpb24gQDw6QGRlZmF1bHQ9bm9AOj5AXSldLAorICAgIFtdLCBbd2l0aF92YWxncmluZD1ub10p
CisKK2lmIHRlc3QgIiR3aXRoX3ZhbGdyaW5kIiAhPSAibm8iCit0aGVuCisgIEFDX0NIRUNLX0hF
QURFUlMoW3ZhbGdyaW5kL3ZhbGdyaW5kLmggdmFsZ3JpbmQvbWVtY2hlY2suaF0sCisgICAgW0FD
X0RFRklORShbSEFWRV9WQUxHUklORF0sIFsxXSwgW0RlZmluZSBmb3IgVmFsZ3JpbmQgc3VwcG9y
dF0pXSkKK2ZpCisKICMgRGVidWcgU3luYyBGYWNpbGl0eS4gTk9URTogZGVwZW5kcyBvbiAnd2l0
aF9kZWJ1ZycuIE11c3QgYmUgYmVoaW5kIGl0LgogQUNfTVNHX0NIRUNLSU5HKGlmIERlYnVnIFN5
bmMgRmFjaWxpdHkgc2hvdWxkIGJlIGVuYWJsZWQuKQogQUNfQVJHX0VOQUJMRShkZWJ1Z19zeW5j
LAoKPT09IG1vZGlmaWVkIGZpbGUgJ2luY2x1ZGUvbXlfc3lzLmgnCi0tLSBhL2luY2x1ZGUvbXlf
c3lzLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTQxMzEwNTAtbWtobHZs
dWkxdTUyaXJvYgorKysgYi9pbmNsdWRlL215X3N5cy5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTAwNTE0MTM0MTAxLWk1dnExYzl5cWx6Znc5N2IKQEAgLTI1LDYgKzI1LDI3IEBA
IHR5cGVkZWYgc3RydWN0IG15X2Fpb19yZXN1bHQgewogfSBteV9haW9fcmVzdWx0OwogI2VuZGlm
CiAKKyNpZmRlZiBIQVZFX1ZBTEdSSU5ECisjIGluY2x1ZGUgPHZhbGdyaW5kL21lbWNoZWNrLmg+
CisjIGRlZmluZSBNRU1fVU5ERUZJTkVEKGEsbGVuKSBWQUxHUklORF9NQUtFX01FTV9VTkRFRklO
RUQoYSxsZW4pCisjIGRlZmluZSBNRU1fTk9BQ0NFU1MoYSxsZW4pIFZBTEdSSU5EX01BS0VfTUVN
X05PQUNDRVNTKGEsbGVuKQorIyBkZWZpbmUgTUVNX0RFRklORURfQUREUkVTU0FCTEUoYSxsZW4p
IFZBTEdSSU5EX01BS0VfTUVNX0RFRklORUQoYSxsZW4pCisjIGRlZmluZSBNRU1fREVGSU5FRChh
LGxlbikgVkFMR1JJTkRfTUFLRV9NRU1fREVGSU5FRF9JRl9BRERSRVNTQUJMRShhLGxlbikKKyMg
ZGVmaW5lIE1FTV9HRVRfVkJJVFMoYSx2LGxlbikgVkFMR1JJTkRfR0VUX1ZCSVRTKGEsdixsZW4p
CisjIGRlZmluZSBNRU1fU0VUX1ZCSVRTKGEsdixsZW4pIFZBTEdSSU5EX1NFVF9WQklUUyhhLHYs
bGVuKQorIyBkZWZpbmUgTUVNX0NIRUNLX0FERFJFU1NBQkxFKGEsbGVuKSBWQUxHUklORF9DSEVD
S19NRU1fSVNfQUREUkVTU0FCTEUoYSxsZW4pCisjIGRlZmluZSBNRU1fQ0hFQ0tfREVGSU5FRChh
LGxlbikgVkFMR1JJTkRfQ0hFQ0tfTUVNX0lTX0RFRklORUQoYSxsZW4pCisjZWxzZSAvKiBIQVZF
X1ZBTEdSSU5EICovCisjIGRlZmluZSBNRU1fVU5ERUZJTkVEKGEsbGVuKSAoKHZvaWQpIDApCisj
IGRlZmluZSBNRU1fTk9BQ0NFU1MoYSxsZW4pICgodm9pZCkgMCkKKyMgZGVmaW5lIE1FTV9ERUZJ
TkVEX0FERFJFU1NBQkxFKGEsbGVuKSAoKHZvaWQpIDApCisjIGRlZmluZSBNRU1fREVGSU5FRChh
LGxlbikgKCh2b2lkKSAwKQorIyBkZWZpbmUgTUVNX0dFVF9WQklUUyhhLHYsbGVuKSAoKHZvaWQp
IDApCisjIGRlZmluZSBNRU1fU0VUX1ZCSVRTKGEsdixsZW4pICgodm9pZCkgMCkKKyMgZGVmaW5l
IE1FTV9DSEVDS19BRERSRVNTQUJMRShhLGxlbikgKCh2b2lkKSAwKQorIyBkZWZpbmUgTUVNX0NI
RUNLX0RFRklORUQoYSxsZW4pICgodm9pZCkgMCkKKyNlbmRpZiAvKiBIQVZFX1ZBTEdSSU5EICov
CisKICNpZm5kZWYgVEhSRUFECiBleHRlcm4gaW50IE5FQVIgbXlfZXJybm87CQkvKiBMYXN0IGVy
cm9yIGluIG15c3lzICovCiAjZWxzZQpAQCAtMTQxLDcgKzE2Miw3IEBAIGV4dGVybiBpbnQgTkVB
UiBteV9lcnJubzsJCS8qIExhc3QgZXJyb3IKICNkZWZpbmUgbXlfbWVtZHVwKEEsQixDKSBfbXlf
bWVtZHVwKChBKSwoQiksIF9fRklMRV9fLF9fTElORV9fLEMpCiAjZGVmaW5lIG15X3N0cmR1cChB
LEMpIF9teV9zdHJkdXAoKEEpLCBfX0ZJTEVfXyxfX0xJTkVfXyxDKQogI2RlZmluZSBteV9zdHJu
ZHVwKEEsQixDKSBfbXlfc3RybmR1cCgoQSksKEIpLF9fRklMRV9fLF9fTElORV9fLEMpCi0jZGVm
aW5lIFRSQVNIKEEsQikgYmZpbGwoQSwgQiwgMHg4RikKKyNkZWZpbmUgVFJBU0goQSxCKSBkbyB7
IGJmaWxsKEEsIEIsIDB4OEYpOyBNRU1fVU5ERUZJTkVEKEEsIEIpOyB9IHdoaWxlICgwKQogI2Rl
ZmluZSBRVUlDS19TQUZFTUFMTE9DIHNmX21hbGxvY19xdWljaz0xCiAjZGVmaW5lIE5PUk1BTF9T
QUZFTUFMTE9DIHNmX21hbGxvY19xdWljaz0wCiBleHRlcm4gdWludCBzZl9tYWxsb2NfcHJlaHVu
YyxzZl9tYWxsb2NfZW5kaHVuYyxzZl9tYWxsb2NfcXVpY2s7CkBAIC0xNjksNyArMTkwLDcgQEAg
ZXh0ZXJuIGNoYXIgKm15X3N0cm5kdXAoY29uc3QgY2hhciAqZnJvbQogI2RlZmluZSBDQUxMRVJf
SU5GT19QUk9UTyAgIC8qIG5vdGhpbmcgKi8KICNkZWZpbmUgQ0FMTEVSX0lORk8gICAgICAgICAv
KiBub3RoaW5nICovCiAjZGVmaW5lIE9SSUdfQ0FMTEVSX0lORk8gICAgLyogbm90aGluZyAqLwot
I2RlZmluZSBUUkFTSChBLEIpIC8qIG5vdGhpbmcgKi8KKyNkZWZpbmUgVFJBU0goQSxCKSBNRU1f
VU5ERUZJTkVEKEEsIEIpCiAjZW5kaWYKIAogI2lmIGRlZmluZWQoRU5BQkxFRF9ERUJVR19TWU5D
KQoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3lzL3NhZmVtYWxsb2MuYycKLS0tIGEvbXlzeXMvc2Fm
ZW1hbGxvYy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE0MTMxMDUwLW1r
aGx2bHVpMXU1Mmlyb2IKKysrIGIvbXlzeXMvc2FmZW1hbGxvYy5jCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTAwNTE0MTM0MTAxLWk1dnExYzl5cWx6Znc5N2IKQEAgLTE5MCw5ICsx
OTAsMTIgQEAgdm9pZCAqX215bWFsbG9jKHNpemVfdCBzaXplLCBjb25zdCBjaGFyCiAgIHNmX21h
bGxvY19jb3VudCsrOwogICBwdGhyZWFkX211dGV4X3VubG9jaygmVEhSX0xPQ0tfbWFsbG9jKTsK
IAorICBNRU1fQ0hFQ0tfQUREUkVTU0FCTEUoZGF0YSwgc2l6ZSk7CiAgIC8qIFNldCB0aGUgbWVt
b3J5IHRvIHRoZSBhcmlidHJhcnkgd2llcmQgdmFsdWUgKi8KICAgaWYgKChNeUZsYWdzICYgTVlf
WkVST0ZJTEwpIHx8ICFzZl9tYWxsb2NfcXVpY2spCiAgICAgYmZpbGwoZGF0YSwgc2l6ZSwgKGNo
YXIpIChNeUZsYWdzICYgTVlfWkVST0ZJTEwgPyAwIDogQUxMT0NfVkFMKSk7CisgIGlmICghKE15
RmxhZ3MgJiBNWV9aRVJPRklMTCkpCisgICAgTUVNX1VOREVGSU5FRChkYXRhLCBzaXplKTsKICAg
LyogUmV0dXJuIGEgcG9pbnRlciB0byB0aGUgcmVhbCBkYXRhICovCiAgIERCVUdfUFJJTlQoImV4
aXQiLCgicHRyOiAlcCIsIGRhdGEpKTsKICAgaWYgKHNmX21pbl9hZHJlc3MgPiBkYXRhKQpAQCAt
MzA5LDcgKzMxMiw5IEBAIHZvaWQgX215ZnJlZSh2b2lkICpwdHIsIGNvbnN0IGNoYXIgKmZpbGUK
ICAgaWYgKCFzZl9tYWxsb2NfcXVpY2spCiAgICAgYmZpbGwocHRyLCBpcmVtLT5kYXRhc2l6ZSwg
KHBjaGFyKSBGUkVFX1ZBTCk7CiAjZW5kaWYKKyAgTUVNX05PQUNDRVNTKHB0ciwgaXJlbS0+ZGF0
YXNpemUpOwogICAqKCh1aW50MzIqKSAoKGNoYXIqKSBwdHItIHNpemVvZih1aW50MzIpKSk9IH5N
QUdJQ0tFWTsKKyAgTUVNX05PQUNDRVNTKChjaGFyKikgcHRyIC0gc2l6ZW9mKHVpbnQzMiksIHNp
emVvZih1aW50MzIpKTsKICAgLyogQWN0dWFsbHkgZnJlZSB0aGUgbWVtb3J5ICovCiAgIGZyZWUo
KGNoYXIqKSBpcmVtKTsKICAgREJVR19WT0lEX1JFVFVSTjsKCj09PSBtb2RpZmllZCBmaWxlICdz
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdW5pdi5pJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvdW5pdi5pCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE0MTMxMDUw
LW1raGx2bHVpMXU1Mmlyb2IKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxNDEzNDEwMS1pNXZxMWM5eXFsemZ3
OTdiCkBAIC04Miw5ICs4Miw5IEBAIG1lbW9yeSBpcyByZWFkIG91dHNpZGUgdGhlIGFsbG9jYXRl
ZCBibG8KIAogLyogTWFrZSBhIG5vbi1pbmxpbmUgZGVidWcgdmVyc2lvbiAqLwogCi0jaWZkZWYg
SEFWRV9wdXJpZnkKKyNpZiBkZWZpbmVkIEhBVkVfVkFMR1JJTkQKICMgZGVmaW5lIFVOSVZfREVC
VUdfVkFMR1JJTkQKLSNlbmRpZiAvKiBIQVZFX3B1cmlmeSAqLworI2VuZGlmIC8qIEhBVkVfVkFM
R1JJTkQgKi8KICNpZiAwCiAjZGVmaW5lIFVOSVZfREVCVUdfVkFMR1JJTkQJCQkvKiBFbmFibGUg
ZXh0cmEKIAkJCQkJCVZhbGdyaW5kIGluc3RydW1lbnRhdGlvbiAqLwoKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3VuaXYuaScKLS0tIGEvc3RvcmFnZS9p
bm5vZGJfcGx1Z2luL2luY2x1ZGUvdW5pdi5pCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTAwNTE0MTMxMDUwLW1raGx2bHVpMXU1Mmlyb2IKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1
Z2luL2luY2x1ZGUvdW5pdi5pCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE0
MTM0MTAxLWk1dnExYzl5cWx6Znc5N2IKQEAgLTE2NSw5ICsxNjUsOSBAQCBjb21tYW5kLiBOb3Qg
dGVzdGVkIG9uIFdpbmRvd3MuICovCiAjZGVmaW5lIFVOSVZfQ09NUElMRV9URVNUX0ZVTkNTCiAq
LwogCi0jaWZkZWYgSEFWRV9wdXJpZnkKKyNpZiBkZWZpbmVkIEhBVkVfVkFMR1JJTkQKICMgZGVm
aW5lIFVOSVZfREVCVUdfVkFMR1JJTkQKLSNlbmRpZiAvKiBIQVZFX3B1cmlmeSAqLworI2VuZGlm
IC8qIEhBVkVfVkFMR1JJTkQgKi8KICNpZiAwCiAjZGVmaW5lIFVOSVZfREVCVUdfVkFMR1JJTkQJ
CQkvKiBFbmFibGUgZXh0cmEKIAkJCQkJCVZhbGdyaW5kIGluc3RydW1lbnRhdGlvbiAqLwoK

--===============1831969072==
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/mysql/5.1-innodb/
# testament_sha1: 26a305041b835a46c684200a5cb65089802f3034
# timestamp: 2010-05-14 16:41:11 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   mkhlvlui1u52irob
# 
# Begin bundle
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


--===============1831969072==--