From: marko.makela
Date: May 17 2011 12:26pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3630)
List-Archive: http://lists.mysql.com/commits/137512
Message-Id: <201105171226.p4HCQFWR001059@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2020022450=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUxNzExNDIxMC1lN2Rm
eDl6MzZyMnR1bXp6CgogMzYzMCBNYXJrbyBNw6RrZWzDpAkyMDExLTA1LTE3IFttZXJnZV0KICAg
ICAgTWVyZ2UgbXlzcWwtNS41LWlubm9kYiB0byBteXNxbC10cnVuay1pbm5vZGIuCgogICAgbW9k
aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvZmlsL2ZpbDBmaWwuYwo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9maWwvZmlsMGZpbC5jJwotLS0gYS9zdG9yYWdlL2lubm9i
YXNlL2ZpbC9maWwwZmlsLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MTcx
MTQyMTAtZTdkZng5ejM2cjJ0dW16egorKysgYi9zdG9yYWdlL2lubm9iYXNlL2ZpbC9maWwwZmls
LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MTcxMjI1MDEtMm5pYzh6ZGVr
bng1cWtjNApAQCAtODUyLDcgKzg1Miw4IEBAIGZpbF9ub2RlX2Nsb3NlX2ZpbGUoCiAJdXRfYShu
b2RlLT5uX3BlbmRpbmcgPT0gMCk7CiAJdXRfYShub2RlLT5uX3BlbmRpbmdfZmx1c2hlcyA9PSAw
KTsKIAl1dF9hKCFub2RlLT5iZWluZ19leHRlbmRlZCk7Ci0JdXRfYShub2RlLT5tb2RpZmljYXRp
b25fY291bnRlciA9PSBub2RlLT5mbHVzaF9jb3VudGVyKTsKKwl1dF9hKG5vZGUtPm1vZGlmaWNh
dGlvbl9jb3VudGVyID09IG5vZGUtPmZsdXNoX2NvdW50ZXIKKwkgICAgIHx8IHNydl9mYXN0X3No
dXRkb3duID09IDIpOwogCiAJcmV0ID0gb3NfZmlsZV9jbG9zZShub2RlLT5oYW5kbGUpOwogCXV0
X2EocmV0KTsKCg==

--===============2020022450==
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: 32cbb7e2b5aa4922edadeeac008536e8fc04ff26
# timestamp: 2011-05-17 15:26:10 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   e7dfx9z36r2tumzz
# 
# Begin bundle
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


--===============2020022450==--