From: marko.makela
Date: October 19 2010 1:18pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3259 to 3260)
List-Archive: http://lists.mysql.com/commits/121145
Message-Id: <201010191318.o9JBQimW022085@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1117077731=="

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

IDMyNjAgTWFya28gTcOka2Vsw6QJMjAxMC0xMC0xOQogICAgICBpX3MuY2M6IFJlbW92ZSB0aGUg
bmFtZXMgb2YgdW51c2VkIGZ1bmN0aW9uIHBhcmFtZXRlcnMuCiAgICAgIAogICAgICBUaGlzIHNo
b3VsZCBzaWxlbmNlIHNvbWUgQysrIGNvbXBpbGVyIHdhcm5pbmdzLgoKICAgIG1vZGlmaWVkOgog
ICAgICBzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaV9zLmNjCiAzMjU5IFZhc2lsIERpbW92CTIw
MTAtMTAtMTkgW21lcmdlXQogICAgICBNZXJnZSBteXNxbC10cnVuay1idWdmaXhpbmcgLT4gbXlz
cWwtdHJ1bmstaW5ub2RiCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3QvZXh0cmEvcnBs
X3Rlc3RzL3JwbF9taXhpbmdfZW5naW5lcy5pbmMKICAgICAgbXlzcWwtdGVzdC9leHRyYS9ycGxf
dGVzdHMvcnBsX21peGluZ19lbmdpbmVzLnRlc3QKICAgICAgbXlzcWwtdGVzdC9yL25vdF9wYXJ0
aXRpb24ucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9wYXJ0aXRpb25fZXhjaGFuZ2UucmVzdWx0
CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvYmlubG9nL3IvYmlubG9nX3Jvd19taXhfaW5ub2RiX215
aXNhbS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9iaW5sb2cvci9iaW5sb2dfc3RtX21p
eF9pbm5vZGJfbXlpc2FtLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3JwbC9yL3JwbF9p
bm5vZGJfbWl4ZWRfZG1sLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3JwbC9yL3JwbF9t
aXhlZF9taXhpbmdfZW5naW5lcy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvci9y
cGxfbm9uX2RpcmVjdF9taXhlZF9taXhpbmdfZW5naW5lcy5yZXN1bHQKICAgICAgbXlzcWwtdGVz
dC9zdWl0ZS9ycGwvci9ycGxfbm9uX2RpcmVjdF9yb3dfbWl4aW5nX2VuZ2luZXMucmVzdWx0CiAg
ICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3IvcnBsX25vbl9kaXJlY3Rfc3RtX21peGluZ19lbmdp
bmVzLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3JwbC9yL3JwbF9yb3dfbWl4aW5nX2Vu
Z2luZXMucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3IvcnBsX3N0bV9taXhpbmdf
ZW5naW5lcy5yZXN1bHQKICAgICAgc3FsL2JpbmxvZy5jYwogICAgICBzcWwvc2hhcmUvZXJybXNn
LXV0ZjgudHh0Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaV9z
LmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaV9zLmNjCXJldmlkOnZhc2lsLmRp
bW92QG9yYWNsZS5jb20tMjAxMDEwMTkxMjAwMzMtM2Z1MmlnNHludmhnaWpuZworKysgYi9zdG9y
YWdlL2lubm9iYXNlL2hhbmRsZXIvaV9zLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTAxMDE5MTMxNDU2LTdkdWRucHd5ZzEwZXFxeGkKQEAgLTEyNSw3ICsxMjUsNyBAQCB0cnhf
aV9zX2NvbW1vbl9maWxsX3RhYmxlKAogLyo9PT09PT09PT09PT09PT09PT09PT09Ki8KIAlUSEQq
CQl0aGQsCS8qITwgaW46IHRocmVhZCAqLwogCVRBQkxFX0xJU1QqCXRhYmxlcywJLyohPCBpbi9v
dXQ6IHRhYmxlcyB0byBmaWxsICovCi0JQ09ORCoJCWNvbmQpOwkvKiE8IGluOiBjb25kaXRpb24g
KG5vdCB1c2VkKSAqLworCUNPTkQqCQkpOwkvKiE8IGluOiBjb25kaXRpb24gKG5vdCB1c2VkKSAq
LwogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKi8vKioKIFVuYmluZCBhIGR5bmFtaWMgSU5GT1JNQVRJT05fU0NIRU1B
IHRhYmxlLgpAQCAtMTExMCw3ICsxMTEwLDcgQEAgdHJ4X2lfc19jb21tb25fZmlsbF90YWJsZSgK
IC8qPT09PT09PT09PT09PT09PT09PT09PSovCiAJVEhEKgkJdGhkLAkvKiE8IGluOiB0aHJlYWQg
Ki8KIAlUQUJMRV9MSVNUKgl0YWJsZXMsCS8qITwgaW4vb3V0OiB0YWJsZXMgdG8gZmlsbCAqLwot
CUNPTkQqCQljb25kKQkvKiE8IGluOiBjb25kaXRpb24gKG5vdCB1c2VkKSAqLworCUNPTkQqCQkp
CS8qITwgaW46IGNvbmRpdGlvbiAobm90IHVzZWQpICovCiB7CiAJY29uc3QgY2hhcioJCXRhYmxl
X25hbWU7CiAJaW50CQkJcmV0OwpAQCAtMTI3MCw3ICsxMjcwLDcgQEAgaV9zX2NtcF9maWxsX2xv
dygKIC8qPT09PT09PT09PT09PSovCiAJVEhEKgkJdGhkLAkvKiE8IGluOiB0aHJlYWQgKi8KIAlU
QUJMRV9MSVNUKgl0YWJsZXMsCS8qITwgaW4vb3V0OiB0YWJsZXMgdG8gZmlsbCAqLwotCUNPTkQq
CQljb25kLAkvKiE8IGluOiBjb25kaXRpb24gKGlnbm9yZWQpICovCisJQ09ORCoJCSwJLyohPCBp
bjogY29uZGl0aW9uIChpZ25vcmVkKSAqLwogCWlib29sCQlyZXNldCkJLyohPCBpbjogVFJVRT1y
ZXNldCBjdW11bGF0ZWQgY291bnRzICovCiB7CiAJVEFCTEUqCXRhYmxlCT0gKFRBQkxFICopIHRh
Ymxlcy0+dGFibGU7CkBAIC0xNTQ2LDcgKzE1NDYsNyBAQCBpX3NfY21wbWVtX2ZpbGxfbG93KAog
Lyo9PT09PT09PT09PT09PT09Ki8KIAlUSEQqCQl0aGQsCS8qITwgaW46IHRocmVhZCAqLwogCVRB
QkxFX0xJU1QqCXRhYmxlcywJLyohPCBpbi9vdXQ6IHRhYmxlcyB0byBmaWxsICovCi0JQ09ORCoJ
CWNvbmQsCS8qITwgaW46IGNvbmRpdGlvbiAoaWdub3JlZCkgKi8KKwlDT05EKgkJLAkvKiE8IGlu
OiBjb25kaXRpb24gKGlnbm9yZWQpICovCiAJaWJvb2wJCXJlc2V0KQkvKiE8IGluOiBUUlVFPXJl
c2V0IGN1bXVsYXRlZCBjb3VudHMgKi8KIHsKIAlpbnQJCXN0YXR1cyA9IDA7CkBAIC0yMTE4LDkg
KzIxMTgsOSBAQCBzdGF0aWMKIGludAogaV9zX21ldHJpY3NfZmlsbF90YWJsZSgKIC8qPT09PT09
PT09PT09PT09PT09PSovCi0JVEhEKgkJdGhkLCAgICAvKiE8IGluOiB0aHJlYWQgKi8KLQlUQUJM
RV9MSVNUKgl0YWJsZXMsIC8qITwgaW4vb3V0OiB0YWJsZXMgdG8gZmlsbCAqLwotCUNPTkQqCQlj
b25kKSAgIC8qITwgaW46IGNvbmRpdGlvbiAobm90IHVzZWQpICovCisJVEhEKgkJdGhkLAkvKiE8
IGluOiB0aHJlYWQgKi8KKwlUQUJMRV9MSVNUKgl0YWJsZXMsCS8qITwgaW4vb3V0OiB0YWJsZXMg
dG8gZmlsbCAqLworCUNPTkQqCQkpCS8qITwgaW46IGNvbmRpdGlvbiAobm90IHVzZWQpICovCiB7
CiAJREJVR19FTlRFUigiaV9zX21ldHJpY3NfZmlsbF90YWJsZSIpOwogCgo=

--===============1117077731==
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:18:27 +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==


--===============1117077731==--