From: marko.makela
Date: June 14 2010 6:50am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3100) Bug#38999
List-Archive: http://lists.mysql.com/commits/110965
X-Bug: 38999
Message-Id: <201006140650.o5E664Xo030831@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2105809815=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYxNDA2MzUwMS1rNTVr
MTE4OHdzb3Z4MzZyCgogMzEwMCBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTE0CiAgICAgIE1lcmdl
IGEgY2hhbmdlIGZyb20gbXlzcWwtNS4xLWlubm9kYjoKICAgICAgLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgIHJldm5vOiAz
NTA3CiAgICAgIHJldmlzaW9uLWlkOiBtYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYxMDEy
NTYyMy1hcjZxZjR3MnB2MmtyN21iCiAgICAgIHBhcmVudDogc2VyZ2V5LmdsdWtob3ZAc3VuLmNv
bS0yMDEwMDYwOTEyMTcxOC0wNG1wazVranh2bnJ4ZHU4CiAgICAgIGNvbW1pdHRlcjogTWFya28g
TcOka2Vsw6QgPG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tPgogICAgICBicmFuY2ggbmljazogNS4x
LWlubm9kYgogICAgICB0aW1lc3RhbXA6IFRodSAyMDEwLTA2LTEwIDE1OjU2OjIzICswMzAwCiAg
ICAgIG1lc3NhZ2U6CiAgICAgICAgQnVnICMzODk5OTogUmUtZW5hYmxlIGlubm9kYl9tdWx0aV91
cGRhdGUudGVzdAoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90
L2Rpc2FibGVkLmRlZgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIv
dC9kaXNhYmxlZC5kZWYnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvZGlzYWJsZWQu
ZGVmCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjE0MDYzNTAxLWs1NWsxMTg4
d3NvdngzNnIKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9kaXNhYmxlZC5kZWYJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MTQwNjUwMzAtdGViZWNuanYzMTZuOGw3
YgpAQCAtOSw0ICs5LDMgQEAKICMgIERvIG5vdCB1c2UgYW55IFRBQiBjaGFyYWN0ZXJzIGZvciB3
aGl0ZXNwYWNlLgogIwogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCi1pbm5vZGJfbXVsdGlfdXBkYXRl
OiBCdWcgIzM4OTk5IDIwMTAtMDUtMDUgbW1ha2VsYSBWYWxncmluZCB3YXJuaW5ncwoK

--===============2105809815==
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: 68599477bdb34718f557867d39a69963711f498f
# timestamp: 2010-06-14 09:50:37 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   k55k1188wsovx36r
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWrcmbAAAaXflAAQWGv/91IC
FAC////wBAAIAFAD2vZuMOHE9Oe94ZEp6NQ00xMk/UNENtKaeFDJoGmEokhqbNTZMJqnoJ6jQAAD
TQGRATEJsielI9TQbRqaHqAMhhklGjQbUMRppo9I9Q000NqABhJISemgp5TR6ZT0ZKfomSfqQDQb
UJ3HVfeLbXDTTWOBegGr1ixbS4ugx3hGOfdJETr4j8tgg6qrqAnYVMqCC+5Pf+XFG9KPj6U5EFc3
NZ9me4KgM43tv5j49TPGo2gq4e0sbsiW0+LK+zC0WpsHDSkwLiX8iCza73Ni4CiIMgVQbBgBipxo
VILTAMB6NDdavexjBwQgMIDYvaBqFcAhXuu5rEwyCsUs9Q0ruUgurR3Hx3DYzGSeIti1jUZJEbT4
MilIHmdAeOrXViWLSeEk31MG2vNJxw/CsxS5QRhJbictmbRBmBjGoO0jHo1P4sJUFaIqhnEhbFII
sJpe7ypBNurBvNuYIUUfQdUcqTYRU0DRuW2btlqWCVsW+W4JZ8k14VGQmum5GCWEVOGUarskO9SR
BCxAbXbpQ4CwyBnUy0dyeg0mGq0TmbqQiSWc/G8RRuecUuJOgeLMWY3gNBzBiedRMByUyzK+uIXF
MQ3gJKLun5+EHryvDv26U4dtskGaaSV1UhAiDA5SkEcIgQinxHaJ1wTG6Gn20N6F0iUszN7VPbMY
HU1uDHtrA9YvDwiMVnFCuIn98q6l6ZZoVVUw8LkKie0gWWHBulQv2UJLe3n3jnuC0lll5VZ3EjYT
idLmRD5GdDLA1OXBxQ3E5nnTrkZ8oOGQtovUStttgh2jriyW6pRTPDLcCnQZcg2eiRvdztRPxCDa
lu+qJlPB82Ji5WP2pKssQEdnKMRg8Qd8MpSZrp0jgaODNPklnyowJN2c4FDCR+kX1iHGsBuUFDWy
U1Y0Bmq8TVjaNA+7r9yCxEkw1NgCuFgvbAGln71l2KgUFRxOyabibk5eE4UbB7e93dNSWopWiMx/
WYV5X4mC7lufghfwj0NwT3pLL4YhaFrmAoAAy+sgqCivMt9GvjmQWoNhBmYhcHBFTjKtbIWd6zKi
YmPpjXHYbW6iY2zSNgQZ2cIF4pg00BpxPZTjl05JLWMBg8SQA9EOBA7IXoEl0U5dfgdxXfsVTdoh
ZZNdzvvO+CGy3ZQgDUQLgZZjMJA9jiTE1s3R7t0L7ngHe6mJrOBCRPT+H9yIiB6lv3vGL8Dyplwl
TTqedlcWZNoukGhmVJGUj5cWY8+Z6Zht7AzMLwdbDC4wtLhS4qoVL5dL9Y4R5/8CkdBYLuSKcKEg
1bkzYA==


--===============2105809815==--