From: marko.makela
Date: February 10 2011 12:18pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3494)
List-Archive: http://lists.mysql.com/commits/131033
Message-Id: <201102101219.p1ABYkqG010221@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0307936144=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMjEwMTEzNTUxLTNvZ3dl
NjB6dzY0aWJobmMKCiAzNDk0IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDItMTAgW21lcmdlXQogICAg
ICBNZXJnZSBteXNxbC01LjUtaW5ub2RiIHRvIG15c3FsLXRydW5rLWlubm9kYi4KCiAgICBtb2Rp
ZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMHJlYS5jCj09PSBtb2RpZmllZCBm
aWxlICdzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwcmVhLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jh
c2UvYnVmL2J1ZjByZWEuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMjEwMTEz
NTUxLTNvZ3dlNjB6dzY0aWJobmMKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMHJlYS5j
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjEwMTIxNzIxLWdvOXI4OG0wMHp1
cDR1b3IKQEAgLTUzNSw3ICs1MzUsNyBAQCBidWZfcmVhZF9pYnVmX21lcmdlX3BhZ2VzKAogCQli
dWZfcG9vbF90KglidWZfcG9vbDsKIAkJdWxpbnQJCXppcF9zaXplID0gZmlsX3NwYWNlX2dldF96
aXBfc2l6ZShzcGFjZV9pZHNbaV0pOwogCi0JCWJ1Zl9wb29sID0gYnVmX3Bvb2xfZ2V0KHNwYWNl
X2lkc1tpXSwgc3BhY2VfdmVyc2lvbnNbaV0pOworCQlidWZfcG9vbCA9IGJ1Zl9wb29sX2dldChz
cGFjZV9pZHNbaV0sIHBhZ2Vfbm9zW2ldKTsKIAogCQl3aGlsZSAoYnVmX3Bvb2wtPm5fcGVuZF9y
ZWFkcwogCQkgICAgICAgPiBidWZfcG9vbC0+Y3Vycl9zaXplIC8gQlVGX1JFQURfQUhFQURfUEVO
RF9MSU1JVCkgewoK

--===============0307936144==
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: 49afd35962f23cc397483a1ce95bd96ec6568d27
# timestamp: 2011-02-10 14:19:10 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: vasil.dimov@stripped\
#   3ogwe60zw64ibhnc
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQFRzaoAAy3flAAwWmf//1MC
AIq////wBAAIAFAFreAAAGkEFAwkkQymU1NP1T9Mp6n5Uyn6Keph6jQAEaA5gAJgACYAAAAACVNJ
6oaDEBkDQADRo0AADmAAmAAJgAAAAAJJAQDQI0JiaETZJkHoj1NDIZtN2qRix49Haeg6S0IlJ11n
0S0slKc66qRz5vLIcLLQ+UBBERDlwYdlFnjsD84VWjziuNQ+nOEdzPQTH1+59B9Why8nDmC5g+mW
GofUzOtbzNA97kvHIUQ+z+Nv0+DSF7AK5cliLPwFWKAuRad9G8JCJbvY5lsL6ibewuYhSFTdzEGf
DjwNaWOc7CAmYGahgndnnhJzy0U3AJ4uYmEDgYSPfW4hHMjI0FqnvEcRydL5SuiWDCZD/0w4lRE+
YqdBf5nUpiqWmLA5hVLEUcPEoPgAMwqUEiB1Oge74FQJZnAgRIIDswsbR0y5t5R+CyGVY84i9TX7
GBMhpNvoLN4ojd2J22K5BeMLLi1e18NGqzOYCvLSstSIigJG1kHbnCkbh+ZO5S8toNhcKJoyWh6j
HqIw7tFpO+60fr0xGbVbnkUxtN7VjgqIkrBQK4bxPk2p7xGC6iKja8JreMtKONjG5k7TOEa32ksi
IQBwnEljQXXV9ji0duevv/ojsKm3UuuNUYrE6C7ZDCsXDVjIhqSzNij4C1EV7vrGiXMYycTFUo4D
1QnG+55csieOydYfdd+7lAXCzdvLUXCvG9OehRt+9eJMUBRLzlgw63DYRsKs642UkV0uEVtxzKwJ
1+5hGFd9sit8QCXQWLmIElKEzRb3ZCxwK6HQ0jqWZrUVuwqLRjUWNbjCObmc7CgNZsKU7BwXMVsV
jTKERrZk0tCATHCYqGiFaVVYxWKAvX1DevkcTYLhx+b2bofA4FBb+PoJhBfYMMhmb27PmIcqLzPA
swyKjEYDmwyn+cQgLO2AG4dqJxzJWnfad1+Agqd+LKzzPIQnVtabW5kkpkeIg1ncak0+Yj+yYg5C
YWj8NcJt/3wL8g4rnicNGmJfH7LE/QiY/41rM2gMFwu5duhfzVDU/IW8WUxVSFu+WthnBhhCoIVZ
+BHCxMZ9jjhYZXIfIWI8iK/EyIW+gcj4izIp4mz3BeLiUec9mBLjho8rKGqwplUYw4KGPSIw6jnM
CSpGdabdCDqFbkOz3QhXto4T3mPI4wH5FGm0wrcW3fA8PAQcbEQ7BMLXRCUtRwnVuObcUA6sRYBE
VBkWXOBwmFgPnRq/Op7yyo33VhWSphNJ1QUNC0I/s6DM2MswpffEQzf2azFmuQ602sCyrJPEW4I7
lxPwU3LF0yg9JiZyCwW8TweLUp4AYVB9tiJAsA8QO8cefxEd/DNJi4RwEH+mqXpvBHM+Z2FzAoBQ
cB8pOEES8QmB12h4FKyJUApdhQj+SiUEH1P3G4oYcM7kaIdaauMQ4lg4USAdB5ACDnmqePAgM2dB
knhiFdwh7JMLLYZMINt4ohbsWlSBKsDeU+iZUR/QhXpOwRF4rbN4Ehdd5psOGFEJEINXORrsI/Sw
rOEXJg8v3E9AHXzPQWEKhFx5GIWqUQRJGn4hmSIxSYTnchD/R+REvt+eHgyZrjsIoLqA8tVzDN8f
7LwrA49lZDoOGP6DM8RDjdcaB5lRv8jAI2JWpPFunKAtTARpw7kB7eROpLiLcLDuyFiKYrwKTXvV
W9RE5Wi9xPNXKRExrA/BEcT+LuSKcKEgAqObVA==


--===============0307936144==--