From: marko.makela
Date: April 6 2011 6:42am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3564 to 3565)
List-Archive: http://lists.mysql.com/commits/134774
Message-Id: <201104060643.p366h24N003759@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1977350990=="

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

IDM1NjUgTWFya28gTcOka2Vsw6QJMjAxMS0wNC0wNiBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNS1pbm5vZGIgdG8gbXlzcWwtdHJ1bmstaW5ub2RiLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvb3MwdGhyZWFkLmgKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL3VuaXYuaQogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdXQwZGJnLmgK
ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3V0MHV0LmgKIDM1NjQgTWFya28gTcOka2Vs
w6QJMjAxMS0wNC0wNSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3FsLTUuNS1pbm5vZGIgdG8gbXlz
cWwtdHJ1bmstaW5ub2RiLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvb3MwdGhyZWFkLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9vcy9vczB0aHJlYWQuYwo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL29zMHRocmVhZC5oJwot
LS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvb3MwdGhyZWFkLmgJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMTA0MDUxMTI1MzgtNm5ya25ld3ltMDIybnFmNgorKysgYi9zdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvb3MwdGhyZWFkLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMTA0MDYwNjM1MjUtdW1lbzkyb3R0bDFibXlzMQpAQCAtMTA5LDcgKzEwOSw3IEBA
IG9zX3RocmVhZF9leGl0KAogLyo9PT09PT09PT09PSovCiAJdm9pZCoJZXhpdF92YWx1ZSkJLyoh
PCBpbjogZXhpdCB2YWx1ZTsgaW4gV2luZG93cyB0aGlzIHZvaWQqCiAJCQkJaXMgY2FzdCBhcyBh
IERXT1JEICovCi0JX19hdHRyaWJ1dGVfXygoY29sZCwgbm9yZXR1cm4pKTsKKwlVTklWX0NPTEQg
X19hdHRyaWJ1dGVfXygobm9yZXR1cm4pKTsKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFJldHVybnMgdGhlIHRo
cmVhZCBpZGVudGlmaWVyIG9mIGN1cnJlbnQgdGhyZWFkLgogQHJldHVybgljdXJyZW50IHRocmVh
ZCBpZGVudGlmaWVyICovCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNs
dWRlL3VuaXYuaScKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQwNTExMjUzOC02bnJrbmV3eW0wMjJucWY2Cisr
KyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmkJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTA0MDYwNjM1MjUtdW1lbzkyb3R0bDFibXlzMQpAQCAtMjY2LDYgKzI2Niwx
OSBAQCBlYXN5IHdheSB0byBnZXQgaXQgdG8gd29yay4gU2VlIGh0dHA6Ly9iCiAjZWxzZQogIyBk
ZWZpbmUgVU5JVl9JTlRFUk4KICNlbmRpZgorI2lmIGRlZmluZWQgX19HTlVDX18gJiYgKF9fR05V
Q19fID4gNCB8fCBfX0dOVUNfXyA9PSA0ICYmIF9fR05VQ19NSU5PUl9fID49IDMpCisvKiogU3Rh
cnRpbmcgd2l0aCBHQ0MgNC4zLCB0aGUgImNvbGQiIGF0dHJpYnV0ZSBpcyB1c2VkIHRvIGluZm9y
bSB0aGUKK2NvbXBpbGVyIHRoYXQgYSBmdW5jdGlvbiBpcyB1bmxpa2VseSBleGVjdXRlZC4gIFRo
ZSBmdW5jdGlvbiBpcworb3B0aW1pemVkIGZvciBzaXplIHJhdGhlciB0aGFuIHNwZWVkIGFuZCBv
biBtYW55IHRhcmdldHMgaXQgaXMgcGxhY2VkCitpbnRvIHNwZWNpYWwgc3Vic2VjdGlvbiBvZiB0
aGUgdGV4dCBzZWN0aW9uIHNvIGFsbCBjb2xkIGZ1bmN0aW9ucworYXBwZWFycyBjbG9zZSB0b2dl
dGhlciBpbXByb3ZpbmcgY29kZSBsb2NhbGl0eSBvZiBub24tY29sZCBwYXJ0cyBvZgorcHJvZ3Jh
bS4gIFRoZSBwYXRocyBsZWFkaW5nIHRvIGNhbGwgb2YgY29sZCBmdW5jdGlvbnMgd2l0aGluIGNv
ZGUgYXJlCittYXJrZWQgYXMgdW5saWtlbHkgYnkgdGhlIGJyYW5jaCBwcmVkaWN0aW9uIG1lY2hh
bmlzbS4gIG9wdGltaXplIGEKK3JhcmVseSBpbnZva2VkIGZ1bmN0aW9uIGZvciBzaXplIGluc3Rl
YWQgZm9yIHNwZWVkLiAqLworIyBkZWZpbmUgVU5JVl9DT0xEIF9fYXR0cmlidXRlX18oKGNvbGQp
KQorI2Vsc2UKKyMgZGVmaW5lIFVOSVZfQ09MRCAvKiBlbXB0eSAqLworI2VuZGlmCiAKICNpZm5k
ZWYgVU5JVl9NVVNUX05PVF9JTkxJTkUKIC8qIERlZmluaXRpb24gZm9yIGlubGluZSB2ZXJzaW9u
ICovCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3V0MGRiZy5o
JwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdXQwZGJnLmgJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMTA0MDUxMTI1MzgtNm5ya25ld3ltMDIybnFmNgorKysgYi9zdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvdXQwZGJnLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMTA0MDYwNjM1MjUtdW1lbzkyb3R0bDFibXlzMQpAQCAtNTMsNyArNTMsNyBAQCB1dF9k
YmdfYXNzZXJ0aW9uX2ZhaWxlZCgKIAljb25zdCBjaGFyKglleHByLAkvKiE8IGluOiB0aGUgZmFp
bGVkIGFzc2VydGlvbiAqLwogCWNvbnN0IGNoYXIqCWZpbGUsCS8qITwgaW46IHNvdXJjZSBmaWxl
IGNvbnRhaW5pbmcgdGhlIGFzc2VydGlvbiAqLwogCXVsaW50CQlsaW5lKQkvKiE8IGluOiBsaW5l
IG51bWJlciBvZiB0aGUgYXNzZXJ0aW9uICovCi0JX19hdHRyaWJ1dGVfXygobm9ubnVsbCgyKSwg
Y29sZCkpOworCVVOSVZfQ09MRCBfX2F0dHJpYnV0ZV9fKChub25udWxsKDIpKSk7CiAKICNpZiBk
ZWZpbmVkKF9fV0lOX18pIHx8IGRlZmluZWQoX19JTlRFTF9DT01QSUxFUikKICMgdW5kZWYgVVRf
REJHX1VTRV9BQk9SVAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS91dDB1dC5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdXQwdXQuaAlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQwNTExMjUzOC02bnJrbmV3eW0wMjJucWY2Cisr
KyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91dDB1dC5oCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTEwNDA2MDYzNTI1LXVtZW85Mm90dGwxYm15czEKQEAgLTI4MCw3ICsyODAs
NyBAQCB2b2lkCiB1dF9wcmludF90aW1lc3RhbXAoCiAvKj09PT09PT09PT09PT09PSovCiAJRklM
RSoJZmlsZSkJLyohPCBpbjogZmlsZSB3aGVyZSB0byBwcmludCAqLwotCV9fYXR0cmlidXRlX18o
KG5vbm51bGwsIGNvbGQpKTsKKwlVTklWX0NPTEQgX19hdHRyaWJ1dGVfXygobm9ubnVsbCkpOwog
LyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KiovLyoqCiBTcHJpbnRmcyBhIHRpbWVzdGFtcCB0byBhIGJ1ZmZlciwgMTMuLjE0IGNoYXJzIHBs
dXMgdGVybWluYXRpbmcgTlVMLiAqLwogVU5JVl9JTlRFUk4KCg==

--===============1977350990==
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: c246f969b9b83d9e7bf89cff592af5197965b3f6
# timestamp: 2011-04-06 09:42:56 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   6nrknewym022nqf6
# 
# Begin bundle
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


--===============1977350990==--