From: marko.makela
Date: May 5 2010 1:27pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3455) Bug#53307
List-Archive: http://lists.mysql.com/commits/107529
X-Bug: 53307
Message-Id: <201005051327.o45DKMbf004556@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1545621409=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDUxMjM5MDEteGp4dTkz
aDF4bmJrZmtxMAoKIDM0NTUgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNQogICAgICBEbyBub3Qg
ZGVtYW5kIHRoYXQgYnVmX3BhZ2VfdCBiZSBmdWxseSBpbml0aWFsaXplZAogICAgICBvbiA2NC1i
aXQgc3lzdGVtcy4gVGhlcmUgbWF5IGJlIHBhZGRpbmcgYmVmb3JlIGJ1Zl9wYWdlX3Q6OnppcC4g
KEJ1ZyAjNTMzMDcpCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9i
dWYvYnVmMGxydS5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2J1ZjBidWYu
aWMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGxydS5j
JwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBscnUuYwkyMDEwLTAzLTIzIDE2
OjIwOjM2ICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGxydS5jCTIw
MTAtMDUtMDUgMTM6Mjc6MzYgKzAwMDAKQEAgLTEzOTMsNyArMTM5MywxMiBAQCBidWZfTFJVX2Zy
ZWVfYmxvY2soCiAJdXRfYWQoYnVmX3BhZ2VfaW5fZmlsZShicGFnZSkpOwogCXV0X2FkKGJwYWdl
LT5pbl9MUlVfbGlzdCk7CiAJdXRfYWQoIWJwYWdlLT5pbl9mbHVzaF9saXN0ID09ICFicGFnZS0+
b2xkZXN0X21vZGlmaWNhdGlvbik7CisjaWYgVU5JVl9XT1JEX1NJWkUgPT0gNAorCS8qIE9uIDMy
LWJpdCBzeXN0ZW1zLCB0aGVyZSBpcyBubyBwYWRkaW5nIGluIGJ1Zl9wYWdlX3QuICBPbgorCW90
aGVyIHN5c3RlbXMsIFZhbGdyaW5kIGNvdWxkIGNvbXBsYWluIGFib3V0IHVuaW5pdGlhbGl6ZWQg
cGFkCisJYnl0ZXMuICovCiAJVU5JVl9NRU1fQVNTRVJUX1JXKGJwYWdlLCBzaXplb2YgKmJwYWdl
KTsKKyNlbmRpZgogCiAJaWYgKCFidWZfcGFnZV9jYW5fcmVsb2NhdGUoYnBhZ2UpKSB7CiAKQEAg
LTE2ODgsNyArMTY5MywxMiBAQCBidWZfTFJVX2Jsb2NrX3JlbW92ZV9oYXNoZWRfcGFnZSgKIAl1
dF9hKGJ1Zl9wYWdlX2dldF9pb19maXgoYnBhZ2UpID09IEJVRl9JT19OT05FKTsKIAl1dF9hKGJw
YWdlLT5idWZfZml4X2NvdW50ID09IDApOwogCisjaWYgVU5JVl9XT1JEX1NJWkUgPT0gNAorCS8q
IE9uIDMyLWJpdCBzeXN0ZW1zLCB0aGVyZSBpcyBubyBwYWRkaW5nIGluCisJYnVmX3BhZ2VfdC4g
IE9uIG90aGVyIHN5c3RlbXMsIFZhbGdyaW5kIGNvdWxkIGNvbXBsYWluCisJYWJvdXQgdW5pbml0
aWFsaXplZCBwYWQgYnl0ZXMuICovCiAJVU5JVl9NRU1fQVNTRVJUX1JXKGJwYWdlLCBzaXplb2Yg
KmJwYWdlKTsKKyNlbmRpZgogCiAJYnVmX0xSVV9yZW1vdmVfYmxvY2soYnBhZ2UpOwogCgo9PT0g
bW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvYnVmMGJ1Zi5pYycK
LS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvYnVmMGJ1Zi5pYwkyMDEwLTAzLTI2
IDE0OjE5OjAxICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2J1ZjBi
dWYuaWMJMjAxMC0wNS0wNSAxMzoyNzozNiArMDAwMApAQCAtOTMxLDcgKzkzMSwxMiBAQCBidWZf
cGFnZV9oYXNoX2dldCgKIAkJdXRfYShidWZfcGFnZV9pbl9maWxlKGJwYWdlKSk7CiAJCXV0X2Fk
KGJwYWdlLT5pbl9wYWdlX2hhc2gpOwogCQl1dF9hZCghYnBhZ2UtPmluX3ppcF9oYXNoKTsKKyNp
ZiBVTklWX1dPUkRfU0laRSA9PSA0CisJCS8qIE9uIDMyLWJpdCBzeXN0ZW1zLCB0aGVyZSBpcyBu
byBwYWRkaW5nIGluCisJCWJ1Zl9wYWdlX3QuICBPbiBvdGhlciBzeXN0ZW1zLCBWYWxncmluZCBj
b3VsZCBjb21wbGFpbgorCQlhYm91dCB1bmluaXRpYWxpemVkIHBhZCBieXRlcy4gKi8KIAkJVU5J
Vl9NRU1fQVNTRVJUX1JXKGJwYWdlLCBzaXplb2YgKmJwYWdlKTsKKyNlbmRpZgogCX0KIAogCXJl
dHVybihicGFnZSk7Cgo=

--===============1545621409==
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: e883615d6109af04f40861c1702b6b50b8ca6271
# timestamp: 2010-05-05 16:27:44 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   xjxu93h1xnbkfkq0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcehsiIAArhfgEAwW3f//1cj
n5C////wUAV4XrY0Bvdx0sG0Uwkkgie00pPaU9gmiemVPJqNAyNDIyAaeoc0ZMTABMRgRpgQYjBM
mARgkSTIVPDU1PGmhNTJ6gGmgDJoep6gyAR6opoGgAaA0AAGgAAHqNAJJCNA0JhMhTyNU8KHqbSe
U/SaQBpo9QXSUmmNZ+Axnwd+Grmv6m4Ij7cDrMu1ZFYoTWV808PBVMAmURGSy4jNZuXZvi1rBXFw
2xNmn6CuL/1S1q6eSSqqdi8qtUuSqIpRhGboWrl8KZ39i3rHm/uqJfXWQxSkT46yVZRzqqCIO1Zb
TtsVdSoGNk1iBwSzpxEtVmq/VXeFEPGPcbXO17BDn2RIXSa8BRqcsHKjp/MV4296euIqQNIpGAG0
DtA8VpGwB2754Dk9fqAPut/irBQWILgupWlS59+c7EUE+kzCKmjuqh3vVaXgrNtqmkbwKy9uhCRe
keirEB4v6GsoTajDK8j7+R0AmWKCQxsuHPueoMkfZ4Vl0AIombJrM3AVg8YwR6rElBfE9ROv1+DG
mA9itPAyKsTszA7k9aApYGHoXWKsYyGpA0mNAJpER8WGbtEXEDYaCZ90BzQcygoAUEjRvYRFPzAc
6lRBwDgcOVAmp5aVSiVjCtMaqConJz2OKmNoHVZRJnGZL0ekX2s5YnVO8B5Adu7h2oMBqWGQDHEz
Kx2kCFYEb9MI7jcXGM92gGRJYBSSLSAGwoP8zNQJzOaLngX/KovTwGLjEDaF4bwqJi7rAlWBbcBg
ZTSuaT3jhxsnNR0gIuTTaGZiioD7k1ZQZBJxVUSG5nv2TjFscBlmEKVJE9RQLc+pm+XmYsl1MdFw
2NkFBGzJCZV0jWC5/Iun0ysgrlEtAt4K4kDb+XZxWfuU4iCdjwS5DD2QEGD4tE9ChYsYPlWcpTgp
DEIuj2yWspUbyNdIy2gcTiPOsFyiKfqXG/eCZTjBv8L5GJFE6JL9wW1fojRbYqbPvpA/iCFBl5Yf
gBqO8jAwKzeTkTzPHiBwXoGSwqW/eey5Jh7DUHIZmP14eCQzhrwLPU5mYECqXQDMDUzAwPWzJpgq
kwUKLgWZLmAnsZvVakD0YATOs3EwmBszLK0D53gVBsTF7cQVStWIUYYG1wNBPEonu5MQHFPec17G
vA7mrUBHbMR5MrHnAvv+iFfJLgpnFMWNTxUkHReElI2nJnVLUFESmK7YsQFTlSMLE6FuMhxaSIzm
sYzgRrYTr8mRgrlZ0UxrFseeQHgm3L97SnGtNeJtcGF5RFKCJGzgmhV1gSFyyTKu5KM89bMM3qT1
cijmCSCt775ZNSChOViDgHMGUpejkrCQXlpBZ1WjShVLsFuYnBwL0rFXkATIeBEZLLRKDdQLAFNo
9eR4jgYwW61P915usmpTlWlpOHqzKDhnHAcBWuC86lETaLVSES59SkDE7FufLYipiajf1UUAno1g
HOKDnDrAYPYF3orDm5VWnTGS1UuxjhEDtQxy5cgsrAimBlbrGI21ZZ79yPvAatAYKYBzwvnAq3bC
xk+efyUUKhaQvCcgx2qYT18APoBqWkVabVBvAwk1iVEDJh45q9KgGZK6t5LQ1VEwbL4m4+oLmZK6
1SCLSTJpB1DyKKQuExBgmcipeFK3oD41rrLFQKyC7CxU+eSCc0/uAGZYKVHJVTzVOZsgGAsglpTs
1SVkVmBCqYD/i7kinChIY9DZEQA=


--===============1545621409==--