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

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwNjA0MTYyMjUzLWtuMWVy
dWZmbGtxaHNibWUKCiAzMDk3IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDYtMDgKICAgICAgTWVyZ2Ug
YSBjaGFuZ2UgZnJvbSBteXNxbC01LjEtaW5ub2RiOgogICAgICAtLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAgcmV2bm86IDM1
MDIKICAgICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjA4MTE0
MDU1LTdiMDR5dHVxejBsZGU2djEKICAgICAgcGFyZW50OiBqaW1teS55YW5nQG9yYWNsZS5jb20t
MjAxMDA2MDMxMzQ0NDgtaXR6ZHVod2didzBiOG5saAogICAgICBjb21taXR0ZXI6IE1hcmtvIE3D
pGtlbMOkIDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgYnJhbmNoIG5pY2s6IDUuMS1p
bm5vZGIKICAgICAgdGltZXN0YW1wOiBUdWUgMjAxMC0wNi0wOCAxNDo0MDo1NSArMDMwMAogICAg
ICBtZXNzYWdlOgogICAgICAgIGJ1Zl9wYWdlX2dldF9nZW4oKTogUGFzcyBmaWxlLGxpbmUgdG8g
cndfbG9ja194X2xvY2soKS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9i
dWYvYnVmMGJ1Zi5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYw
YnVmLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYwlyZXZpZDp2YXNpbC5k
aW1vdkBvcmFjbGUuY29tLTIwMTAwNjA0MTYyMjUzLWtuMWVydWZmbGtxaHNibWUKKysrIGIvc3Rv
cmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTAwNjA4MTE0NzM0LXpyNzBreGUyNnp0Z3diYXQKQEAgLTI5NTcsNyArMjk1Nyw3IEBAIHdh
aXRfdW50aWxfdW5maXhlZDoKIAogCQlibG9jay0+cGFnZS5idWZfZml4X2NvdW50ID0gMTsKIAkJ
YnVmX2Jsb2NrX3NldF9pb19maXgoYmxvY2ssIEJVRl9JT19SRUFEKTsKLQkJcndfbG9ja194X2xv
Y2soJmJsb2NrLT5sb2NrKTsKKwkJcndfbG9ja194X2xvY2tfZnVuYygmYmxvY2stPmxvY2ssIDAs
IGZpbGUsIGxpbmUpOwogCiAJCVVOSVZfTUVNX0lOVkFMSUQoYnBhZ2UsIHNpemVvZiAqYnBhZ2Up
OwogCgo=

--===============1359390714==
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:47:59 +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


--===============1359390714==--