From: marko.makela
Date: June 8 2010 11:48am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3096 to 3097)
List-Archive: http://lists.mysql.com/commits/110476
Message-Id: <201006081148.o58Bm8d5010155@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0278216864=="

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

IDMwOTcgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0wOAogICAgICBNZXJnZSBhIGNoYW5nZSBmcm9t
IG15c3FsLTUuMS1pbm5vZGI6CiAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICByZXZubzogMzUwMgogICAgICByZXZp
c2lvbi1pZDogbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MDgxMTQwNTUtN2IwNHl0dXF6
MGxkZTZ2MQogICAgICBwYXJlbnQ6IGppbW15LnlhbmdAb3JhY2xlLmNvbS0yMDEwMDYwMzEzNDQ0
OC1pdHpkdWh3Z2J3MGI4bmxoCiAgICAgIGNvbW1pdHRlcjogTWFya28gTcOka2Vsw6QgPG1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tPgogICAgICBicmFuY2ggbmljazogNS4xLWlubm9kYgogICAgICB0
aW1lc3RhbXA6IFR1ZSAyMDEwLTA2LTA4IDE0OjQwOjU1ICswMzAwCiAgICAgIG1lc3NhZ2U6CiAg
ICAgICAgYnVmX3BhZ2VfZ2V0X2dlbigpOiBQYXNzIGZpbGUsbGluZSB0byByd19sb2NrX3hfbG9j
aygpLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwYnVmLmMK
IDMwOTYgVmFzaWwgRGltb3YJMjAxMC0wNi0wNCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3FsLXRy
dW5rLWJ1Z2ZpeGluZyAtPiBteXNxbC10cnVuay1pbm5vZGIKCiAgICBtb2RpZmllZDoKICAgICAg
bXlzcWwtdGVzdC9pbmNsdWRlL25vdF92YXJfbGluay5pbmMKICAgICAgbXlzcWwtdGVzdC9zdWl0
ZS9iaW5sb2cvdC9kaXNhYmxlZC5kZWYKICAgICAgcGx1Z2luL3NlbWlzeW5jL3NlbWlzeW5jX21h
c3Rlci5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1Zi5j
JwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwYnVmLmMJcmV2aWQ6dmFzaWwuZGltb3ZA
b3JhY2xlLmNvbS0yMDEwMDYwNDE2MjI1My1rbjFlcnVmZmxrcWhzYm1lCisrKyBiL3N0b3JhZ2Uv
aW5ub2Jhc2UvYnVmL2J1ZjBidWYuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEw
MDYwODExNDczNC16cjcwa3hlMjZ6dGd3YmF0CkBAIC0yOTU3LDcgKzI5NTcsNyBAQCB3YWl0X3Vu
dGlsX3VuZml4ZWQ6CiAKIAkJYmxvY2stPnBhZ2UuYnVmX2ZpeF9jb3VudCA9IDE7CiAJCWJ1Zl9i
bG9ja19zZXRfaW9fZml4KGJsb2NrLCBCVUZfSU9fUkVBRCk7Ci0JCXJ3X2xvY2tfeF9sb2NrKCZi
bG9jay0+bG9jayk7CisJCXJ3X2xvY2tfeF9sb2NrX2Z1bmMoJmJsb2NrLT5sb2NrLCAwLCBmaWxl
LCBsaW5lKTsKIAogCQlVTklWX01FTV9JTlZBTElEKGJwYWdlLCBzaXplb2YgKmJwYWdlKTsKIAoK

--===============0278216864==
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.5-innodb/
# testament_sha1: 3bad85787babfcb45295c450906b33f7ada8f9c5
# timestamp: 2010-06-08 14:48:33 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   kn1erufflkqhsbme
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWerR1qkAAcHflAAwU2///1MC
RAC////wBAAIAFAD54HK7HSgAGmoFPSm2qGxE81TygwGmp6mhiZNNARJkJmhNNoyAQA0wBNMjQAZ
JU95T01BqnqP1T1A0AAAAAAcwAEwABMAAAAABJIIABMmgaJqY1Mm1T0TyTJmmUE9eTvqPxq4iNVY
kFUzZIAXkB0LF2VqrcuDrXNZjxPJIju2pQ1+G9aDGGKH6F9wIbG+Xkzd+K93uPzPH6UkCHxyH3wy
4dQcwXqJ0lfu17YlT40vOHgPspWoFxX55S4KmxWmHElh3LZz06pSGDXrESuXfvQYz253vmpgtd7n
M5sGZsHAn3oW1PugXyeXlRKMttWU62vSK5B8rkmkQy5/yxTQlXgL46alR7uV520IXfYePPsHvxSc
+RSNn8t+b6cb16Dhe19Vm2rFPY9U7HTxpK2UcuavxVLFu8E3vVcn5BLyMxWUR0UqviGz1b0RLPTJ
PWqWqdnwIikwKMJ5mbRBmucAq2hBqILiwli2h8FBSwSKiRqozOIwi6djjZyekO2qb9tIYaRtturI
1trF0iN++b2hASjJSQWDOx7VPAaytb4KagV2OYnKvMU8lycVXZXoEOFGMB9ZBGurqz1OCiyQUyJq
z5TqKX5OivTFCGCDYEkRMoiAV0gmTLlA6oOjXm2v9N0zzcIQCBtAzGOk/LLhAlcmmaJOE07TqCr+
hvLMbRquD+XZ4nK5cvbonIKbGZhvw6RFvMYOF8Wa5g+D6HP+/OUmJ+MAzDTTCzuQdOwf1idvcJRx
vIQDgg8pZ9RFed8ZhfonQaLnsCyhJu0TpM0atbKbAwYPAJELTtD208qkz5eaQQi3L8/OUGOWpdyl
oyVuSYNZy+1B8rdf1Txk4StEqrtfjtH53lFSkxJFK+EQqV55Kez5t9V3F6nn8Md07VjkBquCbWro
85qG4c+CvYVNlIFssrxdOrNIaRNBnkdHFQvRB2dq8ky15UHXt46lx1BTQKZP0VKZXsq591zuRFxr
USWsiv30O9pFscdKXO/kOup3RKBiL5di2g0/wrrVlMVFR4FSaGwqWCHr4gsLOQXllC/3XJCpG9HA
lfNRlemA1oPY1BMsUiZcBbN62BWEXIUYKkSYq9rLNqw3Xdve5WWHVCnY+aCn8H1G3bzNTVKFupbi
ocEhEhTCuRaLa4mjJqePFBnG6MV9IrTaqRPZMtlRzZBHMTLUbwCVHi8/QlME68XLDFYMYcNeb3KB
JNlDBdlUM8leJpxBpuPtIKm0tGmLopE6wrhdJFlFTe8FdBjzUlWLFFSzQ6ZdPzGYJUORvZme70Kh
oTFppmKF3CnJpaApB6i5XFjdLvjaIlT9g5UX/e1VqtOxFRMfYWzM4ikUTk3F3r37btZNoLAX/Boe
p/4u5IpwoSHVo61S


--===============0278216864==--