From: marko.makela
Date: October 20 2010 1:00pm
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3191 to 3192) Bug#57588
List-Archive: http://lists.mysql.com/commits/121319
X-Bug: 57588
Message-Id: <201010201300.o9KD0Xa5004780@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1307073594=="

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

IDMxOTIgTWFya28gTcOka2Vsw6QJMjAxMC0xMC0yMAogICAgICBGaXggYSBjb21waWxlciB3YXJu
aW5nIGNhdXNlZCBieSBmaXhpbmcgQnVnICM1NzU4OCAoY29tcGlsZXIgd2FybmluZykuCiAgICAg
IAogICAgICBEZWNsYXJlIERBVEFfTUJNQVhMRU4gd2l0aCB0aGUgc2FtZSBkYXRhIHR5cGUgYXMg
REFUQV9NQk1JTkxFTi4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNs
dWRlL2RhdGEwdHlwZS5oCiAzMTkxIE1hcmtvIE3DpGtlbMOkCTIwMTAtMTAtMjAKICAgICAgRml4
IGJpdC1yb3QgbGVmdCBieSB0aGUgbXVsdGlwbGUgYnVmZmVyIHBvb2xzIHBhdGNoLgogICAgICAK
ICAgICAgUmVuYW1lIGJ1Zl9wb29sX3dhdGNoLCBidWZfcG9vbF9tdXRleCwgYnVmX3Bvb2xfemlw
X211dGV4CiAgICAgIHRvIGJ1Zl9wb29sLT53YXRjaCwgYnVmX3Bvb2wtPm11dGV4LCBidWZfcG9v
bC0+emlwX211dGV4CiAgICAgIGluIGNvbW1lbnRzLiBSZWZlciB0byBidWZfcG9vbC0+Zmx1c2hf
bGlzdF9tdXRleCBpbnN0ZWFkIG9mCiAgICAgIGZsdXNoX2xpc3RfbXV0ZXguCiAgICAgIAogICAg
ICBSZW1vdmUgb2Jzb2xldGUgZGVjbGFyYXRpb25zIG9mIGJ1Zl9wb29sX211dGV4IGFuZCBidWZf
cG9vbF96aXBfbXV0ZXguCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVm
L2J1ZjBidWRkeS5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYwogICAgICBz
dG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwZmx1LmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idWYv
YnVmMGxydS5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYwYnVkZHkuaAogICAg
ICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMGJ1ZGR5LmljCiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS9idWYwYnVmLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1
ZjBmbHUuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL3N5bmMvc3luYzBzeW5jLmMKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kYXRhMHR5cGUuaCcKLS0tIGEvc3Rv
cmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RhdGEwdHlwZS5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTAxMDIwMTE0NjI4LWx5MXR5YzhldGd4cjk4NXgKKysrIGIvc3RvcmFnZS9pbm5v
YmFzZS9pbmNsdWRlL2RhdGEwdHlwZS5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTAxMDIwMTI1ODQ3LWcwZmxiYW1uc3U4anpvYzEKQEAgLTE4MCw3ICsxODAsNyBAQCBiZWNhdXNl
IGluIEdDQyBpdCByZXR1cm5zIGEgbG9uZy4gKi8KICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgIFVOSVZfRVhQRUNUKCgobWJtaW5tYXhsZW4pICUgREFUQV9NQk1BWCksIFwKICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEpKQogLyogR2V0
IG1ibWF4bGVuIGZyb20gbWJtaW5tYXhsZW4uICovCi0jZGVmaW5lIERBVEFfTUJNQVhMRU4obWJt
aW5tYXhsZW4pICgobWJtaW5tYXhsZW4pIC8gREFUQV9NQk1BWCkKKyNkZWZpbmUgREFUQV9NQk1B
WExFTihtYm1pbm1heGxlbikgKCh1bGludCkgKChtYm1pbm1heGxlbikgLyBEQVRBX01CTUFYKSkK
IAogI2lmbmRlZiBVTklWX0hPVEJBQ0tVUAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKCg==

--===============1307073594==
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 16:00:47 +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


--===============1307073594==--