From: marko.makela
Date: June 9 2011 7:14pm
Subject: bzr commit into mysql-trunk branch (marko.makela:3178)
List-Archive: http://lists.mysql.com/commits/139003
Message-Id: <201106091915.p59JF6hn003115@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0977548009=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC10cnVuay8g
YmFzZWQgb24gcmV2aWQ6ZG1pdHJ5LnNodWxnYUBvcmFjbGUuY29tLTIwMTEwNjA5MTgxODIyLTMx
YXpoeDBlMXFnM21zeW4KCiAzMTc4IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDYtMDkgW21lcmdlXQog
ICAgICBNZXJnZSBteXNxbC01LjUgdG8gbXlzcWwtdHJ1bmsuCgogICAgbW9kaWZpZWQ6CiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFn
ZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cw
cm93LmMJcmV2aWQ6ZG1pdHJ5LnNodWxnYUBvcmFjbGUuY29tLTIwMTEwNjA5MTgxODIyLTMxYXpo
eDBlMXFnM21zeW4KKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjA5MTkxMzM3LXRsaTJpbXFnNXZqb3JpM20KQEAg
LTIwMCw3ICsyMDAsMTEgQEAgcm93X2J1aWxkKAogCQl1dF9hZChyZWNfb2Zmc192YWxpZGF0ZShy
ZWMsIGluZGV4LCBvZmZzZXRzKSk7CiAJfQogCi0jaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRl
ZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisjaWYgMCAvKiBkZWZpbmVkIFVOSVZfREVCVUcg
fHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KKwkvKiBUaGlzIG9uZSBjYW4gZmFp
bCBpbiB0cnhfcm9sbGJhY2tfYWN0aXZlKCkgaWYKKwl0aGUgc2VydmVyIGNyYXNoZWQgZHVyaW5n
IGFuIGluc2VydCBiZWZvcmUgdGhlCisJYnRyX3N0b3JlX2JpZ19yZWNfZXh0ZXJuX2ZpZWxkcygp
IGRpZCBtdHJfY29tbWl0KCkKKwlhbGwgQkxPQiBwb2ludGVycyB0byB0aGUgY2x1c3RlcmVkIGlu
ZGV4IHJlY29yZC4gKi8KIAl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4ocmVjLCBvZmZz
ZXRzKSk7CiAjZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8K
IAoK

--===============0977548009==
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/mysql-trunk/
# testament_sha1: 4c6c7f018edf724c109148cfe67511b70804c852
# timestamp: 2011-06-09 22:15:01 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/
# base_revision_id: dmitry.shulga@stripped\
#   31azhx0e1qg3msyn
# 
# Begin bundle
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


--===============0977548009==--