From: marko.makela
Date: October 21 2010 8:31am
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3195 to 3196) Bug#56680
List-Archive: http://lists.mysql.com/commits/121482
X-Bug: 56680
Message-Id: <201010210831.o9L8VHjn008878@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0470238289=="

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

IDMxOTYgTWFya28gTcOka2Vsw6QJMjAxMC0xMC0yMQogICAgICBGaXggYSBzeXNfdmFycy5hbGxf
dmFycyBmYWlsdXJlIGNhdXNlZCBieSBCdWcgIzU2NjgwIGluc3RydW1lbnRhdGlvbi4KICAgICAg
CiAgICAgIFRoZSB2YXJpYWJsZSBpbm5vZGJfY2hhbmdlX2J1ZmZlcmluZ19kZWJ1ZyBpcyBvbmx5
IHByZXNlbnQgaW4gZGVidWcgYnVpbGRzLgogICAgICBIaWRlIGl0IGZyb20gdGhlIHRlc3QsIHNv
IHRoYXQgdGhlIHRlc3QgcGFzc2VzIGluIGJvdGggZGVidWcgYW5kIG5vbi1kZWJ1Zy4KCiAgICBt
b2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy9yL2FsbF92YXJzLnJlc3Vs
dAogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3QvYWxsX3ZhcnMudGVzdAogMzE5NSBN
YXJrbyBNw6RrZWzDpAkyMDEwLTEwLTIxCiAgICAgIFJlbW92ZSBmaWxlcyB0aGF0IGFyZSBubyBs
b25nZXIgbmVlZGVkLgogICAgICAKICAgICAgVGhlc2UgZmlsZXMgd2VyZSBuZWVkZWQgd2hlbiBJ
bm5vREIgUGx1Z2luIHdhcyBtYWludGFpbmVkIGFuZCBkaXN0cmlidXRlZAogICAgICBzZXBhcmF0
ZWx5IGZyb20gdGhlIE15U1FMIDUuMSBzb3VyY2UgdHJlZS4gVGhleSBoYXZlIG5ldmVyIGJlZW4g
bmVlZGVkIGluCiAgICAgIE15U1FMIDUuNS4KICAgICAgCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
bXlzcWwtdGVzdDoKICAgICAgIFBhdGNoZXMgdG8gdGhlIHRlc3Qgc3VpdGUuCiAgICAgIAogICAg
ICBzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvbXlzcWxfYWRkb25zLmNjOgogICAgICAgV3JhcHBl
cnMgZm9yIHByaXZhdGUgTXlTUUwgZnVuY3Rpb25zLgoKICAgIHJlbW92ZWQ6CiAgICAgIHN0b3Jh
Z2UvaW5ub2Jhc2UvaGFuZGxlci9teXNxbF9hZGRvbnMuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL215c3FsX2FkZG9ucy5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvbXlzcWwtdGVz
dC8KICAgICAgc3RvcmFnZS9pbm5vYmFzZS9teXNxbC10ZXN0L3BhdGNoZXMvCiAgICAgIHN0b3Jh
Z2UvaW5ub2Jhc2UvbXlzcWwtdGVzdC9wYXRjaGVzL1JFQURNRQogICAgICBzdG9yYWdlL2lubm9i
YXNlL215c3FsLXRlc3QvcGF0Y2hlcy9pbmRleF9tZXJnZV9pbm5vZGItZXhwbGFpbi5kaWZmCiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2UvbXlzcWwtdGVzdC9wYXRjaGVzL2luZm9ybWF0aW9uX3NjaGVt
YS5kaWZmCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvbXlzcWwtdGVzdC9wYXRjaGVzL2lubm9kYl9j
aGFuZ2VfYnVmZmVyaW5nX2Jhc2ljLmRpZmYKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9teXNxbC10
ZXN0L3BhdGNoZXMvaW5ub2RiX2ZpbGVfcGVyX3RhYmxlLmRpZmYKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS9teXNxbC10ZXN0L3BhdGNoZXMvaW5ub2RiX2xvY2tfd2FpdF90aW1lb3V0LmRpZmYKICAg
ICAgc3RvcmFnZS9pbm5vYmFzZS9teXNxbC10ZXN0L3BhdGNoZXMvaW5ub2RiX3RocmVhZF9jb25j
dXJyZW5jeV9iYXNpYy5kaWZmCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvbXlzcWwtdGVzdC9wYXRj
aGVzL3BhcnRpdGlvbl9pbm5vZGIuZGlmZgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2UvQ01ha2VMaXN0cy50eHQKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9NYWtlZmlsZS5hbQog
ICAgICBzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwaV9zLmMKPT09IG1vZGlmaWVkIGZpbGUgJ215
c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvci9hbGxfdmFycy5yZXN1bHQnCi0tLSBhL215c3FsLXRl
c3Qvc3VpdGUvc3lzX3ZhcnMvci9hbGxfdmFycy5yZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMDEwMjEwNzQ1NDQtcXBpNDVlN3J0eHN0MzJtNAorKysgYi9teXNxbC10ZXN0
L3N1aXRlL3N5c192YXJzL3IvYWxsX3ZhcnMucmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTAxMDIxMDgzMDQzLTM2MzRxYTFjZmVleWl0MWgKQEAgLTMsNiArMyw3IEBAIGNy
ZWF0ZSB0YWJsZSB0MiAodmFyaWFibGVfbmFtZSB0ZXh0KTsKIGxvYWQgZGF0YSBpbmZpbGUgIk1Z
U1FMVEVTVF9WQVJESVIvdG1wL3N5c192YXJzLmFsbF92YXJzLnR4dCIgaW50byB0YWJsZSB0MTsK
IGluc2VydCBpbnRvIHQyIHNlbGVjdCB2YXJpYWJsZV9uYW1lIGZyb20gaW5mb3JtYXRpb25fc2No
ZW1hLmdsb2JhbF92YXJpYWJsZXM7CiBpbnNlcnQgaW50byB0MiBzZWxlY3QgdmFyaWFibGVfbmFt
ZSBmcm9tIGluZm9ybWF0aW9uX3NjaGVtYS5zZXNzaW9uX3ZhcmlhYmxlczsKK2RlbGV0ZSBmcm9t
IHQyIHdoZXJlIHZhcmlhYmxlX25hbWU9J2lubm9kYl9jaGFuZ2VfYnVmZmVyaW5nX2RlYnVnJzsK
IHVwZGF0ZSB0MiBzZXQgdmFyaWFibGVfbmFtZT0gcmVwbGFjZSh2YXJpYWJsZV9uYW1lLCAiUEVS
Rk9STUFOQ0VfU0NIRU1BXyIsICJQRlNfIik7CiBzZWxlY3QgdmFyaWFibGVfbmFtZSBhcyBgVGhl
cmUgc2hvdWxkIGJlICpubyogbG9uZyB0ZXN0IG5hbWUgbGlzdGVkIGJlbG93OmAgZnJvbSB0Mgog
d2hlcmUgbGVuZ3RoKHZhcmlhYmxlX25hbWUpID4gNTA7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlz
cWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L2FsbF92YXJzLnRlc3QnCi0tLSBhL215c3FsLXRlc3Qv
c3VpdGUvc3lzX3ZhcnMvdC9hbGxfdmFycy50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTAxMDIxMDc0NTQ0LXFwaTQ1ZTdydHhzdDMybTQKKysrIGIvbXlzcWwtdGVzdC9zdWl0
ZS9zeXNfdmFycy90L2FsbF92YXJzLnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMDEwMjEwODMwNDMtMzYzNHFhMWNmZWV5aXQxaApAQCAtNjEsNiArNjEsOSBAQCBldmFsIGxv
YWQgZGF0YSBpbmZpbGUgIiRNWVNRTFRFU1RfVkFSRElSCiBpbnNlcnQgaW50byB0MiBzZWxlY3Qg
dmFyaWFibGVfbmFtZSBmcm9tIGluZm9ybWF0aW9uX3NjaGVtYS5nbG9iYWxfdmFyaWFibGVzOwog
aW5zZXJ0IGludG8gdDIgc2VsZWN0IHZhcmlhYmxlX25hbWUgZnJvbSBpbmZvcm1hdGlvbl9zY2hl
bWEuc2Vzc2lvbl92YXJpYWJsZXM7CiAKKyMgVGhpcyBpcyBvbmx5IHByZXNlbnQgaW4gZGVidWcg
YnVpbGRzLgorZGVsZXRlIGZyb20gdDIgd2hlcmUgdmFyaWFibGVfbmFtZT0naW5ub2RiX2NoYW5n
ZV9idWZmZXJpbmdfZGVidWcnOworCiAjIFBlcmZvcm1hbmNlIHNjaGVtYSB2YXJpYWJsZXMgYXJl
IHRvbyBsb25nIGZvciBmaWxlcyBuYW1lZAogIyAnbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90
LycgLi4uCiAjIC4uLiAncGVyZm9ybWFuY2Vfc2NoZW1hX2V2ZW50c193YWl0c19oaXN0b3J5X2xv
bmdfc2l6ZV9iYXNpYy1tYXN0ZXIub3B0JwoK

--===============0470238289==
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:31:24 +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=


--===============0470238289==--