From: marko.makela
Date: October 20 2010 12:58pm
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3192) Bug#57588
List-Archive: http://lists.mysql.com/commits/121315
X-Bug: 57588
Message-Id: <201010201259.o9KBXY1T021531@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2115247822=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAyMDExNDYyOC1seTF0
eWM4ZXRneHI5ODV4CgogMzE5MiBNYXJrbyBNw6RrZWzDpAkyMDEwLTEwLTIwCiAgICAgIEZpeCBh
IGNvbXBpbGVyIHdhcm5pbmcgY2F1c2VkIGJ5IGZpeGluZyBCdWcgIzU3NTg4IChjb21waWxlciB3
YXJuaW5nKS4KICAgICAgCiAgICAgIERlY2xhcmUgREFUQV9NQk1BWExFTiB3aXRoIHRoZSBzYW1l
IGRhdGEgdHlwZSBhcyBEQVRBX01CTUlOTEVOLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvZGF0YTB0eXBlLmgKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv
aW5ub2Jhc2UvaW5jbHVkZS9kYXRhMHR5cGUuaCcKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNs
dWRlL2RhdGEwdHlwZS5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDIwMTE0
NjI4LWx5MXR5YzhldGd4cjk4NXgKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RhdGEw
dHlwZS5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDIwMTI1ODQ3LWcwZmxi
YW1uc3U4anpvYzEKQEAgLTE4MCw3ICsxODAsNyBAQCBiZWNhdXNlIGluIEdDQyBpdCByZXR1cm5z
IGEgbG9uZy4gKi8KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFVOSVZfRVhQ
RUNUKCgobWJtaW5tYXhsZW4pICUgREFUQV9NQk1BWCksIFwKICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEpKQogLyogR2V0IG1ibWF4bGVuIGZyb20gbWJt
aW5tYXhsZW4uICovCi0jZGVmaW5lIERBVEFfTUJNQVhMRU4obWJtaW5tYXhsZW4pICgobWJtaW5t
YXhsZW4pIC8gREFUQV9NQk1BWCkKKyNkZWZpbmUgREFUQV9NQk1BWExFTihtYm1pbm1heGxlbikg
KCh1bGludCkgKChtYm1pbm1heGxlbikgLyBEQVRBX01CTUFYKSkKIAogI2lmbmRlZiBVTklWX0hP
VEJBQ0tVUAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKi8vKioKCg==

--===============2115247822==
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: 3a213df025087bddd9114a3e30ed5daee023c86b
# timestamp: 2010-10-20 15:58:55 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   ly1tyc8etgxr985x
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXoiwWoAAZZflAAQWmP/93cn
BEC////wBAAIAFADmV7mk3HRNxgkkmpqeGpPUbTRqenqNQeo9TQIzRGA0CShTZNMjQRPKaelNqAe
oPRqaGQACSTUxJiYJo1D0KbSekA0000AZAcwCYATAACYAAmAAJJI1RmmFMR5Go2kxGGoPUaA9EYU
4Z6m8e6427YLdNqkGxNHKEO6RTTC73bmZjx71+KJsWdTPB/7Zp8j87fN/nLwc/n2aOz9sosaToPC
6glDDf7AgwcuEpwqQJ8COu6Jus/y9hH/XGpl0imn7Hqy6zh0Sz5M6RmZbxGWptcouLlGHbawhxDL
mmFDeMI9NzElTJ8AzmhBllKOzBOwouitYxSKUmExM3fcEeTCLNXH7mLqk1zUD2YdStREvX4r3dEz
nivb+bTGwmxYZaqWuMdBDEHXrTi3WNonPOadrBZODH4s6IvLptK530fHSuJtVsFRbAoinY4YQwbf
sgqxX2OWFOSootOnhjaGBlRuOoVXdISURNtoG9owcsHtfLFN23QVVPPYn33qeSZEUqUVuFNklszT
pzUib4TjsrU1DcqiqIwugKpUwcxUpWYjxXkKPZq1vFThZjiTTlRZlPPPpV5lnZY95sYqyhuvaUgu
cjBNNolINOlsF8Do9uvIavterLXKrKRHyFq3BGTMMQB+dSIIdyiRk6fcszLeDZKKV8e6Rbl0sFfm
8mbYMuoeGpPIc9Zz4CN/likVT1SB33iP6+t4s0vLClEaBG80OMAbSxqcs+bHtgLHaqKC6GAQXoLk
iRVrjyTk8m71BZf5HZqbQ5IkViRjZ5PO428Xd5cTknq8bSBUpfs6Z+CgZL57dF5vSTj6qn7OXrsT
kh6aj384WyS3S2mTbC+5trsuUKsN17qY83b0cWdsNNsvFY0flx7JGcib0ycUXW2Rvia1OEqkmVTN
WtZMfeOOZpRaHFxhIuoTrUVKLMXlgSTQUJCspp3JtmRiuocX8l2BVPtkaEsuz3aZR2hwDvspdVZw
FpRMuEfzMNEjrCIRaJQsFwakMNww1li3ujBOzV8vekVCKFaaRnU4VOdpfH4DSUxvSeOHyDgqfCA7
BfWYJ01nB6xNUhmTKjo4pHMT6twlIKHPJI5BSuyCuswxZlA7w0i5PGWm3YGLcVqSWcRT42k+uKRN
MXvrjGhMo1v10ytrOpq8walc5kQqExXAYy8aE2wmZVqToXZyLAkDU5qhyVfsUBXTXgzt35TUClqv
DW1U5JjzmnrfYRZctyUKz+irq/wz6/8XckU4UJB6IsFq


--===============2115247822==--