From: marko.makela
Date: April 6 2011 6:43am
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3359 to 3360)
List-Archive: http://lists.mysql.com/commits/134775
Message-Id: <201104060643.p366hNQk028855@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1936867394=="

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

IDMzNjAgTWFya28gTcOka2Vsw6QJMjAxMS0wNC0wNgogICAgICBFbmFibGUgX19hdHRyaWJ1dGVf
XygoY29sZCkpIG9ubHkgZm9yIEdDQyA0LjMgYW5kIGxhdGVyLgogICAgICBUaGlzIGF0dHJpYnV0
ZSB3YXMgaW50cm9kdWNlZCBpbiBienIgcmV2aXNpb24taWQKICAgICAgbWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTA0MDUwNzM3NTgtYjh5NzMzeXZrcXVtOTQwaQogICAgICBhbmQgY2F1c2Vk
IG9sZGVyIEdDQyB2ZXJzaW9ucyB0byBlbWl0IHdhcm5pbmdzLgoKICAgIG1vZGlmaWVkOgogICAg
ICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvb3MwdGhyZWFkLmgKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS9pbmNsdWRlL3VuaXYuaQogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdXQwZGJn
LmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3V0MHV0LmgKIDMzNTkgTWFya28gTcOk
a2Vsw6QJMjAxMS0wNC0wNSBbbWVyZ2VdCiAgICAgIE1lcmdlIGZyb20gbXlzcWwtNS41LWlubm9k
YiB0byBsb2NhbCB0cmVlLgoKICAgIGFkZGVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9k
Yi9yL2lubm9kYl9idWc1OTQxMC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIv
dC9pbm5vZGJfYnVnNTk0MTAudGVzdAo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL29zMHRocmVhZC5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvb3Mw
dGhyZWFkLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MDUxMTE4NTQtMng3
Y21zbDNkenI1MzB1ZQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvb3MwdGhyZWFkLmgJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MDYwNjIyMzYteTExbzBkZHJ3Z3hu
dnc4aQpAQCAtMTA5LDcgKzEwOSw3IEBAIG9zX3RocmVhZF9leGl0KAogLyo9PT09PT09PT09PSov
CiAJdm9pZCoJZXhpdF92YWx1ZSkJLyohPCBpbjogZXhpdCB2YWx1ZTsgaW4gV2luZG93cyB0aGlz
IHZvaWQqCiAJCQkJaXMgY2FzdCBhcyBhIERXT1JEICovCi0JX19hdHRyaWJ1dGVfXygoY29sZCwg
bm9yZXR1cm4pKTsKKwlVTklWX0NPTEQgX19hdHRyaWJ1dGVfXygobm9yZXR1cm4pKTsKIC8qKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKi8vKioKIFJldHVybnMgdGhlIHRocmVhZCBpZGVudGlmaWVyIG9mIGN1cnJlbnQgdGhyZWFk
LgogQHJldHVybgljdXJyZW50IHRocmVhZCBpZGVudGlmaWVyICovCgo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaScKLS0tIGEvc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL3VuaXYuaQlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQwNTEx
MTg1NC0yeDdjbXNsM2R6cjUzMHVlCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2
LmkJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MDYwNjIyMzYteTExbzBkZHJ3
Z3hudnc4aQpAQCAtMjU1LDYgKzI1NSwxOSBAQCBlYXN5IHdheSB0byBnZXQgaXQgdG8gd29yay4g
U2VlIGh0dHA6Ly9iCiAjZWxzZQogIyBkZWZpbmUgVU5JVl9JTlRFUk4KICNlbmRpZgorI2lmIGRl
ZmluZWQgX19HTlVDX18gJiYgKF9fR05VQ19fID4gNCB8fCBfX0dOVUNfXyA9PSA0ICYmIF9fR05V
Q19NSU5PUl9fID49IDMpCisvKiogU3RhcnRpbmcgd2l0aCBHQ0MgNC4zLCB0aGUgImNvbGQiIGF0
dHJpYnV0ZSBpcyB1c2VkIHRvIGluZm9ybSB0aGUKK2NvbXBpbGVyIHRoYXQgYSBmdW5jdGlvbiBp
cyB1bmxpa2VseSBleGVjdXRlZC4gIFRoZSBmdW5jdGlvbiBpcworb3B0aW1pemVkIGZvciBzaXpl
IHJhdGhlciB0aGFuIHNwZWVkIGFuZCBvbiBtYW55IHRhcmdldHMgaXQgaXMgcGxhY2VkCitpbnRv
IHNwZWNpYWwgc3Vic2VjdGlvbiBvZiB0aGUgdGV4dCBzZWN0aW9uIHNvIGFsbCBjb2xkIGZ1bmN0
aW9ucworYXBwZWFycyBjbG9zZSB0b2dldGhlciBpbXByb3ZpbmcgY29kZSBsb2NhbGl0eSBvZiBu
b24tY29sZCBwYXJ0cyBvZgorcHJvZ3JhbS4gIFRoZSBwYXRocyBsZWFkaW5nIHRvIGNhbGwgb2Yg
Y29sZCBmdW5jdGlvbnMgd2l0aGluIGNvZGUgYXJlCittYXJrZWQgYXMgdW5saWtlbHkgYnkgdGhl
IGJyYW5jaCBwcmVkaWN0aW9uIG1lY2hhbmlzbS4gIG9wdGltaXplIGEKK3JhcmVseSBpbnZva2Vk
IGZ1bmN0aW9uIGZvciBzaXplIGluc3RlYWQgZm9yIHNwZWVkLiAqLworIyBkZWZpbmUgVU5JVl9D
T0xEIF9fYXR0cmlidXRlX18oKGNvbGQpKQorI2Vsc2UKKyMgZGVmaW5lIFVOSVZfQ09MRCAvKiBl
bXB0eSAqLworI2VuZGlmCiAKICNpZm5kZWYgVU5JVl9NVVNUX05PVF9JTkxJTkUKIC8qIERlZmlu
aXRpb24gZm9yIGlubGluZSB2ZXJzaW9uICovCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9p
bm5vYmFzZS9pbmNsdWRlL3V0MGRiZy5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv
dXQwZGJnLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MDUxMTE4NTQtMng3
Y21zbDNkenI1MzB1ZQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdXQwZGJnLmgJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MDYwNjIyMzYteTExbzBkZHJ3Z3hudnc4
aQpAQCAtNTMsNyArNTMsNyBAQCB1dF9kYmdfYXNzZXJ0aW9uX2ZhaWxlZCgKIAljb25zdCBjaGFy
KglleHByLAkvKiE8IGluOiB0aGUgZmFpbGVkIGFzc2VydGlvbiAqLwogCWNvbnN0IGNoYXIqCWZp
bGUsCS8qITwgaW46IHNvdXJjZSBmaWxlIGNvbnRhaW5pbmcgdGhlIGFzc2VydGlvbiAqLwogCXVs
aW50CQlsaW5lKQkvKiE8IGluOiBsaW5lIG51bWJlciBvZiB0aGUgYXNzZXJ0aW9uICovCi0JX19h
dHRyaWJ1dGVfXygobm9ubnVsbCgyKSwgY29sZCkpOworCVVOSVZfQ09MRCBfX2F0dHJpYnV0ZV9f
KChub25udWxsKDIpKSk7CiAKICNpZiBkZWZpbmVkKF9fV0lOX18pIHx8IGRlZmluZWQoX19JTlRF
TF9DT01QSUxFUikKICMgdW5kZWYgVVRfREJHX1VTRV9BQk9SVAoKPT09IG1vZGlmaWVkIGZpbGUg
J3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91dDB1dC5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvdXQwdXQuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQwNTEx
MTg1NC0yeDdjbXNsM2R6cjUzMHVlCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91dDB1
dC5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDA2MDYyMjM2LXkxMW8wZGRy
d2d4bnZ3OGkKQEAgLTI3Niw3ICsyNzYsNyBAQCB2b2lkCiB1dF9wcmludF90aW1lc3RhbXAoCiAv
Kj09PT09PT09PT09PT09PSovCiAJRklMRSoJZmlsZSkJLyohPCBpbjogZmlsZSB3aGVyZSB0byBw
cmludCAqLwotCV9fYXR0cmlidXRlX18oKG5vbm51bGwsIGNvbGQpKTsKKwlVTklWX0NPTEQgX19h
dHRyaWJ1dGVfXygobm9ubnVsbCkpOwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBTcHJpbnRmcyBhIHRpbWVzdGFtcCB0byBh
IGJ1ZmZlciwgMTMuLjE0IGNoYXJzIHBsdXMgdGVybWluYXRpbmcgTlVMLiAqLwogVU5JVl9JTlRF
Uk4KCg==

--===============1936867394==
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: d607577333c8cc742012afea4e3e42507c7122c6
# timestamp: 2011-04-06 09:43:19 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   2x7cmsl3dzr530ue
# 
# Begin bundle
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
woSFkU9o2A==


--===============1936867394==--