From: marko.makela
Date: February 15 2011 9:47am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3500)
List-Archive: http://lists.mysql.com/commits/131267
Message-Id: <201102150947.p1F9fIqn016546@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0204591386=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMTAyMTUwNzMyMzQtcnU2b2Rm
dWhoeGRqcGIxOQoKIDM1MDAgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0xNSBbbWVyZ2VdCiAgICAg
IE1lcmdlIG15c3FsLTUuNS1pbm5vZGIgdG8gbXlzcWwtdHJ1bmstaW5ub2RiLgoKICAgIGFkZGVk
OgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYl9idWc1OTMwNy5yZXN1bHQK
ICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNTkzMDcudGVzdAogICAg
bW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9zeW5jMHJ3LmljCiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2Uvc3luYy9zeW5jMHJ3LmMKPT09IGFkZGVkIGZpbGUgJ215c3FsLXRl
c3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZzU5MzA3LnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVz
dC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVnNTkzMDcucmVzdWx0CTE5NzAtMDEtMDEgMDA6MDA6
MDAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVnNTkzMDcu
cmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjE1MDk0NjI2LWM4NGx5
aHh5ZWtkb2UyaW4KQEAgLTAsMCArMSwyOCBAQAorQ1JFQVRFIFRBQkxFIHQxICgKK3QxX2ludCBJ
TlQsCit0MV90aW1lIFRJTUUKKykgRU5HSU5FPWlubm9kYjsKK0NSRUFURSBUQUJMRSB0MiAoCit0
Ml9pbnQgaW50IFBSSU1BUlkgS0VZLAordDJfaW50MiBJTlQKKykgRU5HSU5FPUlOTk9EQjsKK0lO
U0VSVCBJTlRPIHQyIFZBTFVFUyAoKTsKK1dhcm5pbmdzOgorV2FybmluZwkxMzY0CUZpZWxkICd0
Ml9pbnQnIGRvZXNuJ3QgaGF2ZSBhIGRlZmF1bHQgdmFsdWUKK0lOU0VSVCBJTlRPIHQxIFZBTFVF
UyAoKTsKK1NFTEVDVCAqCitGUk9NIHQxIEFTIHQxYQorV0hFUkUgTk9UIEVYSVNUUworKFNFTEVD
VCAqCitGUk9NIHQxIEFTIHQxYgorV0hFUkUgdDFiLnQxX2ludCBOT1QgSU4KKyhTRUxFQ1QgdDIu
dDJfaW50CitGUk9NIHQyCitXSEVSRSB0MWIudDFfdGltZSBMSUtFIHQxYi50MV9pbnQKK09SIHQx
Yi50MV90aW1lIDw+IHQyLnQyX2ludDIKK0FORCA2PTcKKykKKykKKzsKK3QxX2ludAl0MV90aW1l
CitEUk9QIFRBQkxFIHQxLHQyOwoKPT09IGFkZGVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiL3QvaW5ub2RiX2J1ZzU5MzA3LnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2Ri
L3QvaW5ub2RiX2J1ZzU5MzA3LnRlc3QJMTk3MC0wMS0wMSAwMDowMDowMCArMDAwMAorKysgYi9t
eXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc1OTMwNy50ZXN0CXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjE1MDk0NjI2LWM4NGx5aHh5ZWtkb2UyaW4KQEAgLTAs
MCArMSwzMiBAQAorLS0gc291cmNlIGluY2x1ZGUvaGF2ZV9pbm5vZGIuaW5jCisjIEJ1ZyAjNTkz
MDcgdW5pbml0aWFsaXplZCB2YWx1ZSBpbiByd19sb2NrX3NldF93cml0ZXJfaWRfYW5kX3JlY3Vy
c2lvbl9mbGFnKCkKKyMgd2hlbiBWYWxncmluZCBpbnN0cnVtZW50YXRpb24gKFVOSVZfREVCVUdf
VkFMR1JJTkQpIGlzIG5vdCBlbmFibGVkCisKK0NSRUFURSBUQUJMRSB0MSAoCisgIHQxX2ludCBJ
TlQsCisgIHQxX3RpbWUgVElNRQorKSBFTkdJTkU9aW5ub2RiOworCitDUkVBVEUgVEFCTEUgdDIg
KAorICB0Ml9pbnQgaW50IFBSSU1BUlkgS0VZLAorICB0Ml9pbnQyIElOVAorKSBFTkdJTkU9SU5O
T0RCOworCitJTlNFUlQgSU5UTyB0MiBWQUxVRVMgKCk7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMg
KCk7CisKK1NFTEVDVCAqCitGUk9NIHQxIEFTIHQxYQorV0hFUkUgTk9UIEVYSVNUUworICAoU0VM
RUNUICoKKyAgIEZST00gdDEgQVMgdDFiCisgICBXSEVSRSB0MWIudDFfaW50IE5PVCBJTgorICAg
ICAoU0VMRUNUIHQyLnQyX2ludAorICAgICAgRlJPTSB0MgorICAgICAgV0hFUkUgdDFiLnQxX3Rp
bWUgTElLRSB0MWIudDFfaW50CisgICAgICBPUiB0MWIudDFfdGltZSA8PiB0Mi50Ml9pbnQyCisg
ICAgICBBTkQgNj03CisgKQorKQorOworRFJPUCBUQUJMRSB0MSx0MjsKCj09PSBtb2RpZmllZCBm
aWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvc3luYzBydy5pYycKLS0tIGEvc3RvcmFnZS9p
bm5vYmFzZS9pbmNsdWRlL3N5bmMwcncuaWMJcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUuY29tLTIw
MTEwMjE1MDczMjM0LXJ1Nm9kZnVoaHhkanBiMTkKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNs
dWRlL3N5bmMwcncuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMTUwOTQ2
MjYtYzg0bHloeHlla2RvZTJpbgpAQCAtMjgwLDcgKzI4MCw2IEBAIHJ3X2xvY2tfc2V0X3dyaXRl
cl9pZF9hbmRfcmVjdXJzaW9uX2ZsYWcKIAlsb2NhbF90aHJlYWQgPSBsb2NrLT53cml0ZXJfdGhy
ZWFkOwogCXN1Y2Nlc3MgPSBvc19jb21wYXJlX2FuZF9zd2FwX3RocmVhZF9pZCgKIAkJJmxvY2st
PndyaXRlcl90aHJlYWQsIGxvY2FsX3RocmVhZCwgY3Vycl90aHJlYWQpOwotCVVOSVZfTUVNX1ZB
TElEKCZzdWNjZXNzLCBzaXplb2Yoc3VjY2VzcykpOwogCXV0X2Eoc3VjY2Vzcyk7CiAJbG9jay0+
cmVjdXJzaXZlID0gcmVjdXJzaXZlOwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
YmFzZS9zeW5jL3N5bmMwcncuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwcncu
YwlyZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMTAyMTUwNzMyMzQtcnU2b2RmdWhoeGRq
cGIxOQorKysgYi9zdG9yYWdlL2lubm9iYXNlL3N5bmMvc3luYzBydy5jCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTEwMjE1MDk0NjI2LWM4NGx5aHh5ZWtkb2UyaW4KQEAgLTI3MSw2
ICsyNzEsOSBAQCByd19sb2NrX2NyZWF0ZV9mdW5jKAogCWNvbnRhaW5zIGdhcmJhZ2UgYXQgaW5p
dGlhbGl6YXRpb24gYW5kIGNhbm5vdCBiZSB1c2VkIGZvcgogCXJlY3Vyc2l2ZSB4LWxvY2tpbmcu
ICovCiAJbG9jay0+cmVjdXJzaXZlID0gRkFMU0U7CisJLyogU2lsZW5jZSBWYWxncmluZCB3aGVu
IFVOSVZfREVCVUdfVkFMR1JJTkQgaXMgbm90IGVuYWJsZWQuICovCisJbWVtc2V0KCh2b2lkKikg
JmxvY2stPndyaXRlcl90aHJlYWQsIDAsIHNpemVvZiBsb2NrLT53cml0ZXJfdGhyZWFkKTsKKwlV
TklWX01FTV9JTlZBTElEKCZsb2NrLT53cml0ZXJfdGhyZWFkLCBzaXplb2YgbG9jay0+d3JpdGVy
X3RocmVhZCk7CiAKICNpZmRlZiBVTklWX1NZTkNfREVCVUcKIAlVVF9MSVNUX0lOSVQobG9jay0+
ZGVidWdfbGlzdCk7Cgo=

--===============0204591386==
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: bdd6d143388b75a6013f938a3bf0c2a70d33b3d8
# timestamp: 2011-02-15 11:47:36 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: jimmy.yang@stripped\
#   ru6odfuhhxdjpb19
# 
# Begin bundle
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
kA8jW7Dj/4dT97/8XckU4UJAF0PoRA==


--===============0204591386==--