From: marko.makela
Date: June 8 2010 12:27pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3097 to 3098) Bug#54009
List-Archive: http://lists.mysql.com/commits/110491
X-Bug: 54009
Message-Id: <201006081228.o58C2LbI019278@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1690067472=="

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

IDMwOTggTWFya28gTcOka2Vsw6QJMjAxMC0wNi0wOAogICAgICBNZXJnZSBhIGNoYW5nZSBmcm9t
IG15c3FsLTUuMS1pbm5vZGI6CiAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICByZXZubzogMzUwMwogICAgICByZXZp
c2lvbi1pZDogbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MDgxMjEwNDEtbDd0OXI2bHJw
eDZsaDM2MQogICAgICBwYXJlbnQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjA4MTE0
MDU1LTdiMDR5dHVxejBsZGU2djEKICAgICAgY29tbWl0dGVyOiBNYXJrbyBNw6RrZWzDpCA8bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20+CiAgICAgIGJyYW5jaCBuaWNrOiA1LjEtaW5ub2RiCiAgICAg
IHRpbWVzdGFtcDogVHVlIDIwMTAtMDYtMDggMTU6MTA6NDEgKzAzMDAKICAgICAgbWVzc2FnZToK
ICAgICAgICBCdWcjNTQwMDk6IFNlcnZlciBjcmFzaGVzIHdoZW4gZGF0YSBpcyBzZWxlY3RlZCBm
cm9tIG5vbiBiYWNrZWQgdXAgdGFibGUKICAgICAgICBmb3IgSW5ub0RCIHBsdWdpbgogICAgICAK
ICAgICAgICBkaWN0X2xvYWRfdGFibGUoKTogUGFzcyB0aGUgY29ycmVjdCB0YWJsZXNwYWNlIGZs
YWdzIHRvCiAgICAgICAgZmlsX29wZW5fc2luZ2xlX3RhYmxlX3RhYmxlc3BhY2UoKS4gRm9yIFJP
V19GT1JNQVQ9Q09NUEFDVCBhbmQgUkVEVU5EQU5ULAogICAgICAgIHRoZSB0YWJsZXNwYWNlIGZs
YWdzIGFyZSAwLiBUaGUgdGFibGUgZmxhZ3Mgd291bGQgYmUgMCBvciBESUNUX1RGX0NPTVBBQ1Qu
CgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGxvYWQuYwog
MzA5NyBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTA4CiAgICAgIE1lcmdlIGEgY2hhbmdlIGZyb20g
bXlzcWwtNS4xLWlubm9kYjoKICAgICAgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgIHJldm5vOiAzNTAyCiAgICAgIHJldmlz
aW9uLWlkOiBtYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwODExNDA1NS03YjA0eXR1cXow
bGRlNnYxCiAgICAgIHBhcmVudDogamltbXkueWFuZ0BvcmFjbGUuY29tLTIwMTAwNjAzMTM0NDQ4
LWl0emR1aHdnYncwYjhubGgKICAgICAgY29tbWl0dGVyOiBNYXJrbyBNw6RrZWzDpCA8bWFya28u
bWFrZWxhQG9yYWNsZS5jb20+CiAgICAgIGJyYW5jaCBuaWNrOiA1LjEtaW5ub2RiCiAgICAgIHRp
bWVzdGFtcDogVHVlIDIwMTAtMDYtMDggMTQ6NDA6NTUgKzAzMDAKICAgICAgbWVzc2FnZToKICAg
ICAgICBidWZfcGFnZV9nZXRfZ2VuKCk6IFBhc3MgZmlsZSxsaW5lIHRvIHJ3X2xvY2tfeF9sb2Nr
KCkuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYwo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3QwbG9hZC5jJwotLS0g
YS9zdG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBsb2FkLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMDA2MDgxMTQ3MzQtenI3MGt4ZTI2enRnd2JhdAorKysgYi9zdG9yYWdlL2lu
bm9iYXNlL2RpY3QvZGljdDBsb2FkLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MDA2MDgxMjI2NDUtcHNucmNsZzdqN24xeW52cwpAQCAtMTY5NCw2ICsxNjk0LDcgQEAgZXJyX2V4
aXQ6CiAJCQkvKiBUcnkgdG8gb3BlbiB0aGUgdGFibGVzcGFjZSAqLwogCQkJaWYgKCFmaWxfb3Bl
bl9zaW5nbGVfdGFibGVfdGFibGVzcGFjZSgKIAkJCQlUUlVFLCB0YWJsZS0+c3BhY2UsCisJCQkJ
dGFibGUtPmZsYWdzID09IERJQ1RfVEZfQ09NUEFDVCA/IDAgOgogCQkJCXRhYmxlLT5mbGFncyAm
IH4ofjAgPDwgRElDVF9URl9CSVRTKSwgbmFtZSkpIHsKIAkJCQkvKiBXZSBmYWlsZWQgdG8gZmlu
ZCBhIHNlbnNpYmxlCiAJCQkJdGFibGVzcGFjZSBmaWxlICovCgo=

--===============1690067472==
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:28:04 +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


--===============1690067472==--