From: marko.makela
Date: June 8 2010 12:26pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3098) Bug#54009
List-Archive: http://lists.mysql.com/commits/110488
X-Bug: 54009
Message-Id: <201006081227.o58Bm8gp010155@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0879620719=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwODExNDczNC16cjcw
a3hlMjZ6dGd3YmF0CgogMzA5OCBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTA4CiAgICAgIE1lcmdl
IGEgY2hhbmdlIGZyb20gbXlzcWwtNS4xLWlubm9kYjoKICAgICAgLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgIHJldm5vOiAz
NTAzCiAgICAgIHJldmlzaW9uLWlkOiBtYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwODEy
MTA0MS1sN3Q5cjZscnB4NmxoMzYxCiAgICAgIHBhcmVudDogbWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMDA2MDgxMTQwNTUtN2IwNHl0dXF6MGxkZTZ2MQogICAgICBjb21taXR0ZXI6IE1hcmtv
IE3DpGtlbMOkIDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgYnJhbmNoIG5pY2s6IDUu
MS1pbm5vZGIKICAgICAgdGltZXN0YW1wOiBUdWUgMjAxMC0wNi0wOCAxNToxMDo0MSArMDMwMAog
ICAgICBtZXNzYWdlOgogICAgICAgIEJ1ZyM1NDAwOTogU2VydmVyIGNyYXNoZXMgd2hlbiBkYXRh
IGlzIHNlbGVjdGVkIGZyb20gbm9uIGJhY2tlZCB1cCB0YWJsZQogICAgICAgIGZvciBJbm5vREIg
cGx1Z2luCiAgICAgIAogICAgICAgIGRpY3RfbG9hZF90YWJsZSgpOiBQYXNzIHRoZSBjb3JyZWN0
IHRhYmxlc3BhY2UgZmxhZ3MgdG8KICAgICAgICBmaWxfb3Blbl9zaW5nbGVfdGFibGVfdGFibGVz
cGFjZSgpLiBGb3IgUk9XX0ZPUk1BVD1DT01QQUNUIGFuZCBSRURVTkRBTlQsCiAgICAgICAgdGhl
IHRhYmxlc3BhY2UgZmxhZ3MgYXJlIDAuIFRoZSB0YWJsZSBmbGFncyB3b3VsZCBiZSAwIG9yIERJ
Q1RfVEZfQ09NUEFDVC4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9kaWN0
L2RpY3QwbG9hZC5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2RpY3QvZGlj
dDBsb2FkLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGxvYWQuYwlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwODExNDczNC16cjcwa3hlMjZ6dGd3YmF0Cisr
KyBiL3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGxvYWQuYwlyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDEwMDYwODEyMjY0NS1wc25yY2xnN2o3bjF5bnZzCkBAIC0xNjk0LDYgKzE2
OTQsNyBAQCBlcnJfZXhpdDoKIAkJCS8qIFRyeSB0byBvcGVuIHRoZSB0YWJsZXNwYWNlICovCiAJ
CQlpZiAoIWZpbF9vcGVuX3NpbmdsZV90YWJsZV90YWJsZXNwYWNlKAogCQkJCVRSVUUsIHRhYmxl
LT5zcGFjZSwKKwkJCQl0YWJsZS0+ZmxhZ3MgPT0gRElDVF9URl9DT01QQUNUID8gMCA6CiAJCQkJ
dGFibGUtPmZsYWdzICYgfih+MCA8PCBESUNUX1RGX0JJVFMpLCBuYW1lKSkgewogCQkJCS8qIFdl
IGZhaWxlZCB0byBmaW5kIGEgc2Vuc2libGUKIAkJCQl0YWJsZXNwYWNlIGZpbGUgKi8KCg==

--===============0879620719==
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: 0f32143ec2f9e5df5311f835584f17c7e96be811
# timestamp: 2010-06-08 15:26:56 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   zr70kxe26ztgwbat
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQlGN28AAd9flGAwWm//9/8j
3oC////wBAAIAFAEZvAcqA6ADQ1NNCJk0amm02pMymBNMAgyGAABBlI0JtDamptJ6mJAADQA0AAA
A1T1GptIyZADE0aAABoADRoMmDjJkyYjEwAmTBMgBowjAEMAkkCCZMJoBM1Cek2RNGJHqNDTRk9G
p6hM8kKh1NkqFr+94bIx5n5GqaJ1KSCYAsgH5XDTIk1mqHMxAWI6DpEQswijoRwY6+kTXJ1AROGw
dxHlq3ONon6oLQaVEupNpn6zFDKhIAvP9I4POHtr0jSWNsIL/FQ0YGYKeQruCWSEdAOYPrmUjIU8
3aO08/cV4/VaAXsX+dc3isuUMS3STNzOFj4rsugMxsWQSy4exC26bKpqeq90gLRh3JtUAV2E6FvU
Lr/B+qmihanpEaZEOMKkiTicGWQe6SkvXYrV6UupYu5D+FSFxt6+1/ViZoZwc+dXwSmfXLZLP2Kr
Yz1yqzB5LcX5+2qgqZW9eYwiO/HSLWVnRbiCqKGE+VoqdCnHy5yVqugHN5N5IxlFps41XMQVlfLd
et5nVBmiQTqy9jGyx9jFONwnp5kcVGTSp6e7NHdWF+JOnGtl0ejWWotiN7mgIbHqEsaiQzNeDBcD
DapM6IaJZCGft69xZrrbKVh7CyK4rxFSshzWOLnG+1BIwW7KeYXoLJNTRdrTh6ZIrLd1llkaMj7y
GYeq8BidZeAqeoTpSKKaRBuEL5s+7hxT706PejgMahXPHBUkoGSMTRJpmiThNO2lQ7zA8cuUz1Nx
fLv4cvA543L38EL7L5/22UvZmb6UemDfRfU+3CRNR5z5y5Eqxo+ad8Bj8ZfNfebMpE7ES1pqxxAy
SoPTKY272B3v+nyfFuiRU+Id5o9i9vZUheXEoA7g8O8S505rLyAUBxQv4wpImbN1urFiUIUuPF5q
uTvi/Wu/8j38e/bHfvjRfD1Xgs5CLgPhN5OBiwOeoqrWL6cFEiXqCbpKCtPPXeY3RcMktorRK++R
dMk0/O5VUrTeUdEYEbaaVMsB2qMQlX0qbxVkfzVMZRdQJXrQjggfibT/vZbQRmDNAAuZ0SqFtTja
ybq11nRqZAxk25XzVfLhhri2bHpy8G6vNxkQosW7bV2Jk2nTYdtE3rRv0LYFQqE7ItTBnXHUNtKT
n9eTtLLYy7LXDunlAV8uQoucGZdBJtQM/3tT7o5rFjIrKjQlYfFNF5RnB6f1ZugKpp156boxRN0o
3D9G4Wm9MtSF9zAM6S3r7b9YVBU7BlBkLWG6friyyiTjW+ZlKIuu3RChWxr4UnaAckLXsTfydwz9
xqXTdC7OtxUOiRMjyFbLcJh0JKIQZza4Z184LHEI7hUiiyZfcW/h7ElObAZZ1vAHTo90N7V09/mJ
VA9U4vWjjs0MYLJs2ucoEw+iaOsVldMZ1p2Mu3BOgIOBfpFNkYVdxaNQaIpKlYWkL9UZmknOW06j
ZndFoKUCD68uhirKNShqFyyipW6ZwTodgGDKvF8Gh4D7Cv1Zw1xAjJ1glD7jEF25UyqkoAaBGZIj
aLLc+htPHgw1VO35kQzXAuFHmVBt4KSmXtF0+Pc2vUTdCrX/BoPif+LuSKcKEgEoxu3g


--===============0879620719==--