From: marko.makela
Date: May 18 2010 1:10pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3100)
List-Archive: http://lists.mysql.com/commits/108514
Message-Id: <201005181311.o4IDBpsl031245@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0564223937=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS41LWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUuY29tLTIwMTAwNTE3MDg1NzQyLWt4M25xeHJq
Ynl4azV0a2sKCiAzMTAwIE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMTgKICAgICAgTWVyZ2UgYSBj
aGFuZ2UgZnJvbSBteXNxbC01LjEtaW5ub2RiOgogICAgICAKICAgICAgICAtLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAgICBy
ZXZubzogMzQ2OAogICAgICAgIHJldmlzaW9uLWlkOiBtYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDEwMDUxODEzMDY1OC1yZDAwcWw3aDAyb29ha2gxCiAgICAgICAgcGFyZW50OiBtYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDEwMDUxNDEzMTA1MC1ta2hsdmx1aTF1NTJpcm9iCiAgICAgICAgY29t
bWl0dGVyOiBNYXJrbyBNw6RrZWzDpCA8bWFya28ubWFrZWxhQG9yYWNsZS5jb20+CiAgICAgICAg
YnJhbmNoIG5pY2s6IDUuMS1pbm5vZGIKICAgICAgICB0aW1lc3RhbXA6IFR1ZSAyMDEwLTA1LTE4
IDE2OjA2OjU4ICswMzAwCiAgICAgICAgbWVzc2FnZToKICAgICAgICAgIFdvcmsgYXJvdW5kIEJ1
ZyAjNTM3NTAgaW4gaW5ub2RiX2J1ZzQ4MDI0LnRlc3QKCiAgICBtb2RpZmllZDoKICAgICAgbXlz
cWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNDgwMjQudGVzdAo9PT0gbW9kaWZpZWQg
ZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNDgwMjQudGVzdCcKLS0t
IGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNDgwMjQudGVzdAlyZXZpZDpq
aW1teS55YW5nQG9yYWNsZS5jb20tMjAxMDA1MTcwODU3NDIta3gzbnF4cmpieXhrNXRraworKysg
Yi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc0ODAyNC50ZXN0CXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE4MTMxMDM2LWZkdTVxcG12Yzc1aXplcXMKQEAg
LTEwLDYgKzEwLDggQEAgQUREIENPTlNUUkFJTlQgRk9SRUlHTiBLRVkoYikgUkVGRVJFTkNFUwog
CiBEUk9QIFRBQkxFIGJ1ZzQ4MDI0LGJ1ZzQ4MDI0X2I7CiAKKyMgV29yayBhcm91bmQgQnVnICM1
Mzc1MCAoZmFpbHVyZSBpbiBteXNxbC10ZXN0LXJ1biAtLXBzLXByb3RvY29sKQorLS0gZGlzYWJs
ZV9wc19wcm90b2NvbAogZGVsaW1pdGVyIHw7CiBDUkVBVEUgVEFCTEUgYnVnNDgwMjQoYSBpbnQg
UFJJTUFSWSBLRVksYiBpbnQgTk9UIE5VTEwsS0VZKGIpKSBFTkdJTkU9SW5ub0RCOwogQ1JFQVRF
IFRBQkxFIGJ1ZzQ4MDI0X2IoYiBpbnQgUFJJTUFSWSBLRVkpIEVOR0lORT1Jbm5vREI7Cgo=

--===============0564223937==
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/mysql/5.5-innodb/
# testament_sha1: 209e9bee978499eb39df412373f51e42d2b453e0
# timestamp: 2010-05-18 16:10:47 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: jimmy.yang@stripped\
#   kx3nqxrjbyxk5tkk
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTPcQwMAAehfgEAQWWv//1IC
BIC////wUARYvbrB16A2rbd1wkoSNR+k9TTSNin5KPQj1PUHqAaAYaSnkjCabU09T1NDBB6IMjRk
GQMk0I1PImk2JpkTJkGg9I00aAEiiGUyT9U9QyaZBpoaHlAAACSRGiYEwhPFMaKbTUxkTRoabUkt
tdl+Ke3wLNE8sO+i6QWeuRcEM6PbgrQBfJk+EG9RcQPMUil9D+Vo8XoiBeI+WzoKYOxse/OqVYi4
NGqfkM3FKtzv19YWNLJmxEObYO9+j1ROaBiBEGui/Pr03rW3sROvITdj3JG3tCkwPUsHA7c26drR
j4SKg5QV/MUaNkQrzLMnlVGWqawqplJGorEs0ioNqtKNL4dUTGSYFGZmKurKzqeSU2oSWNAz+Sgv
7RYqgmIxgI73zFkaCghZxqYkfBpchUHjFWEJMCLKkiYuw7YcDSgx/KS6KTOEJgEhsDmmvRUpAh4O
TIJD0GYdLYygGUiJcRMJVEZkeYPKLQ1kJqjEHhoIjupLtDrHSAZSTj7hrAoJBNMH0pFCm2mWUI0q
A7hxS/oGD1GRkZeSnzOVWW5EkmV8vrORwM2cJVm/IzKWwgd60k0LyDE9ApxdVHkZ1peVSqwvf34u
4rSVlIw8pPrgbzQvd0qbbstOAojAoUxKY0UY7b4RF7r3A4eg1xKp1GhukJGM81t7jQOYfpvhol43
345a7NTKShtxW02rNYawkmYZhl1LGFyYtrjKn6Wc2k6MGPwY+r4OIPhHYGKaUNxjb+ecg1K+B174
SuT3mGVxh31Uc5EQaiXA1nJI7ZFEDDASc9ODw80jh63FpAuVhvxpS9ydI1jLxp3yEpuNg6IWZqIU
T7foOazD7EhQa+wqB57dSMxp6SmiIYSa86CUCQ399b1OOTpUpUqSaUuJtwoV93Bqph6Sh6TEjuQ8
1Giv7bh5og3GciBndxw17jkUmd1iExkmRpFCR05x8MAyLL1BDEcwh6ffbw9fQqLS+8bK4+eKWJcf
HHgYbnBplzFEqzY7ik37GNxquOee9+4GKorFurqKC+zmKBkatgXzLFWLSGl66fNmaUs7tiC6mKDc
TSFhEtUIjR1TOCcD6OEFdpDQpoWw0LDaP1OrgUKkjXuiTWNOjaV255/CCS4ZJFZ1RZvLkyxaiZ26
CkWwHKceYi2Tq0zymxgRMMhWVhW4omWyqSzdqXZ7LUitoajwQo57sx6TsRmAJEHl4xI/wlIHYnVj
1PAOOs1qMYqrMcgWbxRIRe8ZhIZ7NpMO4VwuipNpYOYXiDWZKZZJUzYu9qLtLMFcTQmuXTqszisJ
kmUYdBDkbOEVkLDpcgyBpARx3XB4IeRKdXMNvqOAfAisHjc5zmrWvNF28eu9PJgnFGyuHFR7dEu2
38jYBTqhQKG7t4PAVFvLAgMR215m6ypcY6ZixqsuNjjUm3WAPc/X8cRdyRThQkDPcQwM


--===============0564223937==--