From: marko.makela
Date: May 17 2011 12:25pm
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3378 to 3379)
 Bug#12543706
List-Archive: http://lists.mysql.com/commits/137622
X-Bug: 12543706
Message-Id: <201105171225.p4HCPb9Q007263@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0174172510=="

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

IDMzNzkgTWFya28gTcOka2Vsw6QJMjAxMS0wNS0xNwogICAgICBCdWcjMTI1NDM3MDYgLSBpbm5v
ZGItZmFzdC1zaHV0ZG93bj0yOiBBc3NlcnQKICAgICAgbm9kZS0+bW9kaWZpY2F0aW9uX2NvdW50
ZXIgPT0gbm9kZS0+Zmx1c2hfY291bnRlcgogICAgICAKICAgICAgVGhpcyBidWcgKGFuIGFzc2Vy
dGlvbiBmYWlsdXJlIGR1cmluZyBhIGNyYXNoLWxpa2Ugc2h1dGRvd24pCiAgICAgIHdhcyBpbnRy
b2R1Y2VkIGJ5IHRoZSBmaXggb2YKICAgICAgQnVnIzEyMzIzNjQzIENsZWFuIHVwIHRoZSBJbm5v
REIgdGhyZWFkIHNodXRkb3duIGFuZCBhc3NlcnRpb25zIChXTCM1MTM2KS4KICAgICAgCiAgICAg
IGZpbF9ub2RlX2Nsb3NlX2ZpbGUoKTogUmVsYXggdGhlIGZhaWxpbmcgYXNzZXJ0aW9uCiAgICAg
IHdoZW4gaW5ub2RiX2Zhc3Rfc2h1dGRvd249Mi4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9maWwvZmlsMGZpbC5jCiAzMzc4IFZhc2lsIERpbW92CTIwMTEtMDUtMTAgW21l
cmdlXQogICAgICBOdWxsIG1lcmdlIG15c3FsLTUuMS1pbm5vZGIgLT4gbXlzcWwtNS41LWlubm9k
YgogICAgICAodGhlIGNoYW5nZSBpcyBpcnJlbGV2YW50IGluIDUuNSkKCj09PSBtb2RpZmllZCBm
aWxlICdzdG9yYWdlL2lubm9iYXNlL2ZpbC9maWwwZmlsLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jh
c2UvZmlsL2ZpbDBmaWwuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwNTEwMTI1
MDUzLXNwdnY4YXZ3OGhraGR3cnEKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9maWwvZmlsMGZpbC5j
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTE3MTIxNTU1LWxtcGxlMjRxenhx
a3plcDQKQEAgLTg1Niw3ICs4NTYsOCBAQCBmaWxfbm9kZV9jbG9zZV9maWxlKAogCXV0X2Eobm9k
ZS0+b3Blbik7CiAJdXRfYShub2RlLT5uX3BlbmRpbmcgPT0gMCk7CiAJdXRfYShub2RlLT5uX3Bl
bmRpbmdfZmx1c2hlcyA9PSAwKTsKLQl1dF9hKG5vZGUtPm1vZGlmaWNhdGlvbl9jb3VudGVyID09
IG5vZGUtPmZsdXNoX2NvdW50ZXIpOworCXV0X2Eobm9kZS0+bW9kaWZpY2F0aW9uX2NvdW50ZXIg
PT0gbm9kZS0+Zmx1c2hfY291bnRlcgorCSAgICAgfHwgc3J2X2Zhc3Rfc2h1dGRvd24gPT0gMik7
CiAKIAlyZXQgPSBvc19maWxlX2Nsb3NlKG5vZGUtPmhhbmRsZSk7CiAJdXRfYShyZXQpOwoK

--===============0174172510==
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: 963fcc52ebab9e4b9f73601fa46a3b13f81e1cbb
# timestamp: 2011-05-17 15:25:31 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   spvv8avw8hkhdwrq
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXQLoVkAAavflCAwWmP//38m
FIC/7//0BAAIAFAEDd2qSTmhMksJJIEGQ9EyaZNNFP0SY2qABo9Q009QJJINGIBGJAR6MmoAaABo
0AkiE0EyMmk9TSe0pk9I9Rk0AyaAD1BCo0xNPSYhkwhpowmmIGBNGAmhzTEwEaYEYRgAAACYRhBA
ffSz7Tb9oD2PryUqer3zCHQusskg625fKhU9fnLnrn3sM1XgWxnDhhGLuurlTuOFHhuhqoZvDBu+
ZFjx/kuMp7MD+aYCbo/FBYYTwTWuFar1SQhlyCoFCgmhqaFV1Bru8Z0GwBBIeSiEAmh293gwm3Ta
rlrSZKKQyv7QN2NknzLYy4thUI8iiFTdRjCCC5X85UuyMqGZMuY1v51ipaSyl1vcuNQjl1VmE0hD
pnLC4Xs7J05sH6Stt2KvNseF04vepi7vVhsLMh0xsfK2L8doh5CkMzWmsThVSdezao20PDb3t3or
MjqHjhupyq6Gk8vhzz4deRU+Rkn5aKUKa6udGd0ja0KgdOVOLejGi0nLkPfNSOLRy1TX7Ly93Fp6
KBYtFab2W9hODKGRmt80tQpxxpU8XTvMi6uxMZvObsaNk1XWtC10jiZUdNnPMYllcowZRysLbGCO
ixvLU8hVHxT8T+LbZcsNJpLlnIfZtr0ntK+LO2pzVcztcWpuITFDkz2oKgfU0lOoe4z3rlfqWvxg
xQvN15Zhes80yU/GzSwzN9G6ZdkqkQ/UnKO7XPuMC7hGTRYOr4TkFf75yIbnTb7yoDl2dqRaTtgG
JaB7Xv15ZJ7ZUeeYDGPYpFMol4ncqOmyFcvCOF2EMPerel8Vx4+p5jgDGlZjJnlxUMoQ3lKkTdjh
DczJHOZIvcF9PWU1mG+63FizKCoIVKahdyhonIys0Wp5Sg1rBGaAo7g4te3xdaDAuzC+nDNDpfd4
cqtrTum36NAPfBvI8Kt87P3X6JG1dXFYH9bTqPWmVQqQe51JcysrJAiTrsiexQbrjhgVqK841nPU
HopEx8OfnndMXF7jmd8AxoRt5MMwXqxSdO3RQxomXKAv2DaLJ01Ue4OVQopgMSgoWzELbK5yLevT
Y+BYmGbhwDsvolrsTdOQH5gswyQS8wngtQkEnBMyBiKQ3ETf3J7te+Ip1UYFfERNu0DLvOAz9GK0
wsNtXAgpSLhSjwJQueEEwy3wJBBlhqXKCzCZ5ebdVoKgZUjJln5EEEGJkS1BPA9DTn4SN4QXS5Z3
VhFdiL3Xit1ZlMPYUKZ+tWrwFl6hRDmZRSXpujwpRLbqKts6EFaxI35qaJSWDro21SlRRbAJWEM2
0Fo0JKsIVmTSVFnKkT1Iyhda9sMojNBDwCys2sE9VcBiYaAVInUzlfcZ/A5+L1EJRsrY8dyOSeqr
lctYfqxULIrTKiZa4uIsqlpYx8o5OImkqF6dv8bOv/F3JFOFCQdAuhWQ


--===============0174172510==--