From: marko.makela
Date: October 21 2010 8:30am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3196) Bug#56680
List-Archive: http://lists.mysql.com/commits/121480
X-Bug: 56680
Message-Id: <201010210831.o9L7OlQw003917@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1843570802=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAyMTA3NDU0NC1xcGk0
NWU3cnR4c3QzMm00CgogMzE5NiBNYXJrbyBNw6RrZWzDpAkyMDEwLTEwLTIxCiAgICAgIEZpeCBh
IHN5c192YXJzLmFsbF92YXJzIGZhaWx1cmUgY2F1c2VkIGJ5IEJ1ZyAjNTY2ODAgaW5zdHJ1bWVu
dGF0aW9uLgogICAgICAKICAgICAgVGhlIHZhcmlhYmxlIGlubm9kYl9jaGFuZ2VfYnVmZmVyaW5n
X2RlYnVnIGlzIG9ubHkgcHJlc2VudCBpbiBkZWJ1ZyBidWlsZHMuCiAgICAgIEhpZGUgaXQgZnJv
bSB0aGUgdGVzdCwgc28gdGhhdCB0aGUgdGVzdCBwYXNzZXMgaW4gYm90aCBkZWJ1ZyBhbmQgbm9u
LWRlYnVnLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3Iv
YWxsX3ZhcnMucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC9hbGxfdmFy
cy50ZXN0Cj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3IvYWxs
X3ZhcnMucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3IvYWxsX3ZhcnMu
cmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDIxMDc0NTQ0LXFwaTQ1
ZTdydHhzdDMybTQKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy9yL2FsbF92YXJzLnJl
c3VsdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAyMTA4MzA0My0zNjM0cWEx
Y2ZlZXlpdDFoCkBAIC0zLDYgKzMsNyBAQCBjcmVhdGUgdGFibGUgdDIgKHZhcmlhYmxlX25hbWUg
dGV4dCk7CiBsb2FkIGRhdGEgaW5maWxlICJNWVNRTFRFU1RfVkFSRElSL3RtcC9zeXNfdmFycy5h
bGxfdmFycy50eHQiIGludG8gdGFibGUgdDE7CiBpbnNlcnQgaW50byB0MiBzZWxlY3QgdmFyaWFi
bGVfbmFtZSBmcm9tIGluZm9ybWF0aW9uX3NjaGVtYS5nbG9iYWxfdmFyaWFibGVzOwogaW5zZXJ0
IGludG8gdDIgc2VsZWN0IHZhcmlhYmxlX25hbWUgZnJvbSBpbmZvcm1hdGlvbl9zY2hlbWEuc2Vz
c2lvbl92YXJpYWJsZXM7CitkZWxldGUgZnJvbSB0MiB3aGVyZSB2YXJpYWJsZV9uYW1lPSdpbm5v
ZGJfY2hhbmdlX2J1ZmZlcmluZ19kZWJ1Zyc7CiB1cGRhdGUgdDIgc2V0IHZhcmlhYmxlX25hbWU9
IHJlcGxhY2UodmFyaWFibGVfbmFtZSwgIlBFUkZPUk1BTkNFX1NDSEVNQV8iLCAiUEZTXyIpOwog
c2VsZWN0IHZhcmlhYmxlX25hbWUgYXMgYFRoZXJlIHNob3VsZCBiZSAqbm8qIGxvbmcgdGVzdCBu
YW1lIGxpc3RlZCBiZWxvdzpgIGZyb20gdDIKIHdoZXJlIGxlbmd0aCh2YXJpYWJsZV9uYW1lKSA+
IDUwOwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC9hbGxf
dmFycy50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3QvYWxsX3ZhcnMudGVz
dAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAyMTA3NDU0NC1xcGk0NWU3cnR4
c3QzMm00CisrKyBiL215c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC9hbGxfdmFycy50ZXN0CXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDIxMDgzMDQzLTM2MzRxYTFjZmVleWl0
MWgKQEAgLTYxLDYgKzYxLDkgQEAgZXZhbCBsb2FkIGRhdGEgaW5maWxlICIkTVlTUUxURVNUX1ZB
UkRJUgogaW5zZXJ0IGludG8gdDIgc2VsZWN0IHZhcmlhYmxlX25hbWUgZnJvbSBpbmZvcm1hdGlv
bl9zY2hlbWEuZ2xvYmFsX3ZhcmlhYmxlczsKIGluc2VydCBpbnRvIHQyIHNlbGVjdCB2YXJpYWJs
ZV9uYW1lIGZyb20gaW5mb3JtYXRpb25fc2NoZW1hLnNlc3Npb25fdmFyaWFibGVzOwogCisjIFRo
aXMgaXMgb25seSBwcmVzZW50IGluIGRlYnVnIGJ1aWxkcy4KK2RlbGV0ZSBmcm9tIHQyIHdoZXJl
IHZhcmlhYmxlX25hbWU9J2lubm9kYl9jaGFuZ2VfYnVmZmVyaW5nX2RlYnVnJzsKKwogIyBQZXJm
b3JtYW5jZSBzY2hlbWEgdmFyaWFibGVzIGFyZSB0b28gbG9uZyBmb3IgZmlsZXMgbmFtZWQKICMg
J215c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC8nIC4uLgogIyAuLi4gJ3BlcmZvcm1hbmNlX3Nj
aGVtYV9ldmVudHNfd2FpdHNfaGlzdG9yeV9sb25nX3NpemVfYmFzaWMtbWFzdGVyLm9wdCcKCg==

--===============1843570802==
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: c13180cc263590309331fe39dc5e893d112c7fe7
# timestamp: 2010-10-21 11:30:51 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   qpi45e7rtxst32m4
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWV/9TjAAAi/flAAQWOf//1NC
BAC////wBAAIAFAE+PHo9SZe3bjrb3de7OEkkTQZI0/VHp6p4U02po8p+qepoAGgCUk0GCNMqfpE
eo9QAGmgAABKE0QTTU9I8mSaNAA0aZANGIJFJqnhDTU0ZNNNknpPSaPUDQaA0BJITIABMIU8g01G
poeoYIekZabLczqR2ZDSStIBdYuKdBFcxXM8ZsqwbTGw8DAVVRV2egfTynHXG47NBalKt+63DdZW
p668HNsD4pY5JosQroeFxKBtgTTjJ1e32UDhkmd0zmF6kTC/JaVfX5g9hHw89B47xqlSNwejBCfA
Bm9S/jgNLpditmJtzONT/vqhZ7AoCpzKyp8iCRnc5njbChYOQnpGI1zJD3E1wDSe4mT/0dAYCccD
8zGZgaywmljrzF5UouYaqiTFbQu9pGRYGBboLY4MkiyuMuo8KovxMOx9jPU9mKXTg2wNafi3caiD
UfLQXlMqhiLgIkxp4nMB7HJIOAKgMTU56NPuOOL3BlsURMYvRuRHG2bjJVjq4Vtf7jwKGoAeOJVk
0eg5AVHSADmFjB8SuJ9nBhEe1FjkmrNoV5MPRWBbUXfCKlgpbJt5zlwrDNQnN8eyj7jwNRgaSWDX
MgMvalEqTLY+20rCgXOFJ0v6DO+1tSWGXLDXfBgqsCTS6zM0Mby2i3CykAXzjR+JE0OLlWRKaQtw
9GJc15aEIWYO5UOIBk4CbN5Afd1thdaPCY2pJzDF6M6yY5VvIWms5aOMqSvIv8r5RCDKcNXG5aKg
6IhPAHO5VQieh7i9V7KsDb5m9I1A5/Qu1bc4LFMNtj30yWRckHIq1MoFNRBLuukDo9hT6YVukL3A
y42V0gvzseq+eiFGF70dpGwKf0fWwzbSAQ0Qw1q16XcuHGCcBI7IxnjrI2lyqvrLFUQhsJFyW2HB
UJRVyVxaUR2+NQFevCscGhaxKOBbhG8620MDWwGAqeRRiDdoZLdkm4m2BSZK7RKzRRdIWjatilJE
lWPhhRg8xJZY86zlsTcFkOVw7SrxkMZZbOSp6SK/DA4Yt0tA068rqtWp+rj2BYDYHJa904Jt95qy
V6td0oIyQzluVDkQRYBNfqRPUmhwLzwNneew7FcgGWC9F+DsTnNjuyaYD4kA5a4JozGdqlm4hpE1
FcMMspJOdeNGrRQQViJey9Hu6OyzNhZQPzqHZF1iiQ/oqd/vLWfetg7yOyG/gC/d+5TtnyFm0eC4
WIpQvGYN86J5AZJgXIXhGhCgECJizNKy0aomkIkvmAXp7gWVbzemQsypQGOeNRfqHhKKR3uEQ1Km
g5Scig6sqKinXrHHhmEnZoGYGXx782Be0gyDmJYs+cV9REwQuxFCxctmqnNpYYGcrpftyzVTGWoD
fTfUsSzpsUw1wgwseRStPBW+d6mUerJyFSuGimpmAjH6KTlvXvp3C0SzZPeLmzqJWK1KIkEFDghK
FB2KkM0U5DQyN3k8qpFcIsYMMPnJATDpNEpCDUkK5ZlUUKdHKh2lo+pFQNBwVuXcxwX2ZBxnUWsp
2LVoBYoGSWRdQSHfLNRR5G5fdcN4tWazgWTWyLFt1lE/ib5/xdyRThQkF/9TjAA=


--===============1843570802==--