From: marko.makela
Date: June 1 2010 11:57am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3129)
List-Archive: http://lists.mysql.com/commits/109715
Message-Id: <201006011157.o51BFJ4O014442@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0546178122=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMTExNDAxNS1uMzB1
b2ZwaGhiaTcxejF2CgogMzEyOSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTAxCiAgICAgIE1lcmdl
IGZyb20gbXlzcWwtNS4xLWlubm9kYjoKICAgICAgCiAgICAgICAgLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgICAgcmV2bm86
IDM0NzguMS4zCiAgICAgICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTAwNTI1MTIzNzQ4LXBtcGVoYmcyOW95aGMxbnMKICAgICAgICBwYXJlbnQ6IG1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTAwNTI0MTE0MzQ5LTVrYXc1MnN6MHloNHN6a2IKICAgICAgICBjb21t
aXR0ZXI6IE1hcmtvIE3DpGtlbMOkIDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgICBi
cmFuY2ggbmljazogNS4xLWlubm9kYgogICAgICAgIHRpbWVzdGFtcDogVHVlIDIwMTAtMDUtMjUg
MTU6Mzc6NDggKzAzMDAKICAgICAgICBtZXNzYWdlOgogICAgICAgICAgU3VwcHJlc3MgYm9ndXMg
VmFsZ3JpbmQgd2FybmluZ3MgYWJvdXQgYnVmX2J1ZGR5X3JlbG9jYXRlKCkKICAgICAgICAgIGFj
Y2Vzc2luZyB1bmluaXRpYWxpemVkIG1lbW9yeSBpbiBWYWxncmluZC1pbnN0cnVtZW50ZWQgYnVp
bGRzLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3ZhbGdyaW5kLnN1cHAKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1ZGR5LmMKPT09IG1vZGlmaWVkIGZpbGUgJ215c3Fs
LXRlc3QvdmFsZ3JpbmQuc3VwcCcKLS0tIGEvbXlzcWwtdGVzdC92YWxncmluZC5zdXBwCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAxMTE0MDE1LW4zMHVvZnBoaGJpNzF6MXYK
KysrIGIvbXlzcWwtdGVzdC92YWxncmluZC5zdXBwCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTAwNjAxMTE1NjIyLTl3YTRyMzFiMmxzdTE3dGkKQEAgLTc0MCwzICs3NDAsOCBAQAog
ICAgZnVuOnB0aHJlYWRfY3JlYXRlKgogfQogCit7CisgICBidWZfYnVkZHlfcmVsb2NhdGUgcGVl
a2luZyAoc3BhY2UscGFnZSkgaW4gcG90ZW50aWFsbHkgZnJlZSBibG9ja3MKKyAgIE1lbWNoZWNr
OkFkZHIxCisgICBmdW46YnVmX2J1ZGR5X3JlbG9jYXRlCit9Cgo9PT0gbW9kaWZpZWQgZmlsZSAn
c3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1ZGR5LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uv
YnVmL2J1ZjBidWRkeS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAxMTE0
MDE1LW4zMHVvZnBoaGJpNzF6MXYKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1ZGR5
LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MDExMTU2MjItOXdhNHIzMWIy
bHN1MTd0aQpAQCAtNDQ2LDEyICs0NDYsMTUgQEAgYnVmX2J1ZGR5X3JlbG9jYXRlKAogCQlwb29s
KSwgc28gdGhlcmUgaXMgbm90aGluZyB3cm9uZyBhYm91dCB0aGlzLiAgVGhlCiAJCW1hY2hfcmVh
ZF9mcm9tXzQoKSBjYWxscyBoZXJlIHdpbGwgb25seSB0cmlnZ2VyIGJvZ3VzCiAJCVZhbGdyaW5k
IG1lbWNoZWNrIHdhcm5pbmdzIGluIFVOSVZfREVCVUdfVkFMR1JJTkQgYnVpbGRzLiAqLwotCQli
cGFnZSA9IGJ1Zl9wYWdlX2hhc2hfZ2V0KAotCQkJYnVmX3Bvb2wsCi0JCQltYWNoX3JlYWRfZnJv
bV80KChjb25zdCBieXRlKikgc3JjCi0JCQkJCSArIEZJTF9QQUdFX0FSQ0hfTE9HX05PX09SX1NQ
QUNFX0lEKSwKLQkJCW1hY2hfcmVhZF9mcm9tXzQoKGNvbnN0IGJ5dGUqKSBzcmMKLQkJCQkJICsg
RklMX1BBR0VfT0ZGU0VUKSk7CisJCXVsaW50CQlzcGFjZQk9IG1hY2hfcmVhZF9mcm9tXzQoCisJ
CQkoY29uc3QgYnl0ZSopIHNyYyArIEZJTF9QQUdFX0FSQ0hfTE9HX05PX09SX1NQQUNFX0lEKTsK
KwkJdWxpbnQJCXBhZ2Vfbm8JPSBtYWNoX3JlYWRfZnJvbV80KAorCQkJKGNvbnN0IGJ5dGUqKSBz
cmMgKyBGSUxfUEFHRV9PRkZTRVQpOworCQkvKiBTdXBwcmVzcyBWYWxncmluZCB3YXJuaW5ncyBh
Ym91dCBjb25kaXRpb25hbCBqdW1wCisJCW9uIHVuaW5pdGlhbGl6ZWQgdmFsdWUuICovCisJCVVO
SVZfTUVNX1ZBTElEKCZzcGFjZSwgc2l6ZW9mIHNwYWNlKTsKKwkJVU5JVl9NRU1fVkFMSUQoJnBh
Z2Vfbm8sIHNpemVvZiBwYWdlX25vKTsKKwkJYnBhZ2UgPSBidWZfcGFnZV9oYXNoX2dldChidWZf
cG9vbCwgc3BhY2UsIHBhZ2Vfbm8pOwogCiAJCWlmICghYnBhZ2UgfHwgYnBhZ2UtPnppcC5kYXRh
ICE9IHNyYykgewogCQkJLyogVGhlIGJsb2NrIGhhcyBwcm9iYWJseSBiZWVuIGZyZXNobHkKCg==

--===============0546178122==
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: c73d032a0cc3bb19ce5ff0fb0c2232dd13e8ef64
# timestamp: 2010-06-01 14:57:17 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   n30uofphhbi71z1v
# 
# Begin bundle
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


--===============0546178122==--