From: marko.makela
Date: May 12 2010 1:04pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3464) Bug#53593
List-Archive: http://lists.mysql.com/commits/108129
X-Bug: 53593
Message-Id: <201005121305.o4CCu9at013263@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0348326993=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTIxMDQ2MDMtdmZ3a2d5
MmZnanF0b2hpdgoKIDM0NjQgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xMgogICAgICBJbXBsZW1l
bnQgVmFsZ3JpbmQgbWVtY2hlY2sgaW5zdHJ1bWVudGF0aW9uIGluIHRoZSBNeVNRTCBjb3JlLiAo
QnVnICM1MzU5MykKICAgICAgCiAgICAgIE5vdGU6IEkgd291bGQgYXBwcmVjaWF0ZSBmZWVkYmFj
ayByZWdhcmRpbmcgbXkgY2hhbmdlcyB0byB0aGUgQlVJTEQgc2NyaXB0cy4KCiAgICBtb2RpZmll
ZDoKICAgICAgQlVJTEQvU0VUVVAuc2gKICAgICAgQlVJTEQvYnVpbGRfbWNjZ2Uuc2gKICAgICAg
QlVJTEQvY29tcGlsZS1hbWQ2NC12YWxncmluZC1tYXgKICAgICAgQlVJTEQvY29tcGlsZS1wZW50
aXVtLWljYy12YWxncmluZC1tYXgKICAgICAgQlVJTEQvY29tcGlsZS1wZW50aXVtLXZhbGdyaW5k
LW1heAogICAgICBCVUlMRC9jb21waWxlLXBlbnRpdW0tdmFsZ3JpbmQtbWF4LW5vLW5kYgogICAg
ICBCVUlMRC9jb21waWxlLXBlbnRpdW02NC12YWxncmluZC1tYXgKICAgICAgY29uZmlndXJlLmlu
CiAgICAgIGluY2x1ZGUvbXlfc3lzLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3Vu
aXYuaQogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS91bml2LmkKPT09IG1vZGlm
aWVkIGZpbGUgJ0JVSUxEL1NFVFVQLnNoJwotLS0gYS9CVUlMRC9TRVRVUC5zaAlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxMjEwNDYwMy12ZndrZ3kyZmdqcXRvaGl2CisrKyBi
L0JVSUxEL1NFVFVQLnNoCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTEyMTMw
NDQ4LWx5NGIxaDljMGRvZWZnOWMKQEAgLTExOSw4ICsxMTksOSBAQCBmaQogCiAjIFNldCBmbGFn
cyBmb3IgdmFyaW91cyBidWlsZCBjb25maWd1cmF0aW9ucy4KICMgVXNlZCBpbiAtdmFsZ3JpbmQg
YnVpbGRzCi12YWxncmluZF9mbGFncz0iLVVTQUZFTUFMTE9DIC1VRk9SQ0VfSU5JVF9PRl9WQVJT
IC1ESEFWRV9wdXJpZnkgIgordmFsZ3JpbmRfZmxhZ3M9Ii1ESEFWRV9wdXJpZnkgIgogdmFsZ3Jp
bmRfZmxhZ3M9IiR2YWxncmluZF9mbGFncyAtRE1ZU1FMX1NFUlZFUl9TVUZGSVg9LXZhbGdyaW5k
LW1heCIKK3ZhbGdyaW5kX2NvbmZpZ3M9Ii0td2l0aC12YWxncmluZCIKICMKICMgVXNlZCBpbiAt
ZGVidWcgYnVpbGRzCiBkZWJ1Z19jZmxhZ3M9Ii1EVU5JVl9NVVNUX05PVF9JTkxJTkUgLURFWFRS
QV9ERUJVRyAtREZPUkNFX0lOSVRfT0ZfVkFSUyAiCgo9PT0gbW9kaWZpZWQgZmlsZSAnQlVJTEQv
YnVpbGRfbWNjZ2Uuc2gnCi0tLSBhL0JVSUxEL2J1aWxkX21jY2dlLnNoCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTAwNTEyMTA0NjAzLXZmd2tneTJmZ2pxdG9oaXYKKysrIGIvQlVJ
TEQvYnVpbGRfbWNjZ2Uuc2gJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTIx
MzA0NDgtbHk0YjFoOWMwZG9lZmc5YwpAQCAtOTQxLDYgKzk0MSw3IEBAIHNldF92YWxncmluZF9m
bGFncygpCiAgICAgbG9jX3ZhbGdyaW5kX2ZsYWdzPSItVVNBRkVNQUxMT0MgLVVGT1JDRV9JTklU
X09GX1ZBUlMgLURIQVZFX3B1cmlmeSAiCiAgICAgbG9jX3ZhbGdyaW5kX2ZsYWdzPSIkbG9jX3Zh
bGdyaW5kX2ZsYWdzIC1ETVlTUUxfU0VSVkVSX1NVRkZJWD0tdmFsZ3JpbmQtbWF4IgogICAgIGNv
bXBpbGVyX2ZsYWdzPSIkY29tcGlsZXJfZmxhZ3MgJGxvY192YWxncmluZF9mbGFncyIKKyAgICB3
aXRoX2ZsYWdzPSIkd2l0aF9mbGFncyAtLXdpdGgtdmFsZ3JpbmQiCiAgIGZpCiB9CiAKCj09PSBt
b2RpZmllZCBmaWxlICdCVUlMRC9jb21waWxlLWFtZDY0LXZhbGdyaW5kLW1heCcKLS0tIGEvQlVJ
TEQvY29tcGlsZS1hbWQ2NC12YWxncmluZC1tYXgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMDA1MTIxMDQ2MDMtdmZ3a2d5MmZnanF0b2hpdgorKysgYi9CVUlMRC9jb21waWxlLWFt
ZDY0LXZhbGdyaW5kLW1heAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxMjEz
MDQ0OC1seTRiMWg5YzBkb2VmZzljCkBAIC00LDcgKzQsNyBAQCBwYXRoPWBkaXJuYW1lICQwYAog
LiAiJHBhdGgvU0VUVVAuc2giCiAKIGV4dHJhX2ZsYWdzPSIkYW1kNjRfY2ZsYWdzICRkZWJ1Z19j
ZmxhZ3MgJHZhbGdyaW5kX2ZsYWdzIgotZXh0cmFfY29uZmlncz0iJGFtZDY0X2NvbmZpZ3MgJGRl
YnVnX2NvbmZpZ3MgJG1heF9jb25maWdzIgorZXh0cmFfY29uZmlncz0iJGFtZDY0X2NvbmZpZ3Mg
JGRlYnVnX2NvbmZpZ3MgJHZhbGdyaW5kX2NvbmZpZ3MgJG1heF9jb25maWdzIgogCiAuICIkcGF0
aC9GSU5JU0guc2giCiAKCj09PSBtb2RpZmllZCBmaWxlICdCVUlMRC9jb21waWxlLXBlbnRpdW0t
aWNjLXZhbGdyaW5kLW1heCcKLS0tIGEvQlVJTEQvY29tcGlsZS1wZW50aXVtLWljYy12YWxncmlu
ZC1tYXgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTIxMDQ2MDMtdmZ3a2d5
MmZnanF0b2hpdgorKysgYi9CVUlMRC9jb21waWxlLXBlbnRpdW0taWNjLXZhbGdyaW5kLW1heAly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxMjEzMDQ0OC1seTRiMWg5YzBkb2Vm
ZzljCkBAIC0yOSw2ICsyOSw2IEBAIGV4dHJhX2ZsYWdzPSIkcGVudGl1bV9jZmxhZ3MgJGRlYnVn
X2NmbGEKIGNfd2FybmluZ3M9Ii1XYWxsIC1XY2hlY2sgLXdkMTYxLDQ0NCwyNzksODEwLDk4MSwx
MjkyLDE0NjksMTU3MiIKIGN4eF93YXJuaW5ncz0iJGNfd2FybmluZ3MgLXdkODY5LDg3NCIKIGJh
c2VfY3h4ZmxhZ3M9Ii1mbm8tZXhjZXB0aW9ucyAtZm5vLXJ0dGkiCi1leHRyYV9jb25maWdzPSIk
cGVudGl1bV9jb25maWdzICRkZWJ1Z19jb25maWdzIgorZXh0cmFfY29uZmlncz0iJHBlbnRpdW1f
Y29uZmlncyAkZGVidWdfY29uZmlncyAkdmFsZ3JpbmRfY29uZmlncyIKIAogLiAiJHBhdGgvRklO
SVNILnNoIgoKPT09IG1vZGlmaWVkIGZpbGUgJ0JVSUxEL2NvbXBpbGUtcGVudGl1bS12YWxncmlu
ZC1tYXgnCi0tLSBhL0JVSUxEL2NvbXBpbGUtcGVudGl1bS12YWxncmluZC1tYXgJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTIxMDQ2MDMtdmZ3a2d5MmZnanF0b2hpdgorKysg
Yi9CVUlMRC9jb21waWxlLXBlbnRpdW0tdmFsZ3JpbmQtbWF4CXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTAwNTEyMTMwNDQ4LWx5NGIxaDljMGRvZWZnOWMKQEAgLTQsNyArNCw3IEBA
IHBhdGg9YGRpcm5hbWUgJDBgCiAuICIkcGF0aC9TRVRVUC5zaCIKIAogZXh0cmFfZmxhZ3M9IiRw
ZW50aXVtX2NmbGFncyAkZGVidWdfY2ZsYWdzICR2YWxncmluZF9mbGFncyIKLWV4dHJhX2NvbmZp
Z3M9IiRwZW50aXVtX2NvbmZpZ3MgJGRlYnVnX2NvbmZpZ3MgJG1heF9jb25maWdzIgorZXh0cmFf
Y29uZmlncz0iJHBlbnRpdW1fY29uZmlncyAkZGVidWdfY29uZmlncyAkdmFsZ3JpbmRfY29uZmln
cyAkbWF4X2NvbmZpZ3MiCiAKIC4gIiRwYXRoL0ZJTklTSC5zaCIKIAoKPT09IG1vZGlmaWVkIGZp
bGUgJ0JVSUxEL2NvbXBpbGUtcGVudGl1bS12YWxncmluZC1tYXgtbm8tbmRiJwotLS0gYS9CVUlM
RC9jb21waWxlLXBlbnRpdW0tdmFsZ3JpbmQtbWF4LW5vLW5kYglyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDEwMDUxMjEwNDYwMy12ZndrZ3kyZmdqcXRvaGl2CisrKyBiL0JVSUxEL2Nv
bXBpbGUtcGVudGl1bS12YWxncmluZC1tYXgtbm8tbmRiCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTAwNTEyMTMwNDQ4LWx5NGIxaDljMGRvZWZnOWMKQEAgLTQsNyArNCw3IEBAIHBh
dGg9YGRpcm5hbWUgJDBgCiAuICIkcGF0aC9TRVRVUC5zaCIKIAogZXh0cmFfZmxhZ3M9IiRwZW50
aXVtX2NmbGFncyAkZGVidWdfY2ZsYWdzICR2YWxncmluZF9mbGFncyIKLWV4dHJhX2NvbmZpZ3M9
IiRwZW50aXVtX2NvbmZpZ3MgJGRlYnVnX2NvbmZpZ3MgJG1heF9ub19uZGJfY29uZmlncyIKK2V4
dHJhX2NvbmZpZ3M9IiRwZW50aXVtX2NvbmZpZ3MgJGRlYnVnX2NvbmZpZ3MgJHZhbGdyaW5kX2Nv
bmZpZ3MgJG1heF9ub19uZGJfY29uZmlncyIKIAogLiAiJHBhdGgvRklOSVNILnNoIgogCgo9PT0g
bW9kaWZpZWQgZmlsZSAnQlVJTEQvY29tcGlsZS1wZW50aXVtNjQtdmFsZ3JpbmQtbWF4JwotLS0g
YS9CVUlMRC9jb21waWxlLXBlbnRpdW02NC12YWxncmluZC1tYXgJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMDA1MTIxMDQ2MDMtdmZ3a2d5MmZnanF0b2hpdgorKysgYi9CVUlMRC9j
b21waWxlLXBlbnRpdW02NC12YWxncmluZC1tYXgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMDA1MTIxMzA0NDgtbHk0YjFoOWMwZG9lZmc5YwpAQCAtNCw3ICs0LDcgQEAgcGF0aD1g
ZGlybmFtZSAkMGAKIC4gIiRwYXRoL1NFVFVQLnNoIgogCiBleHRyYV9mbGFncz0iJHBlbnRpdW02
NF9jZmxhZ3MgJGRlYnVnX2NmbGFncyAkdmFsZ3JpbmRfZmxhZ3MiCi1leHRyYV9jb25maWdzPSIk
cGVudGl1bV9jb25maWdzICRkZWJ1Z19jb25maWdzICRtYXhfY29uZmlncyIKK2V4dHJhX2NvbmZp
Z3M9IiRwZW50aXVtX2NvbmZpZ3MgJGRlYnVnX2NvbmZpZ3MgJHZhbGdyaW5kX2NvbmZpZ3MgJG1h
eF9jb25maWdzIgogCiAuICIkcGF0aC9GSU5JU0guc2giCiAKCj09PSBtb2RpZmllZCBmaWxlICdj
b25maWd1cmUuaW4nCi0tLSBhL2NvbmZpZ3VyZS5pbglyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEwMDUxMjEwNDYwMy12ZndrZ3kyZmdqcXRvaGl2CisrKyBiL2NvbmZpZ3VyZS5pbgly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxMjEzMDQ0OC1seTRiMWg5YzBkb2Vm
ZzljCkBAIC0xNzI5LDYgKzE3MjksMTggQEAgZWxzZQogICBDWFhGTEFHUz0iJE9QVElNSVpFX0NY
WEZMQUdTICRDWFhGTEFHUyIKIGZpCiAKK0FDX0FSR19XSVRIKHZhbGdyaW5kLAorICAgIFsgIC0t
d2l0aC12YWxncmluZCAgICAgICAgIEVuYWJsZSBWYWxncmluZCBpbnN0cnVtZW50YXRpb24uXSwK
KyAgICBbIHdpdGhfdmFsZ3JpbmQ9JHdpdGh2YWwgXSwKKyAgICBbIHdpdGhfdmFsZ3JpbmQ9bm8g
XQorICAgICkKKworaWYgdGVzdCAiJHdpdGhfdmFsZ3JpbmQiICE9ICJubyIKK3RoZW4KKyAgQUNf
Q0hFQ0tfSEVBREVSKHZhbGdyaW5kL21lbWNoZWNrLmgsCisgICAgW0FDX0RFRklORShbVVNFX1ZB
TEdSSU5EX01FTUNIRUNLXSwgWzFdLFtBZGQgVmFsZ3JpbmQgaW5zdHJ1bWVudGF0aW9uXSldKQor
ZmkKKwogIyBEZWJ1ZyBTeW5jIEZhY2lsaXR5LiBOT1RFOiBkZXBlbmRzIG9uICd3aXRoX2RlYnVn
Jy4gTXVzdCBiZSBiZWhpbmQgaXQuCiBBQ19NU0dfQ0hFQ0tJTkcoaWYgRGVidWcgU3luYyBGYWNp
bGl0eSBzaG91bGQgYmUgZW5hYmxlZC4pCiBBQ19BUkdfRU5BQkxFKGRlYnVnX3N5bmMsCgo9PT0g
bW9kaWZpZWQgZmlsZSAnaW5jbHVkZS9teV9zeXMuaCcKLS0tIGEvaW5jbHVkZS9teV9zeXMuaAly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxMjEwNDYwMy12ZndrZ3kyZmdqcXRv
aGl2CisrKyBiL2luY2x1ZGUvbXlfc3lzLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMDA1MTIxMzA0NDgtbHk0YjFoOWMwZG9lZmc5YwpAQCAtMjUsNiArMjUsMTMgQEAgdHlwZWRl
ZiBzdHJ1Y3QgbXlfYWlvX3Jlc3VsdCB7CiB9IG15X2Fpb19yZXN1bHQ7CiAjZW5kaWYKIAorI2lm
ZGVmIFVTRV9WQUxHUklORF9NRU1DSEVDSworIyBpbmNsdWRlIDx2YWxncmluZC9tZW1jaGVjay5o
PgorIyBkZWZpbmUgTUVNX1VOREVGSU5FRChhZGRyLHNpemUpIFZBTEdSSU5EX01BS0VfTUVNX1VO
REVGSU5FRChhZGRyLHNpemUpCisjZWxzZQorIyBkZWZpbmUgTUVNX1VOREVGSU5FRChhZGRyLHNp
emUpICgodm9pZCkgMCkKKyNlbmRpZgorCiAjaWZuZGVmIFRIUkVBRAogZXh0ZXJuIGludCBORUFS
IG15X2Vycm5vOwkJLyogTGFzdCBlcnJvciBpbiBteXN5cyAqLwogI2Vsc2UKQEAgLTE0MSw3ICsx
NDgsNyBAQCBleHRlcm4gaW50IE5FQVIgbXlfZXJybm87CQkvKiBMYXN0IGVycm9yCiAjZGVmaW5l
IG15X21lbWR1cChBLEIsQykgX215X21lbWR1cCgoQSksKEIpLCBfX0ZJTEVfXyxfX0xJTkVfXyxD
KQogI2RlZmluZSBteV9zdHJkdXAoQSxDKSBfbXlfc3RyZHVwKChBKSwgX19GSUxFX18sX19MSU5F
X18sQykKICNkZWZpbmUgbXlfc3RybmR1cChBLEIsQykgX215X3N0cm5kdXAoKEEpLChCKSxfX0ZJ
TEVfXyxfX0xJTkVfXyxDKQotI2RlZmluZSBUUkFTSChBLEIpIGJmaWxsKEEsIEIsIDB4OEYpCisj
ZGVmaW5lIFRSQVNIKEEsQikgZG8geyBiZmlsbChBLCBCLCAweDhGKTsgTUVNX1VOREVGSU5FRChB
LCBCKTsgfSB3aGlsZSgwKQogI2RlZmluZSBRVUlDS19TQUZFTUFMTE9DIHNmX21hbGxvY19xdWlj
az0xCiAjZGVmaW5lIE5PUk1BTF9TQUZFTUFMTE9DIHNmX21hbGxvY19xdWljaz0wCiBleHRlcm4g
dWludCBzZl9tYWxsb2NfcHJlaHVuYyxzZl9tYWxsb2NfZW5kaHVuYyxzZl9tYWxsb2NfcXVpY2s7
CkBAIC0xNjksNyArMTc2LDcgQEAgZXh0ZXJuIGNoYXIgKm15X3N0cm5kdXAoY29uc3QgY2hhciAq
ZnJvbQogI2RlZmluZSBDQUxMRVJfSU5GT19QUk9UTyAgIC8qIG5vdGhpbmcgKi8KICNkZWZpbmUg
Q0FMTEVSX0lORk8gICAgICAgICAvKiBub3RoaW5nICovCiAjZGVmaW5lIE9SSUdfQ0FMTEVSX0lO
Rk8gICAgLyogbm90aGluZyAqLwotI2RlZmluZSBUUkFTSChBLEIpIC8qIG5vdGhpbmcgKi8KKyNk
ZWZpbmUgVFJBU0goQSxCKSBNRU1fVU5ERUZJTkVEKEEsIEIpCiAjZW5kaWYKIAogI2lmIGRlZmlu
ZWQoRU5BQkxFRF9ERUJVR19TWU5DKQoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh
c2UvaW5jbHVkZS91bml2LmknCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmkJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTIxMDQ2MDMtdmZ3a2d5MmZnanF0
b2hpdgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdW5pdi5pCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTAwNTEyMTMwNDQ4LWx5NGIxaDljMGRvZWZnOWMKQEAgLTgyLDkg
KzgyLDkgQEAgbWVtb3J5IGlzIHJlYWQgb3V0c2lkZSB0aGUgYWxsb2NhdGVkIGJsbwogCiAvKiBN
YWtlIGEgbm9uLWlubGluZSBkZWJ1ZyB2ZXJzaW9uICovCiAKLSNpZmRlZiBIQVZFX3B1cmlmeQor
I2lmIGRlZmluZWQgSEFWRV9wdXJpZnkgfHwgZGVmaW5lZCBVU0VfVkFMR1JJTkRfTUVNQ0hFQ0sK
ICMgZGVmaW5lIFVOSVZfREVCVUdfVkFMR1JJTkQKLSNlbmRpZiAvKiBIQVZFX3B1cmlmeSAqLwor
I2VuZGlmIC8qIEhBVkVfcHVyaWZ5IHx8IFVTRV9WQUxHUklORF9NRU1DSEVDSyAqLwogI2lmIDAK
ICNkZWZpbmUgVU5JVl9ERUJVR19WQUxHUklORAkJCS8qIEVuYWJsZSBleHRyYQogCQkJCQkJVmFs
Z3JpbmQgaW5zdHJ1bWVudGF0aW9uICovCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL2luY2x1ZGUvdW5pdi5pJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5j
bHVkZS91bml2LmkJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTIxMDQ2MDMt
dmZ3a2d5MmZnanF0b2hpdgorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS91bml2
LmkJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTIxMzA0NDgtbHk0YjFoOWMw
ZG9lZmc5YwpAQCAtMTY1LDkgKzE2NSw5IEBAIGNvbW1hbmQuIE5vdCB0ZXN0ZWQgb24gV2luZG93
cy4gKi8KICNkZWZpbmUgVU5JVl9DT01QSUxFX1RFU1RfRlVOQ1MKICovCiAKLSNpZmRlZiBIQVZF
X3B1cmlmeQorI2lmIGRlZmluZWQgSEFWRV9wdXJpZnkgfHwgZGVmaW5lZCBVU0VfVkFMR1JJTkRf
TUVNQ0hFQ0sKICMgZGVmaW5lIFVOSVZfREVCVUdfVkFMR1JJTkQKLSNlbmRpZiAvKiBIQVZFX3B1
cmlmeSAqLworI2VuZGlmIC8qIEhBVkVfcHVyaWZ5IHx8IFVTRV9WQUxHUklORF9NRU1DSEVDSyAq
LwogI2lmIDAKICNkZWZpbmUgVU5JVl9ERUJVR19WQUxHUklORAkJCS8qIEVuYWJsZSBleHRyYQog
CQkJCQkJVmFsZ3JpbmQgaW5zdHJ1bWVudGF0aW9uICovCgo=

--===============0348326993==
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: 6212dc69986aa616f0f3951855d4f917af0e83ef
# timestamp: 2010-05-12 16:04:57 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   vfwkgy2fgjqtohiv
# 
# Begin bundle
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
vF3JFOFCQ0KAkDA=


--===============0348326993==--