From: marko.makela
Date: December 1 2010 8:37am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3248) Bug#55222
List-Archive: http://lists.mysql.com/commits/125615
X-Bug: 55222
Message-Id: <201012010837.oB17lSuM013338@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1160396812=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIwMTA4MDkzMi14ajN0
NjJpc3FxNWx3NDdqCgogMzI0OCBNYXJrbyBNw6RrZWzDpAkyMDEwLTEyLTAxCiAgICAgIEZpeCBh
IGNvbXBpbGF0aW9uIGVycm9yIHRoYXQgd2FzIGludHJvZHVjZWQgaW4gdGhlIEJ1ZyAjNTUyMjIg
Zml4CiAgICAgIChienIgcmV2aXNpb24gaWQga2V2aW4ubGV3aXNAb3JhY2xlLmNvbS0yMDEwMTEz
MDE4MjU1Mi1oZnlkZ2dhZWV5czN0anF4KS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS9kaWN0L2RpY3QwbWVtLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh
c2UvZGljdC9kaWN0MG1lbS5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBtZW0u
YwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIwMTA4MDkzMi14ajN0NjJpc3Fx
NWx3NDdqCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MG1lbS5jCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMjAxMDgzNjU0LWZ3Nmc1bnZ2ajEzY251MDQKQEAgLTI5
NCw3ICsyOTQsNyBAQCBTZXRzIHRoZSBmb3JlaWduX3RhYmxlX25hbWVfbG9va3VwIHBvaW50CiBz
cnZfbG93ZXJfY2FzZV90YWJsZV9uYW1lcy4gIElmIHRoYXQgaXMgMCBvciAxLCBmb3JlaWduX3Rh
YmxlX25hbWVfbG9va3VwCiB3aWxsIHBvaW50IHRvIGZvcmVpZ25fdGFibGVfbmFtZS4gIElmIDIs
IHRoZW4gYW5vdGhlciBzdHJpbmcgaXMgYWxsb2NhdGVkCiBvZiB0aGUgaGVhcCBhbmQgc2V0IHRv
IGxvd2VyIGNhc2UuICovCi1VTklWX0lOTElORQorVU5JVl9JTlRFUk4KIHZvaWQKIGRpY3RfbWVt
X2ZvcmVpZ25fdGFibGVfbmFtZV9sb29rdXBfc2V0KAogLyo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PSovCkBAIC0zMjEsNyArMzIxLDcgQEAgU2V0cyB0aGUgcmVmZXJlbmNlZF90
YWJsZV9uYW1lX2xvb2t1cCBwbwogc3J2X2xvd2VyX2Nhc2VfdGFibGVfbmFtZXMuICBJZiB0aGF0
IGlzIDAgb3IgMSwKIHJlZmVyZW5jZWRfdGFibGVfbmFtZV9sb29rdXAgd2lsbCBwb2ludCB0byBy
ZWZlcmVuY2VkX3RhYmxlX25hbWUuICBJZiAyLAogdGhlbiBhbm90aGVyIHN0cmluZyBpcyBhbGxv
Y2F0ZWQgb2YgdGhlIGhlYXAgYW5kIHNldCB0byBsb3dlciBjYXNlLiAqLwotVU5JVl9JTkxJTkUK
K1VOSVZfSU5URVJOCiB2b2lkCiBkaWN0X21lbV9yZWZlcmVuY2VkX3RhYmxlX25hbWVfbG9va3Vw
X3NldCgKIC8qPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0qLwoK

--===============1160396812==
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: 3b83c257ee5383c407b32871d5147d75fda3f055
# timestamp: 2010-12-01 10:37:29 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   xj3t62isqq5lw47j
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVsQPvkAAaVflAAQWmP/91Mj
FwC////wBAAIAFADbabbZt6CmLwkkgR6CZDRo0BqnkynhT0J6mmAgZIDSaU9PTKg00aaeoAAAA0A
kSCjVPaYJpI08FNNB6gaADajQI1U9TaJkbQmEMmEyA0yNBkMTQJUjRonqZNPUeiDQAAAAGgKcuob
z4YinL8YlTA4lQY8jp1kc7pHVPMzMv32D1hjtHMzElKX9+Oefw1T2fXwn8zo8ujbBzx9GZGGzL1o
hrlcqm62VvQ/BIt6nUYG8F1J6vbceYVfM5wDlcN4ERxbdB00uD52iRLyJpHnHd+xZKzOiDtc1Mhj
TrHsW1azQ0capHuYiN/ednppvvJ0msWIs7CJR1YbY7xYb14nvNIeSylsxRFwoWIYmYMmHBXNffdj
U+dIlERWmhV0yYga/khjGMjMvK1cBj4J3kX6Y5rGshWFDtYC4KFWaYo3L2motGZCrFpBi6cSDhbt
68DwVS3kbFPRj0PkU8ItVPjggVVeAmUDWyhfcn/K7CrhzRxukzw17jHhBSyhgqbhNa0O26prIZwZ
TCI8IcsDk85lvQWFi8WpAzoQ/YU6DQtLWAwQWcqSZhCKCdVLCslAXzINJQi2yRhaYKt+pa3oiLNb
oeINMikJ6HQvBJeZ66lVdb8I7i678c51caRF6ZhmbvPB7EiNvydx1VB6KBYopiT2SxtcCr0eInQZ
Mhjl8QarJ9UcNoK6i7lTEGgR+cWKGWVH1II5tjYw8uSqpN/GYsg4qvMWXfHbYhihaY33sCdCmOii
Xct0VMwLmKYFg2xCqGp1wEHV6wRp0sS6npe7KyN69PpHluJXl20S78fZ02fl4YdPJnPeEttxnK7t
W+poqt+lqLW3fLj2SK10PtMs2bNu369ep5KPRpL6nimTt3hUZVsJz74VFjGw4Cu4yi3akMyFsJRa
4wSNsElIRJB1Q5A8TtQkUXScIodb80j8NKP0PRtWmflHrjFsXVPsyJswj7w1WBmSM4UBQ4S1jwTH
Elya5OSvc0hk0gidep1GdowKbeoaC18UyJsbY1snIJPlgo6r0QNbBQsRb/MkVvKiVRc5L+AtwaV2
wrsscm1BJ0wn0W5d226zNMA7pots4QV40SNCvJXZVKUTVfldmUitp1vVVDquclVRIvmVWMuigg3E
zPqLmI6apSB98HohUTlOwqDzgOFDhkDeQMQQEyCDlHlKBHJ4JhcKmayEZ/8S/n+LuSKcKEgtiB98
gA==


--===============1160396812==--