From: marko.makela
Date: June 29 2010 1:21pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3128) Bug#54408
List-Archive: http://lists.mysql.com/commits/112474
X-Bug: 54408
Message-Id: <201006291321.o5TCeeh0012845@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0839229327=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyOTEzMTkwNy1lcGpz
NmgycnY0NTdoN3F2CgogMzEyOCBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTI5CiAgICAgIE1lcmdl
IEJ1ZyM1NDQwOCBmaXggZnJvbSBteXNxbC01LjEtaW5ub2RiOgogICAgICAtLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAgcmV2
bm86IDM1MzEKICAgICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAw
NjI5MTMwMDU4LTFpbHFhajUxdTlzajl2cWUKICAgICAgcGFyZW50OiBtYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDEwMDYyOTEyNTY1My10Nzk5ZTV4MzBoMzFjdnJkCiAgICAgIGNvbW1pdHRlcjog
TWFya28gTcOka2Vsw6QgPG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tPgogICAgICBicmFuY2ggbmlj
azogNS4xLWlubm9kYgogICAgICB0aW1lc3RhbXA6IFR1ZSAyMDEwLTA2LTI5IDE2OjAwOjU4ICsw
MzAwCiAgICAgIG1lc3NhZ2U6CiAgICAgICAgQnVnIzU0NDA4OiB0eG4gcm9sbGJhY2sgYWZ0ZXIg
cmVjb3Zlcnk6IHJvdzB1bW9kLmM6NjczCiAgICAgICAgZGljdF90YWJsZV9nZXRfZm9ybWF0KGlu
ZGV4LT50YWJsZSkKICAgICAgCiAgICAgICAgVGhlIFJFRFVOREFOVCBhbmQgQ09NUEFDVCBmb3Jt
YXRzIHN0b3JlIGEgbG9jYWwgNzY4LWJ5dGUgcHJlZml4IG9mCiAgICAgICAgZWFjaCBleHRlcm5h
bGx5IHN0b3JlZCBjb2x1bW4uIE5vIHJvd19leHQgY2FjaGUgaXMgbmVlZGVkLCBidXQgd2UKICAg
ICAgICBpbml0aWFsaXplZCBvbmUgbmV2ZXJ0aGVsZXNzLiBXaGVuIHRoZSBCTE9CIHBvaW50ZXIg
d2FzIHplcm8sIHdlIHdvdWxkCiAgICAgICAgaWdub3JlIHRoZSBsb2NhbGx5IHN0b3JlZCBwcmVm
aXggYXMgd2VsbC4gVGhpcyB0cmlnZ2VyZWQgYW4gYXNzZXJ0aW9uCiAgICAgICAgZmFpbHVyZSBp
biByb3dfdW5kb19tb2RfdXBkX2V4aXN0X3NlYygpLgogICAgICAKICAgICAgICByb3dfYnVpbGQo
KTogQWxsb3cgZXh0PT1OVUxMIHdoZW4gYSBSRURVTkRBTlQgb3IgQ09NUEFDVCB0YWJsZQogICAg
ICAgIGNvbnRhaW5zIGV4dGVybmFsbHkgc3RvcmVkIGNvbHVtbnMuCiAgICAgIAogICAgICAgIHJv
d191bmRvX3NlYXJjaF9jbHVzdF90b19wY3VyKCksIHJvd191cGRfc3RvcmVfcm93KCk6IEludm9r
ZQogICAgICAgIHJvd19idWlsZCgpIHdpdGggZXh0PT1OVUxMIG9uIFJFRFVOREFOVCBhbmQgQ09N
UEFDVCB0YWJsZXMuCiAgICAgIAogICAgICAgIHJiOi8vMzgyIGFwcHJvdmVkIGJ5IEppbW15IFlh
bmcKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jCiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1bmRvLmMKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9yb3cvcm93MHVwZC5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9y
b3cwcm93LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cuYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyOTEzMTkwNy1lcGpzNmgycnY0NTdoN3F2CisrKyBi
L3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEwMDYyOTEzMjEwNS16emRxeHYwMHc4cjhocTZyCkBAIC0yOTQsNyArMjk0LDEzIEBA
IHJvd19idWlsZCgKIAogCXV0X2FkKGR0dXBsZV9jaGVja190eXBlZChyb3cpKTsKIAotCWlmIChq
KSB7CisJaWYgKCFleHQpIHsKKwkJLyogUkVEVU5EQU5UIGFuZCBDT01QQUNUIGZvcm1hdHMgc3Rv
cmUgYSBsb2NhbAorCQk3NjgtYnl0ZSBwcmVmaXggb2YgZWFjaCBleHRlcm5hbGx5IHN0b3JlZAor
CQljb2x1bW4uIE5vIGNhY2hlIGlzIG5lZWRlZC4gKi8KKwkJdXRfYWQoZGljdF90YWJsZV9nZXRf
Zm9ybWF0KGluZGV4LT50YWJsZSkKKwkJICAgICAgPCBESUNUX1RGX0ZPUk1BVF9aSVApOworCX0g
ZWxzZSBpZiAoaikgewogCQkqZXh0ID0gcm93X2V4dF9jcmVhdGUoaiwgZXh0X2NvbHMsIHJvdywK
IAkJCQkgICAgICBkaWN0X3RhYmxlX3ppcF9zaXplKGluZGV4LT50YWJsZSksCiAJCQkJICAgICAg
aGVhcCk7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVuZG8u
YycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVuZG8uYwlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDEwMDYyOTEzMTkwNy1lcGpzNmgycnY0NTdoN3F2CisrKyBiL3N0b3Jh
Z2UvaW5ub2Jhc2Uvcm93L3JvdzB1bmRvLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMDA2MjkxMzIxMDUtenpkcXh2MDB3OHI4aHE2cgpAQCAtMTk4LDggKzE5OCwyNCBAQCByb3df
dW5kb19zZWFyY2hfY2x1c3RfdG9fcGN1cigKIAogCQlyZXQgPSBGQUxTRTsKIAl9IGVsc2Ugewor
CQlyb3dfZXh0X3QqKglleHQ7CisKKwkJaWYgKGRpY3RfdGFibGVfZ2V0X2Zvcm1hdChub2RlLT50
YWJsZSkgPj0gRElDVF9URl9GT1JNQVRfWklQKSB7CisJCQkvKiBJbiBEWU5BTUlDIG9yIENPTVBS
RVNTRUQgZm9ybWF0LCB0aGVyZSBpcworCQkJbm8gcHJlZml4IG9mIGV4dGVybmFsbHkgc3RvcmVk
IGNvbHVtbnMgaW4gdGhlCisJCQljbHVzdGVyZWQgaW5kZXggcmVjb3JkLiBCdWlsZCBhIGNhY2hl
IG9mCisJCQljb2x1bW4gcHJlZml4ZXMuICovCisJCQlleHQgPSAmbm9kZS0+ZXh0OworCQl9IGVs
c2UgeworCQkJLyogUkVEVU5EQU5UIGFuZCBDT01QQUNUIGZvcm1hdHMgc3RvcmUgYSBsb2NhbAor
CQkJNzY4LWJ5dGUgcHJlZml4IG9mIGVhY2ggZXh0ZXJuYWxseSBzdG9yZWQKKwkJCWNvbHVtbi4g
Tm8gY2FjaGUgaXMgbmVlZGVkLiAqLworCQkJZXh0ID0gTlVMTDsKKwkJCW5vZGUtPmV4dCA9IE5V
TEw7CisJCX0KKwogCQlub2RlLT5yb3cgPSByb3dfYnVpbGQoUk9XX0NPUFlfREFUQSwgY2x1c3Rf
aW5kZXgsIHJlYywKLQkJCQkgICAgICBvZmZzZXRzLCBOVUxMLCAmbm9kZS0+ZXh0LCBub2RlLT5o
ZWFwKTsKKwkJCQkgICAgICBvZmZzZXRzLCBOVUxMLCBleHQsIG5vZGUtPmhlYXApOwogCQlpZiAo
bm9kZS0+dXBkYXRlKSB7CiAJCQlub2RlLT51bmRvX3JvdyA9IGR0dXBsZV9jb3B5KG5vZGUtPnJv
dywgbm9kZS0+aGVhcCk7CiAJCQlyb3dfdXBkX3JlcGxhY2Uobm9kZS0+dW5kb19yb3csICZub2Rl
LT51bmRvX2V4dCwKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cw
dXBkLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1cGQuYwlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyOTEzMTkwNy1lcGpzNmgycnY0NTdoN3F2CisrKyBiL3N0
b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1cGQuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDEwMDYyOTEzMjEwNS16emRxeHYwMHc4cjhocTZyCkBAIC0xMzk4LDYgKzEzOTgsNyBAQCBy
b3dfdXBkX3N0b3JlX3JvdygKIAlkaWN0X2luZGV4X3QqCWNsdXN0X2luZGV4OwogCXJlY190KgkJ
cmVjOwogCW1lbV9oZWFwX3QqCWhlYXAJCT0gTlVMTDsKKwlyb3dfZXh0X3QqKglleHQ7CiAJdWxp
bnQJCW9mZnNldHNfW1JFQ19PRkZTX05PUk1BTF9TSVpFXTsKIAljb25zdCB1bGludCoJb2Zmc2V0
czsKIAlyZWNfb2Zmc19pbml0KG9mZnNldHNfKTsKQEAgLTE0MTQsOCArMTQxNSwyMiBAQCByb3df
dXBkX3N0b3JlX3JvdygKIAogCW9mZnNldHMgPSByZWNfZ2V0X29mZnNldHMocmVjLCBjbHVzdF9p
bmRleCwgb2Zmc2V0c18sCiAJCQkJICBVTElOVF9VTkRFRklORUQsICZoZWFwKTsKKworCWlmIChk
aWN0X3RhYmxlX2dldF9mb3JtYXQobm9kZS0+dGFibGUpID49IERJQ1RfVEZfRk9STUFUX1pJUCkg
eworCQkvKiBJbiBEWU5BTUlDIG9yIENPTVBSRVNTRUQgZm9ybWF0LCB0aGVyZSBpcyBubyBwcmVm
aXgKKwkJb2YgZXh0ZXJuYWxseSBzdG9yZWQgY29sdW1ucyBpbiB0aGUgY2x1c3RlcmVkIGluZGV4
CisJCXJlY29yZC4gQnVpbGQgYSBjYWNoZSBvZiBjb2x1bW4gcHJlZml4ZXMuICovCisJCWV4dCA9
ICZub2RlLT5leHQ7CisJfSBlbHNlIHsKKwkJLyogUkVEVU5EQU5UIGFuZCBDT01QQUNUIGZvcm1h
dHMgc3RvcmUgYSBsb2NhbAorCQk3NjgtYnl0ZSBwcmVmaXggb2YgZWFjaCBleHRlcm5hbGx5IHN0
b3JlZCBjb2x1bW4uCisJCU5vIGNhY2hlIGlzIG5lZWRlZC4gKi8KKwkJZXh0ID0gTlVMTDsKKwkJ
bm9kZS0+ZXh0ID0gTlVMTDsKKwl9CisKIAlub2RlLT5yb3cgPSByb3dfYnVpbGQoUk9XX0NPUFlf
REFUQSwgY2x1c3RfaW5kZXgsIHJlYywgb2Zmc2V0cywKLQkJCSAgICAgIE5VTEwsICZub2RlLT5l
eHQsIG5vZGUtPmhlYXApOworCQkJICAgICAgTlVMTCwgZXh0LCBub2RlLT5oZWFwKTsKIAlpZiAo
bm9kZS0+aXNfZGVsZXRlKSB7CiAJCW5vZGUtPnVwZF9yb3cgPSBOVUxMOwogCQlub2RlLT51cGRf
ZXh0ID0gTlVMTDsKCg==

--===============0839229327==
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.5-innodb/
# testament_sha1: bf91c83bf023e72fd300eb1b8271414c8baf56ed
# timestamp: 2010-06-29 16:21:12 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   epjs6h2rv457h7qv
# 
# Begin bundle
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
Yj8AoHR/F3JFOFCQLnkDIA==


--===============0839229327==--