From: marko.makela
Date: May 25 2010 12:10pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3476)
List-Archive: http://lists.mysql.com/commits/109156
Message-Id: <201005251211.o4PBjFaI026745@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1145256938=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MjAxMzA3MzQtdWVvdzlt
bjYwY3pwN280bQoKIDM0NzYgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0yNQogICAgICBTdXBwcmVz
cyBib2d1cyBWYWxncmluZCB3YXJuaW5ncyBhYm91dCBidWZfYnVkZHlfcmVsb2NhdGUoKQogICAg
ICBhY2Nlc3NpbmcgdW5pbml0aWFsaXplZCBtZW1vcnkgaW4gVmFsZ3JpbmQtaW5zdHJ1bWVudGVk
IGJ1aWxkcy4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC92YWxncmluZC5zdXBwCiAg
ICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGJ1ZGR5LmMKPT09IG1vZGlmaWVkIGZp
bGUgJ215c3FsLXRlc3QvdmFsZ3JpbmQuc3VwcCcKLS0tIGEvbXlzcWwtdGVzdC92YWxncmluZC5z
dXBwCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTIwMTMwNzM0LXVlb3c5bW42
MGN6cDdvNG0KKysrIGIvbXlzcWwtdGVzdC92YWxncmluZC5zdXBwCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTAwNTI1MTIxMDM4LXR0bm92d2g3bmpsOG8xbTEKQEAgLTcyMiwzICs3
MjIsOCBAQAogICAgZnVuOnB0aHJlYWRfY3JlYXRlKgogfQogCit7CisgICBidWZfYnVkZHlfcmVs
b2NhdGUgcGVla2luZyAoc3BhY2UscGFnZSkgaW4gcG90ZW50aWFsbHkgZnJlZSBibG9ja3MKKyAg
IE1lbWNoZWNrOkFkZHIxCisgICBmdW46YnVmX2J1ZGR5X3JlbG9jYXRlCit9Cgo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwYnVkZHkuYycKLS0tIGEvc3Rv
cmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwYnVkZHkuYwlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDEwMDUyMDEzMDczNC11ZW93OW1uNjBjenA3bzRtCisrKyBiL3N0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9idWYvYnVmMGJ1ZGR5LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMDA1MjUxMjEwMzgtdHRub3Z3aDduamw4bzFtMQpAQCAtNDQyLDExICs0NDIsMTUgQEAgYnVm
X2J1ZGR5X3JlbG9jYXRlKAogCQlwb29sKSwgc28gdGhlcmUgaXMgbm90aGluZyB3cm9uZyBhYm91
dCB0aGlzLiAgVGhlCiAJCW1hY2hfcmVhZF9mcm9tXzQoKSBjYWxscyBoZXJlIHdpbGwgb25seSB0
cmlnZ2VyIGJvZ3VzCiAJCVZhbGdyaW5kIG1lbWNoZWNrIHdhcm5pbmdzIGluIFVOSVZfREVCVUdf
VkFMR1JJTkQgYnVpbGRzLiAqLwotCQlicGFnZSA9IGJ1Zl9wYWdlX2hhc2hfZ2V0KAotCQkJbWFj
aF9yZWFkX2Zyb21fNCgoY29uc3QgYnl0ZSopIHNyYwotCQkJCQkgKyBGSUxfUEFHRV9BUkNIX0xP
R19OT19PUl9TUEFDRV9JRCksCi0JCQltYWNoX3JlYWRfZnJvbV80KChjb25zdCBieXRlKikgc3Jj
Ci0JCQkJCSArIEZJTF9QQUdFX09GRlNFVCkpOworCQl1bGludAkJc3BhY2UJPSBtYWNoX3JlYWRf
ZnJvbV80KAorCQkJKGNvbnN0IGJ5dGUqKSBzcmMgKyBGSUxfUEFHRV9BUkNIX0xPR19OT19PUl9T
UEFDRV9JRCk7CisJCXVsaW50CQlwYWdlX25vCT0gbWFjaF9yZWFkX2Zyb21fNCgKKwkJCShjb25z
dCBieXRlKikgc3JjICsgRklMX1BBR0VfT0ZGU0VUKTsKKwkJLyogU3VwcHJlc3MgVmFsZ3JpbmQg
d2FybmluZ3MgYWJvdXQgY29uZGl0aW9uYWwganVtcAorCQlvbiB1bmluaXRpYWxpemVkIHZhbHVl
LiAqLworCQlVTklWX01FTV9WQUxJRCgmc3BhY2UsIHNpemVvZiBzcGFjZSk7CisJCVVOSVZfTUVN
X1ZBTElEKCZwYWdlX25vLCBzaXplb2YgcGFnZV9ubyk7CisJCWJwYWdlID0gYnVmX3BhZ2VfaGFz
aF9nZXQoc3BhY2UsIHBhZ2Vfbm8pOwogCiAJCWlmICghYnBhZ2UgfHwgYnBhZ2UtPnppcC5kYXRh
ICE9IHNyYykgewogCQkJLyogVGhlIGJsb2NrIGhhcyBwcm9iYWJseSBiZWVuIGZyZXNobHkKCg==

--===============1145256938==
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/mysql/5.1-innodb/
# testament_sha1: ad59718705d393b28ea0d10a8c2cce9eafbb8264
# timestamp: 2010-05-25 15:10:48 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   ueow9mn60czp7o4m
# 
# Begin bundle
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


--===============1145256938==--