From: marko.makela
Date: June 21 2010 10:53am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3109) Bug#53593
List-Archive: http://lists.mysql.com/commits/111678
X-Bug: 53593
Message-Id: <201006211053.o5LAZmKk029377@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0075502694=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyMTEwMzIzOS12anNi
ZmU5b3lqNTFuZ2V3CgogMzEwOSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTIxCiAgICAgIEJ1ZyM1
MzU5MzogQWRkIHNvbWUgaW5zdHJ1bWVudGF0aW9uIHRvIGltcHJvdmUgVmFsZ3JpbmQgc2Vuc2l0
aXZpdHkuCiAgICAgIEltcGxlbWVudCBXSVRIX1ZBTEdSSU5EIGZvciB0aGUgQ01ha2UgYnVpbGQu
CgogICAgbW9kaWZpZWQ6CiAgICAgIENNYWtlTGlzdHMudHh0CiAgICAgIGNvbmZpZy5oLmNtYWtl
CiAgICAgIGNvbmZpZ3VyZS5jbWFrZQo9PT0gbW9kaWZpZWQgZmlsZSAnQ01ha2VMaXN0cy50eHQn
Ci0tLSBhL0NNYWtlTGlzdHMudHh0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAw
NjIxMTAzMjM5LXZqc2JmZTlveWo1MW5nZXcKKysrIGIvQ01ha2VMaXN0cy50eHQJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MjExMDUzMzMtcGFweWNwanIzc21za3l4dgpAQCAt
MTE1LDYgKzExNSw5IEBAIE9QVElPTihFTkFCTEVEX1BST0ZJTElORyAiRW5hYmxlIHByb2ZpbGkK
IE9QVElPTihDWUJPWlUgIiIgT0ZGKQogT1BUSU9OKEJBQ0tVUF9URVNUICIiIE9GRikKIE9QVElP
TihXSVRIT1VUX1NFUlZFUiBPRkYpCitJRihVTklYKQorICBPUFRJT04oV0lUSF9WQUxHUklORCAi
VmFsZ3JpbmQgaW5zdHJ1bWVudGF0aW9uIiBPRkYpCitFTkRJRigpCiBPUFRJT04gKFdJVEhfVU5J
VF9URVNUUyAiQ29tcGlsZSBNeVNRTCB3aXRoIHVuaXQgdGVzdHMiIE9OKQogTUFSS19BU19BRFZB
TkNFRChDWUJPWlUgQkFDS1VQX1RFU1QgV0lUSE9VVF9TRVJWRVIgRElTQUJMRV9TSEFSRUQpCiAK
Cj09PSBtb2RpZmllZCBmaWxlICdjb25maWcuaC5jbWFrZScKLS0tIGEvY29uZmlnLmguY21ha2UJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MjExMDMyMzktdmpzYmZlOW95ajUx
bmdldworKysgYi9jb25maWcuaC5jbWFrZQlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDEwMDYyMTEwNTMzMy1wYXB5Y3BqcjNzbXNreXh2CkBAIC0yOTIsNyArMjkyLDcgQEAKICNkZWZp
bmUgVVNFX01CIDEKICNkZWZpbmUgVVNFX01CX0lERU5UIDEKIAotCisjY21ha2VkZWZpbmUgSEFW
RV9WQUxHUklORAogCiAvKiBUeXBlcyB3ZSBtYXkgdXNlICovCiAjY21ha2VkZWZpbmUgU0laRU9G
X0NIQVIgQFNJWkVPRl9DSEFSQAoKPT09IG1vZGlmaWVkIGZpbGUgJ2NvbmZpZ3VyZS5jbWFrZScK
LS0tIGEvY29uZmlndXJlLmNtYWtlCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAw
NjIxMTAzMjM5LXZqc2JmZTlveWo1MW5nZXcKKysrIGIvY29uZmlndXJlLmNtYWtlCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjIxMTA1MzMzLXBhcHljcGpyM3Ntc2t5eHYKQEAg
LTk2OSw2ICs5NjksMTYgQEAgY29uZmlndXJhdGlvbi4gQnkgZGVmYXVsdCBnY2MgYnVpbHQtaW4g
cwogaWYgYXZhaWxhYmxlIGFuZCAnc21wJyBjb25maWd1cmF0aW9uIG90aGVyd2lzZS4iKQogTUFS
S19BU19BRFZBTkNFRChXSVRIX0FUT01JQ19MT0NLUyBNWV9BVE9NSUNfTU9ERV9SV0xPQ0sgTVlf
QVRPTUlDX01PREVfRFVNTVkpCiAKK0lGKFdJVEhfVkFMR1JJTkQpCisgIENIRUNLX0lOQ0xVREVf
RklMRVMoInZhbGdyaW5kL21lbWNoZWNrLmg7dmFsZ3JpbmQvdmFsZ3JpbmQuaCIgCisgICAgSEFW
RV9WQUxHUklORF9IRUFERVJTKQorRU5ESUYoKQorSUYoV0lUSF9WQUxHUklORCBBTkQgSEFWRV9W
QUxHUklORF9IRUFERVJTKQorICBTRVQoSEFWRV9WQUxHUklORCAxKQorRUxTRSgpCisgIFNFVChI
QVZFX1ZBTEdSSU5EIDApCitFTkRJRigpCisKICMtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogIyBDaGVjayBmb3IgSVB2
NiBzdXBwb3J0CiAjLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KCg==

--===============0075502694==
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: 8310a602b13ecff66a21614af05b4ecaab163ea5
# timestamp: 2010-06-21 13:53:39 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   vjsbfe9oyj51ngew
# 
# Begin bundle
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


--===============0075502694==--