From: marko.makela
Date: October 27 2010 6:40am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3289)
List-Archive: http://lists.mysql.com/commits/122006
Message-Id: <201010270641.o9R6LeLm005887@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0891180842=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpzdW5ueS5iYWluc0BvcmFjbGUuY29tLTIwMTAxMDI3MDYzNTEwLWJhNTJl
Z3ZwMXgzbXRrYzMKCiAzMjg5IE1hcmtvIE3DpGtlbMOkCTIwMTAtMTAtMjcKICAgICAgUmVtb3Zl
IGEgcmVmZXJlbmNlIHRvIHV0MGF1eGNvbmYuaCwKICAgICAgd2hpY2ggd2FzIG5lZWRlZCB3aGVu
IHRoZSBJbm5vREIgUGx1Z2luIDEuMCB3YXMgZGlzdHJpYnV0ZWQKICAgICAgc2VwYXJhdGVseSBm
cm9tIE15U1FMIDUuMS4gU29tZWhvdywgdGhpcyByZWZlcmVuY2Ugd2FzIG5vdCByZW1vdmVkCiAg
ICAgIHdoZW4gdGhlIGNvcnJlc3BvbmRpbmcgY2hhbmdlIHdhcyBtZXJnZWQgZnJvbSBteXNxbC01
LjUtaW5ub2RiCiAgICAgIHJldmlzaW9uLWlkOiBtYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEw
MDkwOTExMjc1Mi1hYzV3N3p5emJ2MTBudmkxCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2Uv
aW5ub2Jhc2UvaW5jbHVkZS91bml2LmkKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh
c2UvaW5jbHVkZS91bml2LmknCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmkJ
cmV2aWQ6c3VubnkuYmFpbnNAb3JhY2xlLmNvbS0yMDEwMTAyNzA2MzUxMC1iYTUyZWd2cDF4M210
a2MzCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmkJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMDEwMjcwNjQwNDcteWU5MzQ3OXl3MHB3NXlmZQpAQCAtNzgsMTkg
Kzc4LDYgQEAgdGhlIHZpcnR1YWwgbWV0aG9kIHRhYmxlICh2dGFibGUpIGluIEdDQwogIyBkZWZp
bmUgaGFfaW5ub2Jhc2UgaGFfaW5ub2RiCiAjZW5kaWYgLyogTVlTUUxfRFlOQU1JQ19QTFVHSU4g
Ki8KIAotLyogaWYgYW55IG9mIHRoZSBmb2xsb3dpbmcgbWFjcm9zIGlzIGRlZmluZWQgYXQgdGhp
cyBwb2ludCB0aGlzIG1lYW5zCi10aGF0IHRoZSBjb2RlIGZyb20gdGhlICJyaWdodCIgcGx1Zy5p
biB3YXMgZXhlY3V0ZWQgYW5kIHdlIGRvIG5vdAotbmVlZCB0byBpbmNsdWRlIHV0MGF1eGNvbmYu
aCB3aGljaCB3b3VsZCBlaXRoZXIgZGVmaW5lIHRoZSBzYW1lIG1hY3Jvcwotb3Igd2lsbCBiZSBl
bXB0eSAqLwotI2lmICFkZWZpbmVkKEhBVkVfSUJfR0NDX0FUT01JQ19CVUlMVElOUykgXAotICYm
ICFkZWZpbmVkKEhBVkVfSUJfQVRPTUlDX1BUSFJFQURfVF9HQ0MpIFwKLSAmJiAhZGVmaW5lZChI
QVZFX0lCX1NPTEFSSVNfQVRPTUlDUykgXAotICYmICFkZWZpbmVkKEhBVkVfSUJfQVRPTUlDX1BU
SFJFQURfVF9TT0xBUklTKSBcCi0gJiYgIWRlZmluZWQoU0laRU9GX1BUSFJFQURfVCkgXAotICYm
ICFkZWZpbmVkKEhBVkVfSUJfUEFVU0VfSU5TVFJVQ1RJT04pCi0jIGluY2x1ZGUgInV0MGF1eGNv
bmYuaCIKLSNlbmRpZgotCiAjaWYgKGRlZmluZWQoV0lOMzIpIHx8IGRlZmluZWQoX1dJTjMyKSB8
fCBkZWZpbmVkKFdJTjY0KSB8fCBkZWZpbmVkKF9XSU42NCkpICYmICFkZWZpbmVkKE1ZU1FMX1NF
UlZFUikgJiYgIWRlZmluZWQoX19XSU5fXykKICMgdW5kZWYgX19XSU5fXwogIyBkZWZpbmUgX19X
SU5fXwoK

--===============0891180842==
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: 9b258ee3f3b66e4d94326990643cb9865cbfecd6
# timestamp: 2010-10-27 09:40:55 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: sunny.bains@stripped\
#   ba52egvp1x3mtkc3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdDGwNgAAaRflAAQUmf/91cm
eAC/7//wBAAIAFAD1O7ex573riN7dr3hJIiMRpT9TaeoNMk08TVM9KAPUPU9T1PUDJAh6JGwhUZB
pvSJ6T1DJ6jEABkk2KaIyZqZRgQAAAAADJEj0mTyjJoaA0NAAAAAElImjJ6mjCNGjao0wTJowgwA
m/Uc/gPnpagTHRTVALPZo1ndu5C0acooiDnkPN0HYt7UrjieeIdNl/CL6t1bp/SByjmg4/buj4PC
Btz0aXflp+G4fG1eKHMqU4vum7/pQSOcy6uXKdSqkhfxnrwFaRyvcPGMAtq+zaAD0jmLqPFEOFoC
olPTLJCwRlKEhR1AwCnMbkBVQuF7QoiAhg+CxfrMNAMdlhFqb2UqkWsI3nnw3kz6tO+KORWUZn5n
7rVedpds30VMLJ8izmZlpJro2NVF+bCkQvlLxBATx3biC2RMcq0r4T7WbEOZ5xDCu0XsqApnNlJv
D7XMg7tvhE/DOmlXAFxvQYyGGQFnB1h5JiLgLyz5S88ra1c3yG7gVjybALhdKBsFU9sjjRwAzcTh
hTUCNU42blbIYZolSoZratJNSBQ5sGDzfAGMSwXjKbL4nUbtTjZxduV8sMVF2RczNILr6AVNyWcG
iz5BwnISBitcSEjvymjp4NDFFGJQD4CFj6QlewRzxOEORS5ZszjJj0lRPF9yBET74vkRR14uXZ3w
fqy0sGjlERuDea1xVdR5nEDxnI7sdIKt7yPg1OA1zzwTOaLnCBqDG8WGSas0V5Xx5kxS+PUsVgn5
HWQ23BnXyXsOz2Ypq1iPJ1oTufAo8UPa6TEALTUA1+UNCMrdfARziXlLnAd1E9JrM1uow69YtKmM
tBt7k7F5pSAQOALE1Y/+t4gw6uFrxxYqgOEpQxe1ZYbCi9j027RyOV2AgmHmwe8AZJ/FoEAoUPCe
d9D3R11SRDIyJ0i8rL4RXlutVo9KD3j9hQdsLqGPVhnEyNWEq9MGqaoG3E3NOyuyzjD4ivMWNo9T
wmyVGjYnj6cO6uCiOU1rvthknR5aUS26VH7bXptKnA7QDWg1upBoNeBP2QTCKR1eBeLB9CTgKuBx
GYKZVbhdbRjGFYZR3F1ChiKIBokxiggKNdwP7EQOgvQZEMyZYRK3jWwD1QtYL8NIj44PjOwKUJlF
kepaZnZNjOerELhD2rZ9iXa/FTeAAxqlwYRS/qDw8ZuFyBI0TEbIsilCwGMzGxq8g0pXKREKRxpT
0IHAggF0pVaz6jcjnLMcELb6qNC9QIlEcXsMt6gW4idhpAQWXQFTmoGgRkaCuQGUHdCRaFviZYDF
XRpThUJoqdwslEtBjj3+S5H/i7kinChIaGNgbAA=


--===============0891180842==--