From: marko.makela
Date: October 20 2010 10:34am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3263) Bug#57232
List-Archive: http://lists.mysql.com/commits/121290
X-Bug: 57232
Message-Id: <201010201034.o9K7XA4V010042@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0457810912=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpzdW5ueS5iYWluc0BvcmFjbGUuY29tLTIwMTAxMDIwMDg1NDQ0LWRyaXpp
MTlqeGVlMmtka3AKCiAzMjYzIE1hcmtvIE3DpGtlbMOkCTIwMTAtMTAtMjAKICAgICAgRml4IHR3
byBlcnJvcnMgaW50cm9kdWNlZCBpbiB0aGUgQnVnIzU3MjMyIGZpeCBieSBTdW5ueSBCYWlucwog
ICAgICByZXZubzogMzI2MgogICAgICByZXZpc2lvbi1pZDogc3VubnkuYmFpbnNAb3JhY2xlLmNv
bS0yMDEwMTAyMDA4NTQ0NC1kcml6aTE5anhlZTJrZGtwCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0
b3JhZ2UvaW5ub2Jhc2UvbG9jay9sb2NrMGxvY2suYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jv
dy9yb3cwbXlzcWwuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xv
Y2swbG9jay5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMJcmV2aWQ6
c3VubnkuYmFpbnNAb3JhY2xlLmNvbS0yMDEwMTAyMDA4NTQ0NC1kcml6aTE5anhlZTJrZGtwCisr
KyBiL3N0b3JhZ2UvaW5ub2Jhc2UvbG9jay9sb2NrMGxvY2suYwlyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDEwMTAyMDEwMzQzNS1zdHp3bzY2Zzc2dTF6cWZ6CkBAIC01ODIyLDYgKzU4
MjIsNiBAQCBsb2NrX3RhYmxlX2hhc19sb2NrcygKIAkJfQogCX0KIAotCXJldHVybihsb2NrKTsK
KwlyZXR1cm4oTlVMTCk7CiB9CiAjZW5kaWYgLyogVU5JVl9ERUJVRyAqLwoKPT09IG1vZGlmaWVk
IGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBteXNxbC5jJwotLS0gYS9zdG9yYWdlL2lu
bm9iYXNlL3Jvdy9yb3cwbXlzcWwuYwlyZXZpZDpzdW5ueS5iYWluc0BvcmFjbGUuY29tLTIwMTAx
MDIwMDg1NDQ0LWRyaXppMTlqeGVlMmtka3AKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MG15c3FsLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEwMjAxMDM0MzUtc3R6
d282Nmc3NnUxenFmegpAQCAtMjU5MCw2ICsyNTkwLDcgQEAgcm93X2ltcG9ydF90YWJsZXNwYWNl
X2Zvcl9teXNxbCgKIAkJZXJyID0gREJfRVJST1I7CiAKIAkJcm93X215c3FsX2xvY2tfZGF0YV9k
aWN0aW9uYXJ5KHRyeCk7CisJCXRhYmxlID0gTlVMTDsKIAogCQlnb3RvIGZ1bmN0X2V4aXQ7CiAJ
fQoK

--===============0457810912==
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: db92dc7ce7a9f6bf4a566385c9dd977106bf0303
# timestamp: 2010-10-20 13:34:44 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: sunny.bains@stripped\
#   drizi19jxee2kdkp
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcDkBWIAAkVflAAwWmP//1MH
CgC////wBAAIAFAEPuq6AG5oPc4BJSEwk9HpNT01P1NRsieaiNMgAaDQMlTIb1I2oNMQ0AAMEAAA
SKmJDU2o9J5JowCaAA0Gj1NDQMpAjanohpk0000aBoPQgAABJIjIxDQKZJ+kJ6oGyhmo9I9Q02kM
NQx27eQx6ex4mtwbGb6AnredLOVrm5f1LQoTGZtr32ItjPfvECjPKEXMOZ7/Pe8OuG+ESj4l6ldZ
9tGTBrPM2D7Tz4Nv41AewvWAESfXy8/UX0Epi94pC1CumfVbk0gWMmFuwDb0JLSg5Csv3JHlRJI5
s7qlmwlYJMB7hOSRxZubjhZ7wvFN49kyQKG2pQXzfLA8hDERcSgnGgJGhYhnaqscfp1HAVazLDb/
Ab0VP9lSt+fzE4mfv8OZHI2FhcVGExqbFrz2A7crjhurq2chcCTAZEOizle9hh5cr3jFYCcaPRv8
2Gb0EUyDi9hUMMTo87C6tpsaATAm8CFshdg0LGFrmtGiWGTweSnqA0BXmQo9GL09Ge4ud5lfRmoA
0cIGVTHRpWC4Rs80xp6ZFBTTlxpIyLhNZbsaK+Z8CyRn+AD9RYW6OCwT8AMUDnNQVLYYGpEXkBhQ
kUuC9WF5s+Apy7BaqxMYaQSv7TUwnjE456xgZc3aCkVI7jsRV2q8svKmFxPYkUiLsdLHULWZo1ua
3Cb1BwNFrVchkRuaovLz81yPz7ioYDvEe7t6n6VF8he5BSLMm3f2uGa4IqNxCW1n0cd1vA0U7Igx
ZTEWE5hE2l2pBq8Z+HaksbYEYPF0oN9RNHlxpcZAU2vaLOoOcvfWRONwoNhGKyaqi62YvSYDRaVI
NHy7RQmYtFp3iyF8Tjpn5IHOSVUlh4GnhIxLtDOgWxB3IbIKkbuFkHZrBWrwFGKaUvwYkEe/ROJk
KedZFQPZBKSohJrhx6CsnrYy5zcjmRe0BWI2rkmBplquwy2OJQI0QSieUjbM9QsTlcTriayhOYXn
IDY8B4rhwq5MaOqGwTNBkwP1DIrFUKAzFqOaNqXDFU2OgVwrZ/yI2Ui0irKkwYmJWioQfVaJBFYZ
TIAohTBBnmCiSgC1emumcoC0p2ElZA5BsoGPJWqSHCY70YqlSJ5Cyk8UQeeoUzSzZIJVCYwamSza
LWgYELEDpMQBcFzwLUlrRQodkFU8W+u7DA5ZCtjpbMDuW+qiCO56X1j3mCaPXqKIi9UzLcc/ejwl
czREy5wYT87cjoxM5iYgGX0USCIgMGjGc2Y+IbYOnEOjRrWRciSHCe4K4XQA8QKnp0vF7QSympJY
CfwBgfYVqIdJDhN3qiWlw5ko/ICYH/G/r/4u5IpwoSGByArE


--===============0457810912==--