From: marko.makela
Date: April 20 2011 7:15am
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3365 to 3366)
List-Archive: http://lists.mysql.com/commits/135761
Message-Id: <201104200716.p3K7G9ZO006663@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0954191480=="

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

IDMzNjYgTWFya28gTcOka2Vsw6QJMjAxMS0wNC0yMAogICAgICBSZW1vdmUgYSBkZWJ1ZyBwcmlu
dG91dCB0aGF0IGlzIG5vIGxvbmdlciBuZWVkZWQuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3Jh
Z2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYwogMzM2NSBNYXJrbyBNw6RrZWzDpAkyMDExLTA0
LTEyCiAgICAgIEJ1ZyAjMTIzMjk5MjAgQVNTRVJUIFVUX0VSUk9SIElOIFNZTkNfVEhSRUFEX0xF
VkVMU19OT05FTVBUWV9UUlgKICAgICAgU1JWX0NPTkNfRk9SQ0VfRVhJVF9JTk5PREIKICAgICAg
CiAgICAgIFRoaXMgaXMgYSBib2d1cyBVTklWX1NZTkNfREVCVUcgYXNzZXJ0aW9uIGZhaWx1cmUg
dGhhdCBJIGludHJvZHVjZWQKICAgICAgd2hlbiBpbnRyb2R1Y2luZyBhc3NlcnRpb25zIGZvciBj
aGVja2luZyB0aGF0IElubm9EQiBpcyBub3QgaG9sZGluZwogICAgICBhbnkgbXV0ZXhlcyBvciBy
dy1sb2NrcyB3aGVuIHJldHVybmluZyBjb250cm9sIHRvIE15U1FMLgogICAgICAKICAgICAgc3J2
X3N1c3BlbmRfbXlzcWxfdGhyZWFkKCk6IFJlbGVhc2UgZGljdF9vcGVyYXRpb25fbG9jayBiZWZv
cmUKICAgICAgaW52b2tpbmcgc3J2X2NvbmNfZm9yY2VfZXhpdF9pbm5vZGIoKSwgd2hpY2ggd291
bGQgbm93IGNoZWNrIHRoYXQgdGhlCiAgICAgIHRocmVhZCBpcyBub3QgaG9sZGluZyBhbnkgbXV0
ZXhlcyBvciBydy1sb2Nrcy4gIEFmdGVyIHJlc3VtaW5nLCBjaGVjawogICAgICBzeW5jX3RocmVh
ZF9sZXZlbHNfbm9uZW1wdHlfdHJ4KCkgYW5kIGRvIHNydl9jb25jX2ZvcmNlX2VudGVyX2lubm9k
YigpCiAgICAgIGJlZm9yZSByZWFjcXVpcmluZyB0aGUgZGljdF9vcGVyYXRpb25fbG9jay4KICAg
ICAgCiAgICAgIHJiOjY0NiBhcHByb3ZlZCBieSBTdW5ueSBCYWlucwoKICAgIG1vZGlmaWVkOgog
ICAgICBzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3J2LmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9p
YnVmL2lidWYwaWJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDEyMDYy
MjQzLTFoMHpvcmk4ajNteTN0cDAKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1
Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDIwMDcxMDU0LTgzMnZ1N21s
YWNqZno5aG0KQEAgLTExNzksMTggKzExNzksNyBAQCBpYnVmX3BhZ2VfbG93KAogCQkJCWlidWZf
Yml0bWFwX3BhZ2Vfbm9fY2FsYyh6aXBfc2l6ZSwgcGFnZV9ubyksCiAJCQkJUldfTk9fTEFUQ0gs
IE5VTEwsIEJVRl9HRVRfTk9fTEFUQ0gsCiAJCQkJZmlsZSwgbGluZSwgJmxvY2FsX210cikpOwot
IyBpZmRlZiBVTklWX1NZTkNfREVCVUcKLQkJLyogVGhpcyBpcyBmb3IgdHJhY2tpbmcgQnVnICM1
ODIxMi4gVGhpcyBjaGVjayBhbmQgbWVzc2FnZSBjYW4KLQkJYmUgcmVtb3ZlZCBvbmNlIGl0IGhh
cyBiZWVuIGVzdGFibGlzaGVkIHRoYXQgb3VyIGFzc3VtcHRpb25zCi0JCWFib3V0IHRoaXMgY29u
ZGl0aW9uIGFyZSBjb3JyZWN0LiBUaGUgYnVnIHdhcyBvbmx5IGEgb25lLXRpbWUKLQkJb2NjdXJy
ZW5jZSwgdW5hYmxlIHRvIHJlcGVhdCBzaW5jZSB0aGVuLiAqLwotCQl2b2lkKiBsYXRjaCA9IHN5
bmNfdGhyZWFkX2xldmVsc19jb250YWlucyhTWU5DX0lCVUZfQklUTUFQKTsKLQkJaWYgKGxhdGNo
KSB7Ci0JCQlmcHJpbnRmKHN0ZGVyciwgIkJ1ZyM1ODIxMiBVTklWX1NZTkNfREVCVUciCi0JCQkJ
IiBsZXZlbHMgJXAgKCV1LCV1KVxuIiwKLQkJCQlsYXRjaCwgKHVuc2lnbmVkKSBzcGFjZSwgKHVu
c2lnbmVkKSBwYWdlX25vKTsKLQkJfQotIyBlbmRpZiAvKiBVTklWX1NZTkNfREVCVUcgKi8KKwog
CQlyZXQgPSBpYnVmX2JpdG1hcF9wYWdlX2dldF9iaXRzX2xvdygKIAkJCWJpdG1hcF9wYWdlLCBw
YWdlX25vLCB6aXBfc2l6ZSwKIAkJCU1UUl9NRU1PX0JVRl9GSVgsICZsb2NhbF9tdHIsIElCVUZf
QklUTUFQX0lCVUYpOwoK

--===============0954191480==
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:16: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==


--===============0954191480==--