From: marko.makela
Date: June 24 2010 6:08am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3119)
List-Archive: http://lists.mysql.com/commits/112015
Message-Id: <201006240608.o5O4TcJs000465@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1405203774=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyNDA2MDE0Ni1lbndx
aXB1cG1xcmdoZ2NxCgogMzExOSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTI0CiAgICAgIG1hY2hf
dWxsX3BhcnNlX2NvbXByZXNzZWQoKTogTW92ZSB0byAuaWMgZmlsZSB0byBzaWxlbmNlIGEgR0ND
IHdhcm5pbmcKICAgICAgYWJvdXQgdHJ4X2lkIGJlaW5nIHBvc3NpYmx5IHVuaW5pdGlhbGl6ZWQg
aW4gdHJ4X3VuZG9fcGFyc2VfcGFnZV9oZWFkZXIoKS4KICAgICAgVGhlIHdhcm5pbmcgcmVtYWlu
cyB3aGVuIFVOSVZfREVCVUcgb3IgVU5JVl9NVVNUX05PVF9JTkxJTkUgaXMgZW5hYmxlZC4KCiAg
ICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL21hY2gwZGF0YS5oCiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9tYWNoMGRhdGEuaWMKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS9tYWNoL21hY2gwZGF0YS5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvbWFjaDBkYXRhLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9t
YWNoMGRhdGEuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyNDA2MDE0Ni1l
bndxaXB1cG1xcmdoZ2NxCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9tYWNoMGRhdGEu
aAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyNDA2MDg0Mi1ia2FncGQzdTZx
aWk2b2RkCkBAIC0yODMsNyArMjgzLDcgQEAgbWFjaF9wYXJzZV9jb21wcmVzc2VkKAogUmVhZHMg
YSA2NC1iaXQgaW50ZWdlciBpbiBhIGNvbXByZXNzZWQgZm9ybQogaWYgdGhlIGxvZyByZWNvcmQg
ZnVsbHkgY29udGFpbnMgaXQuCiBAcmV0dXJuIHBvaW50ZXIgdG8gZW5kIG9mIHRoZSBzdG9yZWQg
ZmllbGQsIE5VTEwgaWYgbm90IGNvbXBsZXRlICovCi1VTklWX0lOVEVSTgorVU5JVl9JTkxJTkUK
IGJ5dGUqCiBtYWNoX3VsbF9wYXJzZV9jb21wcmVzc2VkKAogLyo9PT09PT09PT09PT09PT09PT09
PT09Ki8KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvbWFjaDBk
YXRhLmljJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvbWFjaDBkYXRhLmljCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjI0MDYwMTQ2LWVud3FpcHVwbXFyZ2hnY3EK
KysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL21hY2gwZGF0YS5pYwlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyNDA2MDg0Mi1ia2FncGQzdTZxaWk2b2RkCkBAIC00OTYs
NiArNDk2LDQ2IEBAIG1hY2hfdWxsX3JlYWRfbXVjaF9jb21wcmVzc2VkKAogCiAJcmV0dXJuKG4p
OwogfQorCisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqLy8qKgorUmVhZHMgYSA2NC1iaXQgaW50ZWdlciBpbiBhIGNvbXByZXNzZWQgZm9y
bQoraWYgdGhlIGxvZyByZWNvcmQgZnVsbHkgY29udGFpbnMgaXQuCitAcmV0dXJuIHBvaW50ZXIg
dG8gZW5kIG9mIHRoZSBzdG9yZWQgZmllbGQsIE5VTEwgaWYgbm90IGNvbXBsZXRlICovCitVTklW
X0lOTElORQorYnl0ZSoKK21hY2hfdWxsX3BhcnNlX2NvbXByZXNzZWQoCisvKj09PT09PT09PT09
PT09PT09PT09PT0qLworCWJ5dGUqCQlwdHIsCS8qIGluOiBwb2ludGVyIHRvIGJ1ZmZlciBmcm9t
IHdoZXJlIHRvIHJlYWQgKi8KKwlieXRlKgkJZW5kX3B0ciwvKiBpbjogcG9pbnRlciB0byBlbmQg
b2YgdGhlIGJ1ZmZlciAqLworCWliX3VpbnQ2NF90Kgl2YWwpCS8qIG91dDogcmVhZCB2YWx1ZSAq
LworeworCXVsaW50CQlzaXplOworCisJdXRfYWQocHRyKTsKKwl1dF9hZChlbmRfcHRyKTsKKwl1
dF9hZCh2YWwpOworCisJaWYgKGVuZF9wdHIgPCBwdHIgKyA1KSB7CisKKwkJcmV0dXJuKE5VTEwp
OworCX0KKworCSp2YWwgPSBtYWNoX3JlYWRfY29tcHJlc3NlZChwdHIpOworCisJc2l6ZSA9IG1h
Y2hfZ2V0X2NvbXByZXNzZWRfc2l6ZSgodWxpbnQpICp2YWwpOworCisJcHRyICs9IHNpemU7CisK
KwlpZiAoZW5kX3B0ciA8IHB0ciArIDQpIHsKKworCQlyZXR1cm4oTlVMTCk7CisJfQorCisJKnZh
bCA8PD0gMzI7CisJKnZhbCB8PSBtYWNoX3JlYWRfZnJvbV80KHB0cik7CisKKwlyZXR1cm4ocHRy
ICsgNCk7Cit9CiAjaWZuZGVmIFVOSVZfSE9UQkFDS1VQCiAvKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogUmVhZHMgYSBkb3VibGUu
IEl0IGlzIHN0b3JlZCBpbiBhIGxpdHRsZS1lbmRpYW4gZm9ybWF0LgoKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvbWFjaC9tYWNoMGRhdGEuYycKLS0tIGEvc3RvcmFnZS9pbm5v
YmFzZS9tYWNoL21hY2gwZGF0YS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAw
NjI0MDYwMTQ2LWVud3FpcHVwbXFyZ2hnY3EKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9tYWNoL21h
Y2gwZGF0YS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjI0MDYwODQyLWJr
YWdwZDN1NnFpaTZvZGQKQEAgLTkyLDQzICs5MiwzIEBAIG1hY2hfcGFyc2VfY29tcHJlc3NlZCgK
IAkJcmV0dXJuKHB0ciArIDUpOwogCX0KIH0KLQotLyoqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKLVJlYWRzIGEgNjQtYml0IGludGVn
ZXIgaW4gYSBjb21wcmVzc2VkIGZvcm0KLWlmIHRoZSBsb2cgcmVjb3JkIGZ1bGx5IGNvbnRhaW5z
IGl0LgotQHJldHVybiBwb2ludGVyIHRvIGVuZCBvZiB0aGUgc3RvcmVkIGZpZWxkLCBOVUxMIGlm
IG5vdCBjb21wbGV0ZSAqLwotVU5JVl9JTlRFUk4KLWJ5dGUqCi1tYWNoX3VsbF9wYXJzZV9jb21w
cmVzc2VkKAotLyo9PT09PT09PT09PT09PT09PT09PT09Ki8KLQlieXRlKgkJcHRyLAkvKiBpbjog
cG9pbnRlciB0byBidWZmZXIgZnJvbSB3aGVyZSB0byByZWFkICovCi0JYnl0ZSoJCWVuZF9wdHIs
LyogaW46IHBvaW50ZXIgdG8gZW5kIG9mIHRoZSBidWZmZXIgKi8KLQlpYl91aW50NjRfdCoJdmFs
KQkvKiBvdXQ6IHJlYWQgdmFsdWUgKi8KLXsKLQl1bGludAkJc2l6ZTsKLQotCXV0X2FkKHB0cik7
Ci0JdXRfYWQoZW5kX3B0cik7Ci0JdXRfYWQodmFsKTsKLQotCWlmIChlbmRfcHRyIDwgcHRyICsg
NSkgewotCi0JCXJldHVybihOVUxMKTsKLQl9Ci0KLQkqdmFsID0gbWFjaF9yZWFkX2NvbXByZXNz
ZWQocHRyKTsKLQotCXNpemUgPSBtYWNoX2dldF9jb21wcmVzc2VkX3NpemUoKHVsaW50KSAqdmFs
KTsKLQotCXB0ciArPSBzaXplOwotCi0JaWYgKGVuZF9wdHIgPCBwdHIgKyA0KSB7Ci0KLQkJcmV0
dXJuKE5VTEwpOwotCX0KLQotCSp2YWwgPDw9IDMyOwotCSp2YWwgfD0gbWFjaF9yZWFkX2Zyb21f
NChwdHIpOwotCi0JcmV0dXJuKHB0ciArIDQpOwotfQoK

--===============1405203774==
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: 5b3035bb35f0cd171ebf3f10bc6f41a2ebda8111
# timestamp: 2010-06-24 09:08:48 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   enwqipupmqrghgcq
# 
# Begin bundle
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
czF615II8K1Qd/xPl/4u5IpwoSAV/awe


--===============1405203774==--