From: marko.makela
Date: January 20 2011 9:50am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3445)
List-Archive: http://lists.mysql.com/commits/129258
Message-Id: <201101200951.p0K9fTHg022854@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0991798176=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyMDA5NDc1NS0ybmxw
bHd1bDQzcGJ5d3N5CgogMzQ0NSBNYXJrbyBNw6RrZWzDpAkyMDExLTAxLTIwCiAgICAgIENsYXJp
ZnkgdGhlIHByb3RlY3Rpb24gcnVsZXMgb2YgdHJ4X2xvY2tfdDo6d2FpdF90aHIuCgogICAgbW9k
aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwdHJ4LmgKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwdHJ4LmgnCi0tLSBhL3N0b3Jh
Z2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwdHJ4LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMTAxMjAwOTQ3NTUtMm5scGx3dWw0M3BieXdzeQorKysgYi9zdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvdHJ4MHRyeC5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTIw
MDk1MDQ5LTR4dmppdnFjbGRnaGk3N2IKQEAgLTQzMSw5ICs0MzEsMTMgQEAgc3RydWN0IHRyeF9s
b2NrX3N0cnVjdCB7CiAJdGltZV90CQl3YWl0X3N0YXJ0ZWQ7CS8qITwgbG9jayB3YWl0IHN0YXJ0
ZWQgYXQgdGhpcyB0aW1lLAogCQkJCQlwcm90ZWN0ZWQgb25seSBieSBsb2NrX3N5cy0+bXV0ZXgg
Ki8KIAotCXF1ZV90aHJfdCoJd2FpdF90aHI7CS8qITwgcXVlcnkgdGhyZWFkIGJlbG9naW5nIHRv
IHRoaXMKKwlxdWVfdGhyX3QqCXdhaXRfdGhyOwkvKiE8IHF1ZXJ5IHRocmVhZCBiZWxvbmdpbmcg
dG8gdGhpcwogCQkJCQl0cnggdGhhdCBpcyBpbiBRVUVfVEhSX0xPQ0tfV0FJVAotCQkJCSAgICAg
ICAJc3RhdGUgKi8KKwkJCQkgICAgICAgCXN0YXRlLiBGb3IgdGhyZWFkcyBzdXNwZW5kZWQgaW4g
YQorCQkJCQlsb2NrIHdhaXQsIHRoaXMgaXMgcHJvdGVjdGVkIGJ5CisJCQkJCWxvY2tfc3lzLT5t
dXRleC4gT3RoZXJ3aXNlLCB0aGlzIG1heQorCQkJCQlvbmx5IGJlIG1vZGlmaWVkIGJ5IHRoZSB0
aHJlYWQgdGhhdCBpcworCQkJCQlzZXJ2aW5nIHRoZSBydW5uaW5nIHRyYW5zYWN0aW9uLiAqLwog
CiAJbWVtX2hlYXBfdCoJbG9ja19oZWFwOwkvKiE8IG1lbW9yeSBoZWFwIGZvciB0cnhfbG9ja3M7
CiAJCQkJCXByb3RlY3RlZCBieSBsb2NrX3N5cy0+bXV0ZXggKi8KCg==

--===============0991798176==
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: 917a26adadc673866ecb97cd8409086701857739
# timestamp: 2011-01-20 11:50:56 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   2nlplwul43pbywsy
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWoxKAAAAahflGgwcnf//1sC
gAC////wBAAIAFADw8NAGQADQk0AUPU8AJ5II0aZDTQ/VBoNA1NKep6ahtQP1TQZNAAGjJkaAAHM
AmmATIYAAmCYAAAcwCaYBMhgACYJgAAAkkE0AJhNNRphNNT1TaTE0bUaZB5QogsyIlkMDflr1/g+
K686rEdv2jNjEG3yTkAwNR9FKSsrFtw3RGZk7gXP8rh1IHjEr61vcpKjju8i4OUoc2IXOnFEVtUI
lPKEELjl2BII1h02pmQgoyZ4AIYEJLDLa9KkhYvuI9ypXzQbqVrRxu2bY2euNlcEjSK1SNPhsyqr
o3WRXiwc2fBCH9EwjhIyMBdnaLKupA1DJldtHQZ36LNXpc4iPpx/BhX2rEVtCLgUmhhiw/819SH9
T9LfRUeei5xVTKsv2a35zIO7cIoskQUc63Bp7m+qMdnDhDeDa6DMmsWGOqfWZBhJQdVZJwINYDgJ
5y0QapIUDuT3VmO4tJVqSglVApJGC3zOFVcoUinwIGdO5TbdgY2q1RlQiN46coU7pX9zxraSVTGN
yLbV1uoWVDu+1RVqn2ERUvViJmwNl+BXSs1mrX0l+pJWNbYTCxTQmWCBqcmdOXyrjF8jKDiiTstj
SoRi8i5NJolISnahbdPr8zO7I0t6Pfv4e/v2LvSJq2TH8XvirWHuLYWMHl5+cT3ZM4mniFOGK3HI
4JHtE02drki+0ONj4B7LVI8tuUTWpF/4nBZtJjy6B1Tdb3OMx/lqu+EztGLlxRSuu7EGW9dlUvXd
rL5OY9RPSILzSL+JAYGa7jt0qjQvCSdBe/EkW9lepWRU1ItpPGlnQy4Kkp2LALYN2brFQbKve9kW
vSpsxpNABb1DpOAqtFPQ1o0U58ajvYdFxyOQdpEFm2gciMp8KmvnZbfdiIwIQEZIWWfF7lxKF6de
3cxyIvVKKBO8FzMgvCdvETIPGsHG/QWZV19U2MrlM9PMD/VwCvhdXV/mmEqsWZV7E3xrDRb/YUuE
Ral6ZSSPvuDQFqHJUhS9Jeu2kXBkhiVWTvUrotVVCz6KEeiRzSNQ9D9hnb8134QxO6mMYn5TERRi
9KuDgbbbmvJQdGEpIeyZdPHJkjapXX53bQVIu0+sjy+yRYFqqcomFlm1mX0TzjGxdKds9B4i/l26
jrqmHJL4bHqKKOk5P0ihUKd9ijCaKZ45J7mNQc3v+UfDKaazv5OLIA06pynMZItzU+wam3F8H/uR
LyD8DjfdWbmD2ZVplRPvvKTGawLk5or4rkdo0TLCi5ehmpubBYcqE/UNBVCprv1ly8FMqIJMvoLn
ujG+DleDlGwn/4n+3/i7kinChINRiUAA


--===============0991798176==--