From: marko.makela
Date: February 17 2011 7:56am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3503 to 3504)
List-Archive: http://lists.mysql.com/commits/131506
Message-Id: <201102170757.p1H74gpk030641@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1657596674=="

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

IDM1MDQgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0xNyBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNS1pbm5vZGIgdG8gbXlzcWwtdHJ1bmstaW5ub2RiLgoKICAgIG1vZGlmaWVkOgogICAgICBt
eXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc2MDA0OS50ZXN0CiAzNTAzIE1hcmtv
IE3DpGtlbMOkCTIwMTEtMDItMTYgW21lcmdlXQogICAgICBNZXJnZSBteXNxbC01LjUtaW5ub2Ri
IHRvIG15c3FsLXRydW5rLWlubm9kYi4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9z
dWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNjAwNDkudGVzdAo9PT0gbW9kaWZpZWQgZmlsZSAnbXlz
cWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNjAwNDkudGVzdCcKLS0tIGEvbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNjAwNDkudGVzdAlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDExMDIxNjEzNDQwMi1qazFlZHgxZHp5Mzk4eDhnCisrKyBiL215c3Fs
LXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYwMDQ5LnRlc3QJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMTAyMTcwNzUxMzktMWI1ZnpsaXZtanJ4cmpmeApAQCAtMiw2ICsy
LDcgQEAKICMgVGhpcyB0ZXN0IHJlcXVpcmVzIGEgZnJlc2ggc2VydmVyIHN0YXJ0LXVwIGFuZCBh
IHNsb3cgc2h1dGRvd24uCiAjIFRoaXMgd2FzIGEgc3VzcGVjdGVkIGJ1ZyAobm90IGEgYnVnKS4K
IAorLS0gc291cmNlIGluY2x1ZGUvbm90X2VtYmVkZGVkLmluYwogLS0gc291cmNlIGluY2x1ZGUv
aGF2ZV9pbm5vZGIuaW5jCiAKIENSRUFURSBUQUJMRSB0KGEgSU5UKUVOR0lORT1Jbm5vREI7Cgo=

--===============1657596674==
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: 2510d01be5873cbdb609058f611de0a962777fe4
# timestamp: 2011-02-17 09:57:07 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   jk1edx1dzy398x8g
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSNThPoABBNflAAQWGf/91YC
AAC////wBAAIAGAGm5evgQvtpUd9j3NEooXhlUMajaBqGJpkMTIMIGRiDKhkmGpptT01MmIPUAAA
BhJITIaNNTNQIniTQAA0aAMhE1A0aNDQNAAaAGgBFRE02oaKe0p+TSep6k9qn5U8SDajQ0Aikmkw
Jo0BkmjTFPUMkaaPUaaJnFHgfPxNdfgeZbibx00pEOGvLQUWkxGTkExxBGOB0QYs4bnSi2IwhKBB
zoJj8PMIkRKsihXMGjRhOFqNIgEA8N9NExyWmE3w4WFKCAuiWlQqqQ/OUeEvobbW2mNCyoXw9qT9
3V6R4E7tDoOqGejB5IBUYHl6ta0nip4MmfA4RjTzeJ+GZOEHBqqlVic2CFQQU1NjoCC4XEebZ3jn
MzikYpLNNsJHzilaMCH+iDYsUkIhMkU82QoVQdjX/NV8RC6ZJtU3KkF0503SIJwFrCwvvcT231lc
NTXIjQYgUEIU+dC6jH1dRODCy5EOVJ5PIdfhmqEmhqrZ7MdsENJOFLw0m8D92pg+G5ryCZSkkA4c
N/iW8jOQ3sZB8UxG3Hw1ZOXdTtBor1c9zzMNbvJChNEOa4+VRaVxtd0IUVHfGuPnlzWjonSZNr0y
NwmVyGU+sEuLBWRIGvvF4KpmUji+T2yXcmS0mX5keBgPImEU1iiVk2/lnHHMCKvzetJPBQuXGMak
CJK2D0D8qZQYU8hzsBPRjHe687PuhOjl2S7JGONjqt82GIJGJENYYRIvW1TNy+TBI0Z7+JIb4BOj
v1WGqVeSPS1sWQoDlOC0R5qxZBKIyQqZxKTVVFMqxTELtvUhNeQ4zO5OSfdEnpo7IkxWTiQJ+okZ
9FiQ5d+UrFikG+uhZwG6wv7hEYYJRudriBPYYNlx6pilMn7zmkyR/C64pukBjMyLOC2CfSzEIyhf
y1eynsr8SUx5c5/ZUXjUIVCQ65kFcIUIQpdJ9a0irB5UtZlBVa2hbiMi++RMqI4zxT5qfnuui7Fc
g1ZTs56ss1kmkogiyeiScAykmuRgglWw+yer7OJYQZnoQnh/B0eYIaLSAghIiP7u7ThJPIdJMvZE
kOvtQFEhN+WzjSSJl3HzBD9aaCC/39wQt656eR387GtDMEPp6nE4tLiY+WKPs6gQ0+EV6nTFK5e+
a2IcbcmgvgcaR5TkOR4ulcokOAMQmILQbCm+xWFKtauoj2pSNIQvaX0rIoHI957HtwhgEJFh9gQ4
uadjnDH3gkc/Lw/pehMweBr+uZiM+VwHObWvNOUIW9DFyNmsjWwZenzStL261uef1OZ9yW7yJChq
LutMqOtvAsJk6WUIRCcYdS0XxPEHhtL5fwCQgSNtZTQspLAHHIaGwwGhhTq6GDXrUplnW8pb5nld
b+mcZKh26nVM0IIbI7cN75nTJhTk4tCwZozJFTImWd3Z3wzZuOO7LRU7M7LJ2epXmktafk+hmUL0
kHs7ofYOge2k2shuPcD3eLNfG8Swvqy+qlpYugL9LrLHS4rBobEwTyW8Zx5diBkhtkVQO53hCEX2
5tjpbVL/71Uqm3vcKCFp6XBvU3OSnySQer2OcNUWhoXuCH5eiF6ofININSmtTW0AD9T8XghIP2C/
J3u4uS+5sOq1l73QDgpSR91oewIYKYmLAiECMQiRjzbV1OaSNhQ2D819HqGDodCdQ010oFBIpYUo
Y4NBxoF6C4moWiAIQ3/J8EAh3U/BWLv5GzBOSoY3jSkJ6NQfoENKGC/aSF5u7GT7rpzYIAoTQ3Su
0NYSTrcaYDvkimbI0I7OENbmxSRlHj1CtULl3TxZ6GmmXgKEJ0fY7KaMNrS6sN0ggjSaFIKg7wRB
Gg3pWLUhFMr7bIO8Bm86XWUG0KQhqsb/A+kghixstbxmWoXCY0yAoufPUmN58eQ511NssD0UrW9C
m5S8NOs0EzU7X8vo3s/mvQ2BSvNSKGLwzTB6Zp9Gu0+CnBVCi1sv8LgvJf8XckU4UJAjU4T6


--===============1657596674==--