From: marko.makela
Date: May 18 2011 10:06am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3630 to 3631)
 Bug#12561303
List-Archive: http://lists.mysql.com/commits/137545
X-Bug: 12561303
Message-Id: <201105181006.p4IA6WIr007436@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1597880630=="

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

IDM2MzEgTWFya28gTcOka2Vsw6QJMjAxMS0wNS0xOAogICAgICBGaXggYSBzaWduZWQvdW5zaWdu
ZWQgY29tcGFyaXNvbiB0aGF0IHdhcyBhZGRlZCBpbgogICAgICBCdWcjMTI1NjEzMDMgSW5ub0RC
IGZpbGUgQVBJIHVzZXMgdHdvIHBhcmFtZXRlcnMgZm9yIGZpbGUgc2l6ZQogICAgICAoYnpyIHJl
dmlzaW9uIGlkIG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTE3MTE0MjEwLWU3ZGZ4OXoz
NnIydHVtenopCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvb3Mvb3MwZmls
ZS5jCiAzNjMwIE1hcmtvIE3DpGtlbMOkCTIwMTEtMDUtMTcgW21lcmdlXQogICAgICBNZXJnZSBt
eXNxbC01LjUtaW5ub2RiIHRvIG15c3FsLXRydW5rLWlubm9kYi4KCiAgICBtb2RpZmllZDoKICAg
ICAgc3RvcmFnZS9pbm5vYmFzZS9maWwvZmlsMGZpbC5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9iYXNlL29zL29zMGZpbGUuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9vcy9vczBm
aWxlLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MTcxMjI1MDEtMm5pYzh6
ZGVrbng1cWtjNAorKysgYi9zdG9yYWdlL2lubm9iYXNlL29zL29zMGZpbGUuYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUxODEwMDUzOC1jcWgxd2tnY2tsMG5sNHNtCkBAIC0x
OTI2LDcgKzE5MjYsNyBAQCBvc19maWxlX3NldF9zaXplKAogCXdoaWxlIChjdXJyZW50X3NpemUg
PCBzaXplKSB7CiAJCXVsaW50CW5fYnl0ZXM7CiAKLQkJaWYgKHNpemUgLSBjdXJyZW50X3NpemUg
PCAoaWJfaW50NjRfdCkgYnVmX3NpemUpIHsKKwkJaWYgKHNpemUgLSBjdXJyZW50X3NpemUgPCAo
b3Nfb2Zmc2V0X3QpIGJ1Zl9zaXplKSB7CiAJCQluX2J5dGVzID0gKHVsaW50KSAoc2l6ZSAtIGN1
cnJlbnRfc2l6ZSk7CiAJCX0gZWxzZSB7CiAJCQluX2J5dGVzID0gYnVmX3NpemU7Cgo=

--===============1597880630==
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:06:27 +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==


--===============1597880630==--