From: marko.makela
Date: May 17 2011 12:15pm
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3379) Bug#12543706
List-Archive: http://lists.mysql.com/commits/137621
X-Bug: 12543706
Message-Id: <201105171216.p4HCG6lZ031868@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1248294355=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwNTEwMTI1MDUzLXNwdnY4
YXZ3OGhraGR3cnEKCiAzMzc5IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDUtMTcKICAgICAgQnVnIzEy
NTQzNzA2IC0gaW5ub2RiLWZhc3Qtc2h1dGRvd249MjogQXNzZXJ0CiAgICAgIG5vZGUtPm1vZGlm
aWNhdGlvbl9jb3VudGVyID09IG5vZGUtPmZsdXNoX2NvdW50ZXIKICAgICAgCiAgICAgIFRoaXMg
YnVnIChhbiBhc3NlcnRpb24gZmFpbHVyZSBkdXJpbmcgYSBjcmFzaC1saWtlIHNodXRkb3duKQog
ICAgICB3YXMgaW50cm9kdWNlZCBieSB0aGUgZml4IG9mCiAgICAgIEJ1ZyMxMjMyMzY0MyBDbGVh
biB1cCB0aGUgSW5ub0RCIHRocmVhZCBzaHV0ZG93biBhbmQgYXNzZXJ0aW9ucyAoV0wjNTEzNiku
CiAgICAgIAogICAgICBmaWxfbm9kZV9jbG9zZV9maWxlKCk6IFJlbGF4IHRoZSBmYWlsaW5nIGFz
c2VydGlvbgogICAgICB3aGVuIGlubm9kYl9mYXN0X3NodXRkb3duPTIuCgogICAgbW9kaWZpZWQ6
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvZmlsL2ZpbDBmaWwuYwo9PT0gbW9kaWZpZWQgZmlsZSAn
c3RvcmFnZS9pbm5vYmFzZS9maWwvZmlsMGZpbC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2Zp
bC9maWwwZmlsLmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDExMDUxMDEyNTA1My1z
cHZ2OGF2dzhoa2hkd3JxCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvZmlsL2ZpbDBmaWwuYwlyZXZp
ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUxNzEyMTU1NS1sbXBsZTI0cXp4cWt6ZXA0
CkBAIC04NTYsNyArODU2LDggQEAgZmlsX25vZGVfY2xvc2VfZmlsZSgKIAl1dF9hKG5vZGUtPm9w
ZW4pOwogCXV0X2Eobm9kZS0+bl9wZW5kaW5nID09IDApOwogCXV0X2Eobm9kZS0+bl9wZW5kaW5n
X2ZsdXNoZXMgPT0gMCk7Ci0JdXRfYShub2RlLT5tb2RpZmljYXRpb25fY291bnRlciA9PSBub2Rl
LT5mbHVzaF9jb3VudGVyKTsKKwl1dF9hKG5vZGUtPm1vZGlmaWNhdGlvbl9jb3VudGVyID09IG5v
ZGUtPmZsdXNoX2NvdW50ZXIKKwkgICAgIHx8IHNydl9mYXN0X3NodXRkb3duID09IDIpOwogCiAJ
cmV0ID0gb3NfZmlsZV9jbG9zZShub2RlLT5oYW5kbGUpOwogCXV0X2EocmV0KTsKCg==

--===============1248294355==
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:16:01 +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


--===============1248294355==--