From: marko.makela
Date: May 11 2010 10:50am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3458) Bug#53307
List-Archive: http://lists.mysql.com/commits/107944
X-Bug: 53307
Message-Id: <201005111050.o4B9dlcL008810@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0954532243=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwtNS4xLWlubm9kYjIvIGJh
c2VkIG9uIHJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTExMTA0OTEwLW5pbThr
Z2d1YXdwaXM3em8KCiAzNDU4IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMTEKICAgICAgRG8gbm90
IGRlbWFuZCB0aGF0IGJ1Zl9wYWdlX3QgYmUgZnVsbHkgaW5pdGlhbGl6ZWQgb24gNjQtYml0IHN5
c3RlbXMuCiAgICAgIFRoZXJlIG1heSBiZSBwYWRkaW5nIGJlZm9yZSBidWZfcGFnZV90Ojp6aXAu
IChCdWcgIzUzMzA3KQoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4v
YnVmL2J1ZjBscnUuYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9idWYwYnVm
LmljCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBscnUu
YycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwbHJ1LmMJMjAxMC0wMy0yMyAx
NjoyMDozNiArMDAwMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBscnUuYwky
MDEwLTA1LTExIDEwOjUwOjEyICswMDAwCkBAIC0xMzkzLDcgKzEzOTMsMTIgQEAgYnVmX0xSVV9m
cmVlX2Jsb2NrKAogCXV0X2FkKGJ1Zl9wYWdlX2luX2ZpbGUoYnBhZ2UpKTsKIAl1dF9hZChicGFn
ZS0+aW5fTFJVX2xpc3QpOwogCXV0X2FkKCFicGFnZS0+aW5fZmx1c2hfbGlzdCA9PSAhYnBhZ2Ut
Pm9sZGVzdF9tb2RpZmljYXRpb24pOworI2lmIFVOSVZfV09SRF9TSVpFID09IDQKKwkvKiBPbiAz
Mi1iaXQgc3lzdGVtcywgdGhlcmUgaXMgbm8gcGFkZGluZyBpbiBidWZfcGFnZV90LiAgT24KKwlv
dGhlciBzeXN0ZW1zLCBWYWxncmluZCBjb3VsZCBjb21wbGFpbiBhYm91dCB1bmluaXRpYWxpemVk
IHBhZAorCWJ5dGVzLiAqLwogCVVOSVZfTUVNX0FTU0VSVF9SVyhicGFnZSwgc2l6ZW9mICpicGFn
ZSk7CisjZW5kaWYKIAogCWlmICghYnVmX3BhZ2VfY2FuX3JlbG9jYXRlKGJwYWdlKSkgewogCkBA
IC0xNjg4LDcgKzE2OTMsMTIgQEAgYnVmX0xSVV9ibG9ja19yZW1vdmVfaGFzaGVkX3BhZ2UoCiAJ
dXRfYShidWZfcGFnZV9nZXRfaW9fZml4KGJwYWdlKSA9PSBCVUZfSU9fTk9ORSk7CiAJdXRfYShi
cGFnZS0+YnVmX2ZpeF9jb3VudCA9PSAwKTsKIAorI2lmIFVOSVZfV09SRF9TSVpFID09IDQKKwkv
KiBPbiAzMi1iaXQgc3lzdGVtcywgdGhlcmUgaXMgbm8gcGFkZGluZyBpbgorCWJ1Zl9wYWdlX3Qu
ICBPbiBvdGhlciBzeXN0ZW1zLCBWYWxncmluZCBjb3VsZCBjb21wbGFpbgorCWFib3V0IHVuaW5p
dGlhbGl6ZWQgcGFkIGJ5dGVzLiAqLwogCVVOSVZfTUVNX0FTU0VSVF9SVyhicGFnZSwgc2l6ZW9m
ICpicGFnZSk7CisjZW5kaWYKIAogCWJ1Zl9MUlVfcmVtb3ZlX2Jsb2NrKGJwYWdlKTsKIAoKPT09
IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2J1ZjBidWYuaWMn
Ci0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2J1ZjBidWYuaWMJMjAxMC0wMy0y
NiAxNDoxOTowMSArMDAwMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9idWYw
YnVmLmljCTIwMTAtMDUtMTEgMTA6NTA6MTIgKzAwMDAKQEAgLTkzMSw3ICs5MzEsMTIgQEAgYnVm
X3BhZ2VfaGFzaF9nZXQoCiAJCXV0X2EoYnVmX3BhZ2VfaW5fZmlsZShicGFnZSkpOwogCQl1dF9h
ZChicGFnZS0+aW5fcGFnZV9oYXNoKTsKIAkJdXRfYWQoIWJwYWdlLT5pbl96aXBfaGFzaCk7Cisj
aWYgVU5JVl9XT1JEX1NJWkUgPT0gNAorCQkvKiBPbiAzMi1iaXQgc3lzdGVtcywgdGhlcmUgaXMg
bm8gcGFkZGluZyBpbgorCQlidWZfcGFnZV90LiAgT24gb3RoZXIgc3lzdGVtcywgVmFsZ3JpbmQg
Y291bGQgY29tcGxhaW4KKwkJYWJvdXQgdW5pbml0aWFsaXplZCBwYWQgYnl0ZXMuICovCiAJCVVO
SVZfTUVNX0FTU0VSVF9SVyhicGFnZSwgc2l6ZW9mICpicGFnZSk7CisjZW5kaWYKIAl9CiAKIAly
ZXR1cm4oYnBhZ2UpOwoK

--===============0954532243==
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-innodb2/
# testament_sha1: 24f2e387ce4ad6807b6db1698ec9f6de853a63f4
# timestamp: 2010-05-11 13:50:20 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   nim8kgguawpis7zo
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe3uEvoAAshfgEAwW3f//1cj
n5C/7//wUAV4ey0AL2NDiNJAkpNU/U9SeTFA8mCTMo9QAGgAMTQDmmJkyaMJgmJpgEwCGCMCMAkS
JoVPNNJPCanqemU/VD1HlDTQZGhoHqAI9Up6gAAaAAAGgAyAaHqZAkkJoAAJoEp4ynpNQ9J5TyJo
Yhp6TS+Sk0xrN9BjPe8+rTu09jcER3WnYXa1JVqE1c9tXP0T2UAKFaucot6CLK18cIsa1LIZBtib
M/yFkM/5pa1kqukp0di3q1SsnEUowvy8Vo2YJmpeNY+b+88S+e0hilIq7tRKso6pzCIOSupacoVc
1QMbKliBwRqTh6z1m4Y7N4V16QkNXOn3JDtujwXQ16hQVRiIFoz6XrolvTVYLZAxvSNAEPABxpG6
/EBBVpmWYjjWqBUui1qcFGt8FeudSkykvwmdEhG8eI3mQ/FOdk105ICl2wSOwDFBKdbSpDJG0oAe
WmEQnoVfH2gSV6DEzLjIl6ZhNItSOR5+MkiVIsiBWyB5FsWkyqDAYpR71gWQXoe8Tr9ngxhgXEHF
SgBkU3HZgSIHptAVeBh5ltBKVjZwLhE8ETydzDN6CNTebiIFF9+1pGrcxWrSLUQCV+YDnWgwFAOJ
lEZQo4QC+hxZMOGFjPvKCQkJV6kiNAPWWlrzMyjOBTVc9IxOMtZJqx3nGY1CDgLC0zLAHGRwg8fj
jDTUsKTKFS1AyKVtLwYkO4CAFxofbU+4GhaaNM7MztiB8bDFZ5gOMiE4F5kG4MPyA9ivmAw4gam3
eRrvbUshAkHjh54LOciOwAnIKPA3maKEFJOZhY6YGonGKCHIvyaUaWXEZbwhOq0RoJhbn0M3x8iV
ku1nWtmV5gsIx8HCc+ka0rDiunxSsgrcSvFuBXkNEUpXPo8UnyJHQR49k+WwfFoMICQs+ihZCGEB
vxZtEwvah2z6bYhFHMgugy6gO4oOZ4gv19xj8jgdOgJlWMHDvvsMiVEUVrxBbF/KNVslUmndOB/U
EKDHwTeXmBsPEwPd6AdRE8zrA4lw0Q1Avmtes/i60yTHYbhtnb4eCQ4HeBsuAg+AG8DQzAuMjdPR
k4kewJydUCsSgutSLVDXQLj2HMkCQGgZbKgP7sAoC1MWNcIoW1YBN2YGjgaCeJSkmA3DfKbSYgU9
DrX2NvA5taoCOUhTMFbzgYW/VCurS+SkPomFUpKYvDv2A9POBdiozoIoa4UtaiAngQXGZpUQFA5G
AnAarCFai4yqbJK1WstjcEIJlayrXSrC60sEyuRgv1puIGoyXpkk/aA4qVyYqKknpxNQxgxnIolj
RJCDsKp9bMDs0Ficua1QewKA5ynFGpAX2xBclqjJC7PrQFADwVi7VwKwTIpAtAgclynlBu8FMusF
Tf+PI+g4GMFrcn76DWqSdOVKXcBj8pg/ZmUXDOOBAFy6sSoJtHeVUIlgGpSBida2vzWImxNO5/CK
7XgnaPN4BPMgfBHqC9qKA63KeY8r6Voqu1jdKBzQxx48QqiqQ+qcrdk0w3xrz3bRUoC9NAZZgW8O
YxNSpTqVaFYtM7woTZvVQpLQu+lUiE5jeU0SatVSBlQeTNRNKgF6V1bxWhnVlS8wGutmNh9wuZkr
rVYErWJk1gcR5KicLhMQYJHIwArXhQtUB8Kl1FanFXBdpWp/30QROoC3w0UQIodTNm5mwmoSvT+g
E2SWkNOosVmf/i7kinChIdvcJfQ=


--===============0954532243==--