From: marko.makela
Date: January 10 2011 1:41pm
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3281 to 3282)
List-Archive: http://lists.mysql.com/commits/128300
Message-Id: <201101101342.p0ADUKEf003284@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0958215231=="

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

IDMyODIgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0xMCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuMS1pbm5vZGIgdG8gbXlzcWwtNS41LWlubm9kYi4KCiAgICBtb2RpZmllZDoKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQogMzI4MSBWYXNpbCBEaW1vdgkyMDExLTAxLTA4
IFttZXJnZV0KICAgICAgTnVsbCBtZXJnZSBteXNxbC01LjEtaW5ub2RiIC0+IG15c3FsLTUuNS1p
bm5vZGIKICAgICAgKGlycmVsZXZhbnQgZm9yIDUuNSBhbmQgdXApCgo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaScKLS0tIGEvc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL3VuaXYuaQlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMTA4MTQ1
MjM2LWZmcDQ4amZrZmlxMG40NnIKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYu
aQlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDExMDEzMzc1NS1ocnk1azNlczFh
OXV6Y3Q4CkBAIC00MjksNyArNDI5LDcgQEAgaXQgaXMgcmVhZCBvciB3cml0dGVuLiAqLwogLyog
VXNlIHN1bl9wcmVmZXRjaCB3aGVuIGNvbXBpbGUgd2l0aCBTdW4gU3R1ZGlvICovCiAjIGRlZmlu
ZSBVTklWX0VYUEVDVChleHByLHZhbHVlKSAoZXhwcikKICMgZGVmaW5lIFVOSVZfTElLRUxZX05V
TEwoZXhwcikgKGV4cHIpCi0jIGRlZmluZSBVTklWX1BSRUZFVENIX1IoYWRkcikgc3VuX3ByZWZl
dGNoX3JlYWRfbWFueShhZGRyKQorIyBkZWZpbmUgVU5JVl9QUkVGRVRDSF9SKGFkZHIpIHN1bl9w
cmVmZXRjaF9yZWFkX21hbnkoKHZvaWQqKSBhZGRyKQogIyBkZWZpbmUgVU5JVl9QUkVGRVRDSF9S
VyhhZGRyKSBzdW5fcHJlZmV0Y2hfd3JpdGVfbWFueShhZGRyKQogI2Vsc2UKIC8qIER1bW15IHZl
cnNpb25zIG9mIHRoZSBtYWNyb3MgKi8KCg==

--===============0958215231==
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: 6d454a17376e3611f8f79cfbfed6b6a2a8923695
# timestamp: 2011-01-10 15:42:04 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   ffp48jfkfiq0n46r
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYIRYdEAAyzflEAQWnf/919j
XwC////wBAAIAFAF/c8AB6AAAAAc0xMmTRhMExNMAmAQwRgRgGlTT0jI2U9QxMgNAGIDQGjRoaDD
VT9T0KekaGjygNAAAAAaaAAIKnomTJoDAmIaGjQMJpiaGg0AFSiARoEwjJPSaCeSaNJPymyTTRP0
p+lPIw1XVmwtkHRqcsQWCBAy4gRkkWVFSEUCEWbTRInARxjB7gdW0axHBAiIhE/GHdAQoPvIMpBS
zSbiXEn9BMEngAwEV5BwJcETBxQhTB4OqYaQC3lGAuFULsyvSAMNHXtw/z74WW1k6/tyTI3vo9vk
7dPm6WKOfJPqJ2JuPqomSfcepO93u+ylP/W9VJ0o4omkbtX8J4obNnJsz0VrXOZ0uka1Kbfau1Kr
RQSgeSUg+F2rKakxUvGLzqpJSPcpivYLGrt+CfY2xlRKZ7djyffpE/8oGoet0PTt81wjeauN7Bcl
dCvDz5V0rQsWpraB9mhbcu+/+6dnfThxp337Hj2nNS5zrGtRPwS1o53K7XNuanoE6u7Rq78TXlb3
aEtWcXPfbJyfJR8kY7GG7Xp1tq1c1334ZhvsRouMFqWpi62SvYmWLd4JZpTsUbO4qzq4N1iM0XCu
pqeo7d+XgXMTQZijXgp3Jd2+mwxtYp1bUZX4ca1124VXlFDLLT6RoTLgdsx7ky7vysYzUmpirgq5
XJdk/k9iWW4V5ndXJ6q33KLHZbfbVob9qdaODTGbivTAwxsPBAKu2kbzAr5LAmFCXPQUCBRBJXV1
gJbMqdD4QDHFjRile9NFvOHbfnY43cnKyxTh2LN7FtwuZtmzVpN6PJFF/ZVqNiVzx2LWeoWu7H04
rdi2qmLcbGVr3oqrlqizZySuDgmFGqqupTaxUva03LC5VKMFLjKTDFRklo/sc3FscDS9laUset5O
DWnvHBD6YNVKKRR+np+r4W3fJ+rBpR+r/bjplH7vsfusmKj6vs/d3tjopJ0Vf4fpS48VU/Gj1zxT
7/NY8sPxvT3of1iv+nzRNz/XKlK6DNG5fJt80P5/Pi4r1zT7tcj+FqF13vFkcN/y6fGxK6XY/sup
8V9XFhh7rJcYOrHGSvWjR+GOlfl5u28WJ1ufG/UnivaE1r2zW8OqY5l2xNzr1dW/jRREsT9UTe75
6k2acXb4tnG1XiwbuOuMMkqq55Jtfk5UfNLDindv1bbrU0+s5DHhNTP2trjX0vz9nryS0k114/ph
apVY8HSnoZOdqk8FdLKTNq4+Pz8bPV3PU7Oyq5ofnx7V/Hcr1qufZU/YjKPclE49cOnc+/rj4vJM
XgeDMZJY8c0u6MfZ3cqc7MK38vbYlcjk7tp9xT+HmyXuh/J1tnqaSj3HuwKo5I51h7jyjwHomXYn
3N0ULZuaPXTc1MXySjdi6GOoeNyU3Xl44fROEmDdpPy7nBay0aoYnsHsm9LW71lyO65KOab0P4aD
yO2TmR+z0j0DYNiqJZM0SkdM3B4MF6X8MXUTeijwQ2P2fip0iiqle9vjDatZlnRRUWrSx2Ld1lKR
7ShVavXSS1TwXE/Ow9EXOyRZRKJg6eKzjVDCNmfNHJ2oledTK6g71LMJ+6Jpkzj2VTbyRaaOSi+q
Wlyizdw6L2o/pG56kadxy0euVj5GyB+E162xjI2OTM0L7iMo32Yrpbal1U+Kc7Lku3Ks856KUppY
DgO6xlOykp7Ebfiza6NMlqmnXne70tVfUuYqs2R9ykwb9rMs0XaJKyWpdVM39bNulM/p4L2l+B5s
0sx2aT4JqTcNo2pu3j0o+CPg6I7y5Ns2ZKo+Z7W7BNk+hk7T/hpfN/0XckU4UJCCEWHR


--===============0958215231==--