From: marko.makela
Date: October 19 2010 1:14pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3260)
List-Archive: http://lists.mysql.com/commits/121143
Message-Id: <201010191315.o9JCaVxg011278@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0133957430=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAxMDE5MTIwMDMzLTNmdTJp
ZzR5bnZoZ2lqbmcKCiAzMjYwIE1hcmtvIE3DpGtlbMOkCTIwMTAtMTAtMTkKICAgICAgaV9zLmNj
OiBSZW1vdmUgdGhlIG5hbWVzIG9mIHVudXNlZCBmdW5jdGlvbiBwYXJhbWV0ZXJzLgogICAgICAK
ICAgICAgVGhpcyBzaG91bGQgc2lsZW5jZSBzb21lIEMrKyBjb21waWxlciB3YXJuaW5ncy4KCiAg
ICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2lfcy5jYwo9PT0gbW9k
aWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2lfcy5jYycKLS0tIGEvc3RvcmFn
ZS9pbm5vYmFzZS9oYW5kbGVyL2lfcy5jYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIw
MTAxMDE5MTIwMDMzLTNmdTJpZzR5bnZoZ2lqbmcKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9oYW5k
bGVyL2lfcy5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAxOTEzMTQ1Ni03
ZHVkbnB3eWcxMGVxcXhpCkBAIC0xMjUsNyArMTI1LDcgQEAgdHJ4X2lfc19jb21tb25fZmlsbF90
YWJsZSgKIC8qPT09PT09PT09PT09PT09PT09PT09PSovCiAJVEhEKgkJdGhkLAkvKiE8IGluOiB0
aHJlYWQgKi8KIAlUQUJMRV9MSVNUKgl0YWJsZXMsCS8qITwgaW4vb3V0OiB0YWJsZXMgdG8gZmls
bCAqLwotCUNPTkQqCQljb25kKTsJLyohPCBpbjogY29uZGl0aW9uIChub3QgdXNlZCkgKi8KKwlD
T05EKgkJKTsJLyohPCBpbjogY29uZGl0aW9uIChub3QgdXNlZCkgKi8KIAogLyoqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiov
LyoqCiBVbmJpbmQgYSBkeW5hbWljIElORk9STUFUSU9OX1NDSEVNQSB0YWJsZS4KQEAgLTExMTAs
NyArMTExMCw3IEBAIHRyeF9pX3NfY29tbW9uX2ZpbGxfdGFibGUoCiAvKj09PT09PT09PT09PT09
PT09PT09PT0qLwogCVRIRCoJCXRoZCwJLyohPCBpbjogdGhyZWFkICovCiAJVEFCTEVfTElTVCoJ
dGFibGVzLAkvKiE8IGluL291dDogdGFibGVzIHRvIGZpbGwgKi8KLQlDT05EKgkJY29uZCkJLyoh
PCBpbjogY29uZGl0aW9uIChub3QgdXNlZCkgKi8KKwlDT05EKgkJKQkvKiE8IGluOiBjb25kaXRp
b24gKG5vdCB1c2VkKSAqLwogewogCWNvbnN0IGNoYXIqCQl0YWJsZV9uYW1lOwogCWludAkJCXJl
dDsKQEAgLTEyNzAsNyArMTI3MCw3IEBAIGlfc19jbXBfZmlsbF9sb3coCiAvKj09PT09PT09PT09
PT0qLwogCVRIRCoJCXRoZCwJLyohPCBpbjogdGhyZWFkICovCiAJVEFCTEVfTElTVCoJdGFibGVz
LAkvKiE8IGluL291dDogdGFibGVzIHRvIGZpbGwgKi8KLQlDT05EKgkJY29uZCwJLyohPCBpbjog
Y29uZGl0aW9uIChpZ25vcmVkKSAqLworCUNPTkQqCQksCS8qITwgaW46IGNvbmRpdGlvbiAoaWdu
b3JlZCkgKi8KIAlpYm9vbAkJcmVzZXQpCS8qITwgaW46IFRSVUU9cmVzZXQgY3VtdWxhdGVkIGNv
dW50cyAqLwogewogCVRBQkxFKgl0YWJsZQk9IChUQUJMRSAqKSB0YWJsZXMtPnRhYmxlOwpAQCAt
MTU0Niw3ICsxNTQ2LDcgQEAgaV9zX2NtcG1lbV9maWxsX2xvdygKIC8qPT09PT09PT09PT09PT09
PSovCiAJVEhEKgkJdGhkLAkvKiE8IGluOiB0aHJlYWQgKi8KIAlUQUJMRV9MSVNUKgl0YWJsZXMs
CS8qITwgaW4vb3V0OiB0YWJsZXMgdG8gZmlsbCAqLwotCUNPTkQqCQljb25kLAkvKiE8IGluOiBj
b25kaXRpb24gKGlnbm9yZWQpICovCisJQ09ORCoJCSwJLyohPCBpbjogY29uZGl0aW9uIChpZ25v
cmVkKSAqLwogCWlib29sCQlyZXNldCkJLyohPCBpbjogVFJVRT1yZXNldCBjdW11bGF0ZWQgY291
bnRzICovCiB7CiAJaW50CQlzdGF0dXMgPSAwOwpAQCAtMjExOCw5ICsyMTE4LDkgQEAgc3RhdGlj
CiBpbnQKIGlfc19tZXRyaWNzX2ZpbGxfdGFibGUoCiAvKj09PT09PT09PT09PT09PT09PT0qLwot
CVRIRCoJCXRoZCwgICAgLyohPCBpbjogdGhyZWFkICovCi0JVEFCTEVfTElTVCoJdGFibGVzLCAv
KiE8IGluL291dDogdGFibGVzIHRvIGZpbGwgKi8KLQlDT05EKgkJY29uZCkgICAvKiE8IGluOiBj
b25kaXRpb24gKG5vdCB1c2VkKSAqLworCVRIRCoJCXRoZCwJLyohPCBpbjogdGhyZWFkICovCisJ
VEFCTEVfTElTVCoJdGFibGVzLAkvKiE8IGluL291dDogdGFibGVzIHRvIGZpbGwgKi8KKwlDT05E
KgkJKQkvKiE8IGluOiBjb25kaXRpb24gKG5vdCB1c2VkKSAqLwogewogCURCVUdfRU5URVIoImlf
c19tZXRyaWNzX2ZpbGxfdGFibGUiKTsKIAoK

--===============0133957430==
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: 727bd68032e4971afab578c9c9aa6e199b371c25
# timestamp: 2010-10-19 16:15:03 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: vasil.dimov@stripped\
#   3fu2ig4ynvhgijng
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWf5CrN0AAfJflAAwcn///39n
nAC////wBAAIAFAEGQbQec6GZbdwkkImFPQGRppPUzRNqnomjEZAND0RiBlATCaYhJP0mgaRtT1A
YDQjBMJowxQ0iNDampphPaUZI0YAGgGiNA0w5gTE0GEyZMmRhME00yMTAEMAkpBT9NJiZQ9Q/RT0
hiBhANAANNApBRF83tCcxLNKtFWSfOBC2dXeNvNQLa7ayDoi+dr2pnQ9tgZHz7aiLZVoJERkD7Qv
LKglYsb3KSohGEUUfr9Kt21kPf4emYvSzR+XlTBPjimgOdDwqUm1K2sfTXT0g5gy+JGch7BbyTKh
3YL73pRpWdsuAkpXiIu1r9K4T1iVtkOOyjTC94a0i8HbktiWZLm0YeSV00BG9uCyWuEQEXJobRhw
joMyc9NnsnwKDDKoI8D0pTUdqg7CFDFDK+IRewjLTvsJn8RSmEhFIqVQNIiumMoBwMG/w7BpB13Q
kbAOk8l2vNuNBFBcg1GHEMswx3AQ6sZlcwzyv5RcxoRmcbgLNZNNg/hpjSmciBUDiRWbzStS7cjf
GBapS98LUL0HdniEqBz0CnrqjIMAsDJGc8g7ReLxvF9+LL56oDeAiJWA0FQ/KCcDRN1tiBMvSFA5
mJA0YB4mNqORz4YGRi2AT8CoJnataji95ZkDbbR4jJBwzFxUVLamVyw581yZdJTMbaC1pcCHxLBW
+yokH6SPmh77CI4jDC5DROig5JQ5EY4GyMdEHRoS6iq/WWTsqhfhyzFOoLUueWhiYd/hTmR7I82+
syUsHBp45fhGhEHvpoKqaLbIA7s3SEZAGM3lr4W9CXrId3akUcPc7FAOdLHkHyssi3Ti8pEvS8HL
ZmWcznDZ1lXv0qzGOjU3KAyKxjrTS9idg1L4KdPOh+O3XRF9yEnIkUEiXAC0JDUiLsA6smrRTixV
GJW087Xl3KeUsVxSEwGcU0uoXNVTi1vBd5qG9NNN8z7S90sgX0WHLiaDMzrc9sjbK9FFzW8XH2A8
8uMsTLkE8K689Lc2mOsbI9TBGnWzKyy3ViB9TlEonznHdzljG+NM7wFgW+MYGpTx2HQ2gPNVE8DS
u+OLq9TIky1wJjqn5SjLoTHSbpkX4cipC5MxQNGhaBwhsUT3sFUbhTA8teE6MUeO5XX2YEtTwsAa
0LgcEMCRnickMBgPGKn2Rpp+5I5Cdg1BZs8jHAIYHLJBwF+DCAMEUShMMxwsAxDynf8qd+L82kXH
bBqIZGLj9jp06UlLepsSLWDhDEb8Z8pDgkJVhhUK2cNj0TDKB7MnEbS5YSi6aRdgtTguZTJJ71he
PRJdQYNsQESsb8TBoIukgMkQJxztYBhuQow4QFUA+8ZwvCgiyRxipOoWbLlRgwfJqQ6FbRMjdbaB
IBjUlug0JekjkkbAo0SAyEU4RPrE8UScuUWdU3yzIN/ivt/xdyRThQkP5CrN0A==


--===============0133957430==--