From: marko.makela
Date: January 30 2011 8:05pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3470)
List-Archive: http://lists.mysql.com/commits/129977
Message-Id: <201101302015.p0UJk773028247@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1984866838=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMTMwMTcyMjQwLW1jd3do
eHhwcXlybjBtdmEKCiAzNDcwIE1hcmtvIE3DpGtlbMOkCTIwMTEtMDEtMzAKICAgICAgUmVtb3Zl
IGEgYm9ndXMgc3RhdGVtZW50IHRoYXQgd2FzIGFjY2lkZW50YWxseSBhZGRlZCBpbgogICAgICBi
enIgcmV2aXNpb24gaWQgbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMjcxMTQ1MTUtM2hj
c2huYmZpcTVxcnlxNgogICAgICAKICAgICAgU3BvdHRlZCBieSBNaWNoYWVsIEl6aW91bXRjaGVu
a28uCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB0cnguYwo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHRyeC5jJwotLS0gYS9z
dG9yYWdlL2lubm9iYXNlL3RyeC90cngwdHJ4LmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNv
bS0yMDExMDEzMDE3MjI0MC1tY3d3aHh4cHF5cm4wbXZhCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uv
dHJ4L3RyeDB0cnguYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEzMDIwMDUy
OC0wOWZ5NTh6enI1djFpMXhtCkBAIC0xNjg1LDggKzE2ODUsNiBAQCB0cnhfZ2V0X3RyeF9ieV94
aWQoCiAJCQl0cngtPnhpZC5mb3JtYXRJRCA9IC0xOwogCQkJYnJlYWs7CiAJCX0KLQotCQl0cngg
PSBVVF9MSVNUX0dFVF9ORVhUKHRyeF9saXN0LCB0cngpOwogCX0KIAogCXJ3X2xvY2tfc191bmxv
Y2soJnRyeF9zeXMtPmxvY2spOwoK

--===============1984866838==
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.6-innodb/
# testament_sha1: 428212514d4f70cb52be19ec1d17281bbb0a9404
# timestamp: 2011-01-30 22:05:36 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: vasil.dimov@stripped\
#   mcwwhxxpqyrn0mva
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbChLdEAAYlflAAQUmP/91Mi
GAC/7//wBAAIAFADeu26mb1a0a294SSTKelN6TFH6mqP00o/SfqU2jSeUaaPUPKBtUVPU/VP0n6p
tU9imk0PKGmgADTQAZJpoUzSeplH6Ij1AMgGgAAbVUw1D1GT1NDTQaaADQAABJJDKn6ps0JgpjJJ
ptT0mCNG0GilmI3+I2tQ33Vs3oMUIbF0quXRqtoiILPAez4JsS4Kju3t118+lXL7P933PXf0ZmK2
Lyczrft1eaHMrVAz+SXumAmrqYCEkjnjO95j9eIckTEyFG6JrKIEY9g9lQBkXgFiBAQ0g0PAHvHC
u4FZIULQirG43nDSRs0HFkGzA+dLEihkPg9FbXvZyDAw9KLkWnSXgaaHkZzU0OqjKLlc4rj9oejM
yI8gKTzgKbMykjKCqquxqDLm3JFhC7GKCyEqlCwmrX7XrKVbiZMmtxaVi9XuVLlZvK9aDoU1K44c
t+c3XsqNUgiuJVzWDLWiKipqRX6WlDn4ZMp5P0Wz0kClCSrYXKWGdyML84mJ1wswL2m8zyQNGFoN
Sms6uEtM2umkhrtUKDfoOyjV1ChhVyzDsVwBWriHaGvuSGkTUScUijFYRra5PX1J+mstl5VVa93C
1bCiZKyIMezoI1bGGolRUweHfOQcFitMNiDntId3aCdTcRG1VPC9B2XXs/CxH6ig7STpNW3jRb95
fkbqPeqqXjqTPjm2fBgYkoktxTUtU67e5TKvnbZmYyfMwKsFryMlvT799wWZqxcp3x7DdgzsgG5h
qLS5OnNCDEY0fb+8eYze5A4zeQMOHDZVA0dXIN0+WlsGP1k6rWzt00oXNH/uP4Iq/t1fEvyTk7CN
M86yKIJ0UTWGJE/e/hiYuPIoLJH52lwNb2EJpz9qkeWC3YHfXXx5ql0cipYqYmUDeEoe+WufpRnq
NEZz8K7U2xB7XBhQyDHRMEQi5CmiCYjLwc8fyDRIZuKDqv/p6DOysWxU9Op9ZhU5Pgwp1FhA2FBp
3CTAPScjYtXEuQodmZIfbtyIL0ZznIF+AiuLlJ0L0a72ZOKKOduKf0HI9CCxswTCkATei3Tm4j4w
ERUl3vlog8Ey6Eb300WZMadYkcCFkNySFJER4kREqEmMlkyRHSi38dg0AWAOPhQVFnZCVbbp34Rv
OdEBIRDzS4J1JKWBKlEow2HPxQJocsTVgv22OtG1H8m8/8XckU4UJCwoS3RA


--===============1984866838==--