From: marko.makela
Date: April 20 2011 7:11am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3366)
List-Archive: http://lists.mysql.com/commits/135758
Message-Id: <201104200711.p3K7B8du006380@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0561480879=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQxMjA2MjI0My0xaDB6
b3JpOGozbXkzdHAwCgogMzM2NiBNYXJrbyBNw6RrZWzDpAkyMDExLTA0LTIwCiAgICAgIFJlbW92
ZSBhIGRlYnVnIHByaW50b3V0IHRoYXQgaXMgbm8gbG9uZ2VyIG5lZWRlZC4KCiAgICBtb2RpZmll
ZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jCj09PSBtb2RpZmllZCBm
aWxlICdzdG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmMnCi0tLSBhL3N0b3JhZ2UvaW5u
b2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEx
MDQxMjA2MjI0My0xaDB6b3JpOGozbXkzdHAwCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9p
YnVmMGlidWYuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQyMDA3MTA1NC04
MzJ2dTdtbGFjamZ6OWhtCkBAIC0xMTc5LDE4ICsxMTc5LDcgQEAgaWJ1Zl9wYWdlX2xvdygKIAkJ
CQlpYnVmX2JpdG1hcF9wYWdlX25vX2NhbGMoemlwX3NpemUsIHBhZ2Vfbm8pLAogCQkJCVJXX05P
X0xBVENILCBOVUxMLCBCVUZfR0VUX05PX0xBVENILAogCQkJCWZpbGUsIGxpbmUsICZsb2NhbF9t
dHIpKTsKLSMgaWZkZWYgVU5JVl9TWU5DX0RFQlVHCi0JCS8qIFRoaXMgaXMgZm9yIHRyYWNraW5n
IEJ1ZyAjNTgyMTIuIFRoaXMgY2hlY2sgYW5kIG1lc3NhZ2UgY2FuCi0JCWJlIHJlbW92ZWQgb25j
ZSBpdCBoYXMgYmVlbiBlc3RhYmxpc2hlZCB0aGF0IG91ciBhc3N1bXB0aW9ucwotCQlhYm91dCB0
aGlzIGNvbmRpdGlvbiBhcmUgY29ycmVjdC4gVGhlIGJ1ZyB3YXMgb25seSBhIG9uZS10aW1lCi0J
CW9jY3VycmVuY2UsIHVuYWJsZSB0byByZXBlYXQgc2luY2UgdGhlbi4gKi8KLQkJdm9pZCogbGF0
Y2ggPSBzeW5jX3RocmVhZF9sZXZlbHNfY29udGFpbnMoU1lOQ19JQlVGX0JJVE1BUCk7Ci0JCWlm
IChsYXRjaCkgewotCQkJZnByaW50ZihzdGRlcnIsICJCdWcjNTgyMTIgVU5JVl9TWU5DX0RFQlVH
IgotCQkJCSIgbGV2ZWxzICVwICgldSwldSlcbiIsCi0JCQkJbGF0Y2gsICh1bnNpZ25lZCkgc3Bh
Y2UsICh1bnNpZ25lZCkgcGFnZV9ubyk7Ci0JCX0KLSMgZW5kaWYgLyogVU5JVl9TWU5DX0RFQlVH
ICovCisKIAkJcmV0ID0gaWJ1Zl9iaXRtYXBfcGFnZV9nZXRfYml0c19sb3coCiAJCQliaXRtYXBf
cGFnZSwgcGFnZV9ubywgemlwX3NpemUsCiAJCQlNVFJfTUVNT19CVUZfRklYLCAmbG9jYWxfbXRy
LCBJQlVGX0JJVE1BUF9JQlVGKTsKCg==

--===============0561480879==
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: 28de54c80fadd011610cf02524eedc470bec54e0
# timestamp: 2011-04-20 10:11:04 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   1h0zori8j3my3tp0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeGRcgcAAXtflAAQUmP/91MC
EAC////wBAAIAFADOvAaDQNBolHlDI2k0GmQ9R6JkyD1ANqBgAAAABoNAGgGgGSMim1DTKep5ATa
TIyaYATTQYAAAAAaDQBoBoBJIIAJhMTQm1CeU2hR6j0jyRKmx6b/fcKbLgrnrkAINB8Fc5b81SIg
37T0WCTI7Cgd9jsrPq/lCpfn0aHGAnTmDlzUVgIMBZJDGIKUlAg4uanFIm42WfGVskKlmkZ5pFm6
qiR4tW4pWsI3qFkHYMgqYT1IsIEgo9i5zJlj8kWf1WC3q1VsMzcPSURULbX5Nz7BFCfB63Be50N9
NWpCTZO9zGn3XreeTKZlrfosco4CgIct/VTZKgjrA0W+yIZezeqNJJhWqhlNrIzXJY2K7TgTzz3U
powOcSQguMp8rZTXCZmN7ZXpzCocPVmw2LyY3K2UY4LCSTG7efVqVviTdAyt3VzKtE5FO5ZxWGKp
pUKMU4opLKs9CQVqhRwL6DPKeBp/AY4JG7ewlZBHA3IiZZVWVMgtMfWgs+aSsN9tthKfsUpCULZ2
dho0cEWvIuTStEmCWZqF7mXpyvKXdn+Pl+a1wSJaWTH9ugjjW1cKmD37wJHBYWpljyNUjVhd+qRV
nzsgG9I6XXQyoR+pQV7G25eFmxseGybPbjggy7dAYrUxQm0TzqqVEsaqPN5+H62aJMyRWkbtxV5v
u5Ubi8ZzimpTyp1kkUxSTe3VYZ00HJKW0Q4ntIFTgEkQdffU2JVRogwgUwaDOZQ3MbrjLR1svFu3
y4/kF9dzgmTYX55+XPnaThFO6qZMLNYpjG/xORSf7+PPgx1P4FX5ojtsmyDGbt6CqXhE0D6WaY7v
rn+00upknGPiFck/3ndG8JvEPDKHpyX74JYpu/FI+8wvBcQpClySrF0oSGJ7vC+b0nsD3EM3skZB
8nQZ3C9WTQtLvgVNUsh+VLEN0Xg57m53p8NJ0PGTLbpBkhrcwUQ75wPpI8ggp16vVrYsmswZi4K1
DNRsSpDEk/byG9ohjC2UQCpvKrKpQ+jrVoM2mkBpF2kIooLc3N5FLTWGbSWZ0EwThqmeoOVvUVuI
jORT0EyruD1FT8PUy4KgW6Qj6r/ij9f+LuSKcKEhwyLkDg==


--===============0561480879==--