From: marko.makela
Date: May 25 2010 1:04pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3120)
List-Archive: http://lists.mysql.com/commits/109172
Message-Id: <201005251305.o4PCIHtf014454@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0931662860=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwNTI1MDczNjA2LWZiMWgy
YmVoc3QzeXFuM2UKCiAzMTIwIE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMjUKICAgICAgTWVyZ2Ug
YSBjaGFuZ2UgZnJvbSBteXNxbC01LjEtaW5ub2RiOgogICAgICAtLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAgcmV2bm86IDM0
ODEKICAgICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTI1MTIz
NzQ4LXBtcGVoYmcyOW95aGMxbnMKICAgICAgcGFyZW50OiBtYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDEwMDUyNDExNDM0OS01a2F3NTJzejB5aDRzemtiCiAgICAgIGNvbW1pdHRlcjogTWFya28g
TcOka2Vsw6QgPG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tPgogICAgICBicmFuY2ggbmljazogNS4x
LWlubm9kYgogICAgICB0aW1lc3RhbXA6IFR1ZSAyMDEwLTA1LTI1IDE1OjM3OjQ4ICswMzAwCiAg
ICAgIG1lc3NhZ2U6CiAgICAgICAgU3VwcHJlc3MgYm9ndXMgVmFsZ3JpbmQgd2FybmluZ3MgYWJv
dXQgYnVmX2J1ZGR5X3JlbG9jYXRlKCkKICAgICAgICBhY2Nlc3NpbmcgdW5pbml0aWFsaXplZCBt
ZW1vcnkgaW4gVmFsZ3JpbmQtaW5zdHJ1bWVudGVkIGJ1aWxkcy4KCiAgICBtb2RpZmllZDoKICAg
ICAgbXlzcWwtdGVzdC92YWxncmluZC5zdXBwCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1
ZjBidWRkeS5jCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3ZhbGdyaW5kLnN1cHAnCi0t
LSBhL215c3FsLXRlc3QvdmFsZ3JpbmQuc3VwcAlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29t
LTIwMTAwNTI1MDczNjA2LWZiMWgyYmVoc3QzeXFuM2UKKysrIGIvbXlzcWwtdGVzdC92YWxncmlu
ZC5zdXBwCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTI1MTMwNDQ0LXA0NnFx
cXJ1ZXhtYzJ0dWEKQEAgLTc0MCwzICs3NDAsOCBAQAogICAgZnVuOnB0aHJlYWRfY3JlYXRlKgog
fQogCit7CisgICBidWZfYnVkZHlfcmVsb2NhdGUgcGVla2luZyAoc3BhY2UscGFnZSkgaW4gcG90
ZW50aWFsbHkgZnJlZSBibG9ja3MKKyAgIE1lbWNoZWNrOkFkZHIxCisgICBmdW46YnVmX2J1ZGR5
X3JlbG9jYXRlCit9Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVm
MGJ1ZGR5LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWRkeS5jCXJldmlkOnZh
c2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMDA1MjUwNzM2MDYtZmIxaDJiZWhzdDN5cW4zZQorKysg
Yi9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwYnVkZHkuYwlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDEwMDUyNTEzMDQ0NC1wNDZxcXFydWV4bWMydHVhCkBAIC00NDYsMTIgKzQ0Niwx
NSBAQCBidWZfYnVkZHlfcmVsb2NhdGUoCiAJCXBvb2wpLCBzbyB0aGVyZSBpcyBub3RoaW5nIHdy
b25nIGFib3V0IHRoaXMuICBUaGUKIAkJbWFjaF9yZWFkX2Zyb21fNCgpIGNhbGxzIGhlcmUgd2ls
bCBvbmx5IHRyaWdnZXIgYm9ndXMKIAkJVmFsZ3JpbmQgbWVtY2hlY2sgd2FybmluZ3MgaW4gVU5J
Vl9ERUJVR19WQUxHUklORCBidWlsZHMuICovCi0JCWJwYWdlID0gYnVmX3BhZ2VfaGFzaF9nZXQo
Ci0JCQlidWZfcG9vbCwKLQkJCW1hY2hfcmVhZF9mcm9tXzQoKGNvbnN0IGJ5dGUqKSBzcmMKLQkJ
CQkJICsgRklMX1BBR0VfQVJDSF9MT0dfTk9fT1JfU1BBQ0VfSUQpLAotCQkJbWFjaF9yZWFkX2Zy
b21fNCgoY29uc3QgYnl0ZSopIHNyYwotCQkJCQkgKyBGSUxfUEFHRV9PRkZTRVQpKTsKKwkJdWxp
bnQJCXNwYWNlCT0gbWFjaF9yZWFkX2Zyb21fNCgKKwkJCShjb25zdCBieXRlKikgc3JjICsgRklM
X1BBR0VfQVJDSF9MT0dfTk9fT1JfU1BBQ0VfSUQpOworCQl1bGludAkJcGFnZV9ubwk9IG1hY2hf
cmVhZF9mcm9tXzQoCisJCQkoY29uc3QgYnl0ZSopIHNyYyArIEZJTF9QQUdFX09GRlNFVCk7CisJ
CS8qIFN1cHByZXNzIFZhbGdyaW5kIHdhcm5pbmdzIGFib3V0IGNvbmRpdGlvbmFsIGp1bXAKKwkJ
b24gdW5pbml0aWFsaXplZCB2YWx1ZS4gKi8KKwkJVU5JVl9NRU1fVkFMSUQoJnNwYWNlLCBzaXpl
b2Ygc3BhY2UpOworCQlVTklWX01FTV9WQUxJRCgmcGFnZV9ubywgc2l6ZW9mIHBhZ2Vfbm8pOwor
CQlicGFnZSA9IGJ1Zl9wYWdlX2hhc2hfZ2V0KGJ1Zl9wb29sLCBzcGFjZSwgcGFnZV9ubyk7CiAK
IAkJaWYgKCFicGFnZSB8fCBicGFnZS0+emlwLmRhdGEgIT0gc3JjKSB7CiAJCQkvKiBUaGUgYmxv
Y2sgaGFzIHByb2JhYmx5IGJlZW4gZnJlc2hseQoK

--===============0931662860==
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: fb34c12ee4ca5e24b76b435e52681af2e10d6dff
# timestamp: 2010-05-25 16:04:57 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   fb1h2behst3yqn3e
# 
# Begin bundle
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


--===============0931662860==--