From: marko.makela
Date: May 18 2011 10:05am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3631) Bug#12561303
List-Archive: http://lists.mysql.com/commits/137523
X-Bug: 12561303
Message-Id: <201105181005.p4IA5woD032464@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1153959591=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUxNzEyMjUwMS0ybmlj
OHpkZWtueDVxa2M0CgogMzYzMSBNYXJrbyBNw6RrZWzDpAkyMDExLTA1LTE4CiAgICAgIEZpeCBh
IHNpZ25lZC91bnNpZ25lZCBjb21wYXJpc29uIHRoYXQgd2FzIGFkZGVkIGluCiAgICAgIEJ1ZyMx
MjU2MTMwMyBJbm5vREIgZmlsZSBBUEkgdXNlcyB0d28gcGFyYW1ldGVycyBmb3IgZmlsZSBzaXpl
CiAgICAgIChienIgcmV2aXNpb24gaWQgbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MTcx
MTQyMTAtZTdkZng5ejM2cjJ0dW16eikKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS9vcy9vczBmaWxlLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvb3Mv
b3MwZmlsZS5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL29zL29zMGZpbGUuYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUxNzEyMjUwMS0ybmljOHpkZWtueDVxa2M0CisrKyBi
L3N0b3JhZ2UvaW5ub2Jhc2Uvb3Mvb3MwZmlsZS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTEwNTE4MTAwNTM4LWNxaDF3a2dja2wwbmw0c20KQEAgLTE5MjYsNyArMTkyNiw3IEBA
IG9zX2ZpbGVfc2V0X3NpemUoCiAJd2hpbGUgKGN1cnJlbnRfc2l6ZSA8IHNpemUpIHsKIAkJdWxp
bnQJbl9ieXRlczsKIAotCQlpZiAoc2l6ZSAtIGN1cnJlbnRfc2l6ZSA8IChpYl9pbnQ2NF90KSBi
dWZfc2l6ZSkgeworCQlpZiAoc2l6ZSAtIGN1cnJlbnRfc2l6ZSA8IChvc19vZmZzZXRfdCkgYnVm
X3NpemUpIHsKIAkJCW5fYnl0ZXMgPSAodWxpbnQpIChzaXplIC0gY3VycmVudF9zaXplKTsKIAkJ
fSBlbHNlIHsKIAkJCW5fYnl0ZXMgPSBidWZfc2l6ZTsKCg==

--===============1153959591==
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.6-innodb/
# testament_sha1: 43623f49045e686589417d22fafaaca03191925c
# timestamp: 2011-05-18 13:05:52 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   2nic8zdeknx5qkc4
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbPEhToAAZVflAAwWmP/93ci
QAC/7//4BAAIAFADg2yMZJmabDJJkyTaJ6qeYKPEaGiaJoe1I9Gk21QJKQ0TxKe1PUzU0R6mgGgA
AAAkkBBNMU9U/EaCj1PUeSD0gZGgBzAAAAAAAAAABzAAAAAAAAAACI8Wd0y8ugps9HCKFeUwAscu
LwWpTr/WXXP4oiB/6PuuRBtlSJUUmaT0fXajLbz7SR9e+txpa9SkH7kUI5OlM9tgZRsT7kKQ9dRY
NmJwfDNeBlJGw+5wMhA0iiXD4uZi3SSbgKy2uiPCArbmHMKmpdkjYoeE+bwVJaJ9KhJtwMTxrSur
jWtfArsWIrXDnHC8HgufY8lTF6Q6Rnya6MsPqo1Pung2XExjkLPmZfsU1EZIDP52AWCMPQ3mqqze
DeSNgW0q1C0xU3mswWBZ7JkRFSZjGHi9g1oTzt2jU4Vdyx2aFp1PqsuYFjDffOy0pBqrJKTyBrWQ
oY7JLWQehRYJ6pHBOxsmKwzoguxRm0369OEyGCjFOKw0UYDoNRCpSuVN8IA68o0ZnvE5Mvmu4iLT
LFbVDU1uurFaxllJPTnKRLK4zJ51GDU63GWTSpRN5FyabRKAnQ2Kv7xu+3Ar6Oflx62LaCq8Z6mG
ZvJve/fQjzoe33vlcwfA6QODE3hb6FtNw44gncfPkAdEzBMsCsA84RQTToJ7NAOaakHHkee/TVvH
BDwxLWDiu+zt6cAEE5kP5OBtMRgZT33Xx2pkCoAvAN13YTclNqy/lleSsUU+98Fs66lQW9dR7E/4
rSQxzK6promYAllhnGD7y0i+PJ2nRnVVBzxw4usfus+3K9pbA5xhPwSHwobyDzOZQuqq3Jaq2YKR
pDCpbToD9o2itmOtQ21Fw5WvGGPZGniq1DPoR4n8AYEPE2YKVgVSbinSYxTGR5f1Mb+SIGgCosJB
bm6pxqcjYiOX7UjowvTJrEF+dwsQaLUrUK8VAOFAIUgGsVgJiu7SUphvSGbsC2Yh4nkM7ZerKYa3
tnW9oGsiPFXF4diDua3zXIX8jkQwE9kyzXqbRgUju00EW0IB5MEnyAd4CjzUdxF3Cq3xFqIVGJ1K
4A9Cy6FZ9BoAEOzGDKyrm4nnESoWD7bZEYplKqD0oZvrni7g1e2zahsoKtdfAUtRSi4nU5vNmja6
p+o6NO/urHA8KFTQreMzR0+eERy225OtUkUeQs1zU8rT1l3l+RcAtBHDATf4V9f+LuSKcKEhZ4kK
dA==


--===============1153959591==--