From: marko.makela
Date: January 10 2011 1:39pm
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3282)
List-Archive: http://lists.mysql.com/commits/128299
Message-Id: <201101101340.p0ADEEh0001964@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1285434811=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMTA4MTQ1MjM2LWZmcDQ4
amZrZmlxMG40NnIKCiAzMjgyIE1hcmtvIE3DpGtlbMOkCTIwMTEtMDEtMTAgW21lcmdlXQogICAg
ICBNZXJnZSBteXNxbC01LjEtaW5ub2RiIHRvIG15c3FsLTUuNS1pbm5vZGIuCgogICAgbW9kaWZp
ZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmkKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmknCi0tLSBhL3N0b3JhZ2UvaW5ub2Jh
c2UvaW5jbHVkZS91bml2LmkJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDExMDEwODE0
NTIzNi1mZnA0OGpma2ZpcTBuNDZyCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2
LmkJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMTAxMzM3NTUtaHJ5NWszZXMx
YTl1emN0OApAQCAtNDI5LDcgKzQyOSw3IEBAIGl0IGlzIHJlYWQgb3Igd3JpdHRlbi4gKi8KIC8q
IFVzZSBzdW5fcHJlZmV0Y2ggd2hlbiBjb21waWxlIHdpdGggU3VuIFN0dWRpbyAqLwogIyBkZWZp
bmUgVU5JVl9FWFBFQ1QoZXhwcix2YWx1ZSkgKGV4cHIpCiAjIGRlZmluZSBVTklWX0xJS0VMWV9O
VUxMKGV4cHIpIChleHByKQotIyBkZWZpbmUgVU5JVl9QUkVGRVRDSF9SKGFkZHIpIHN1bl9wcmVm
ZXRjaF9yZWFkX21hbnkoYWRkcikKKyMgZGVmaW5lIFVOSVZfUFJFRkVUQ0hfUihhZGRyKSBzdW5f
cHJlZmV0Y2hfcmVhZF9tYW55KCh2b2lkKikgYWRkcikKICMgZGVmaW5lIFVOSVZfUFJFRkVUQ0hf
UlcoYWRkcikgc3VuX3ByZWZldGNoX3dyaXRlX21hbnkoYWRkcikKICNlbHNlCiAvKiBEdW1teSB2
ZXJzaW9ucyBvZiB0aGUgbWFjcm9zICovCgo=

--===============1285434811==
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:39:32 +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


--===============1285434811==--