From: marko.makela
Date: January 25 2011 10:17am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3691) Bug#59486
List-Archive: http://lists.mysql.com/commits/129531
X-Bug: 59486
Message-Id: <201101251017.p0PA2Hgt018938@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2089334971=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyNTA5NTQ1MC1jbWU1
eW5lem9pdnlncjh0CgogMzY5MSBNYXJrbyBNw6RrZWzDpAkyMDExLTAxLTI1CiAgICAgIEJ1ZyM1
OTQ4NiBJbmNvcnJlY3QgdXNhZ2Ugb2YgVU5JVl9VTkxJS0VMWSgpIGluIG1sb2dfcGFyc2Vfc3Ry
aW5nKCkKICAgICAgCiAgICAgIG1sb2dfcGFyc2Vfc3RyaW5nKCk6IEVuY2xvc2UgdGhlIGNvbXBh
cmlzb24gaW4gVU5JVl9VTkxJS0VMWSwKICAgICAgbm90IHRoZSBjb21wYXJhbmQuCgogICAgbW9k
aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cKICAgICAgc3RvcmFn
ZS9pbm5vZGJfcGx1Z2luL210ci9tdHIwbG9nLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFu
Z2VMb2cJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMjUwOTU0NTAtY21lNXlu
ZXpvaXZ5Z3I4dAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTI1MTAxNzI4LTVtMjJxcnc1NTU4cGltajAKQEAg
LTEsNSArMSwxMCBAQAogMjAxMS0wMS0yNQlUaGUgSW5ub0RCIFRlYW0KIAorCSogbXRyL210cjBs
b2cuYzoKKwlCdWcjNTk0ODYgSW5jb3JyZWN0IHVzYWdlIG9mIFVOSVZfVU5MSUtFTFkoKSBpbiBt
bG9nX3BhcnNlX3N0cmluZygpCisKKzIwMTEtMDEtMjUJVGhlIElubm9EQiBUZWFtCisKIAkqIHJv
dy9yb3cwdmVycy5jOgogCUZpeCBCdWcjNTk0NjQgUmFjZSBjb25kaXRpb24gaW4gcm93X3ZlcnNf
YnVpbGRfZm9yX3NlbWlfY29uc2lzdGVudF9yZWFkCiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9kYl9wbHVnaW4vbXRyL210cjBsb2cuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1
Z2luL210ci9tdHIwbG9nLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMjUw
OTU0NTAtY21lNXluZXpvaXZ5Z3I4dAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vbXRyL210
cjBsb2cuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyNTEwMTcyOC01bTIy
cXJ3NTU1OHBpbWowCkBAIC00MDgsNyArNDA4LDcgQEAgbWxvZ19wYXJzZV9zdHJpbmcoCiAJcHRy
ICs9IDI7CiAKIAlpZiAoVU5JVl9VTkxJS0VMWShvZmZzZXQgPj0gVU5JVl9QQUdFX1NJWkUpCi0J
CQl8fCBVTklWX1VOTElLRUxZKGxlbiArIG9mZnNldCkgPiBVTklWX1BBR0VfU0laRSkgeworCSAg
ICB8fCBVTklWX1VOTElLRUxZKGxlbiArIG9mZnNldCA+IFVOSVZfUEFHRV9TSVpFKSkgewogCQly
ZWN2X3N5cy0+Zm91bmRfY29ycnVwdF9sb2cgPSBUUlVFOwogCiAJCXJldHVybihOVUxMKTsKCg==

--===============2089334971==
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.1-innodb/
# testament_sha1: 605d63f135efd4bead65be4c0063a9013c4d7bae
# timestamp: 2011-01-25 12:17:36 +0200
# base_revision_id: marko.makela@stripped\
#   cme5ynezoivygr8t
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYj69QgAAlNflEAwWn//93+v
TzC////8BAAIAFAEuTwANtQiAISSQTU9Rp4pgNRkabTKDQ0AADQaBoHGTJoxDE0wEDAmmCMExNNN
ABhBompo1DTRqMj9U/SnoQDAEAGNGoaBjUxxkyaMQxNMBAwJpgjBMTTTQAYQSSCaaNARpoptBoSN
qGJsiNNMgA0wgiFYjPkmh4nSs2qE7Rm9JGU6UQECKQAuVa4ba2WoEEicJWak/GKwqgzMzJJgPp59
qgrnqIhv1keefOhjliZt52kUSwh6aMz+AYpuFYq+HkEz7Faxh29caK7An5uBJ5koTOayiPkfPMbC
7IUsSc7qIYZZBYf3fBP+4tQC0KyDhc2tX9t0QtlLYHiQujrQomZXOo37/eW3VpHc6CvCDiMPf3Hh
BwlyFFCMsb2t8m6Yn+eyD0TghlKUCI+F1BZBgEZuKhouh6Wj43QBfXaB2/4Z+aZWhbpxqgIJtyz3
bvlvDzLkNnHup3lv4F7LLADdnecOGJA2RHClgHHWrhMo3i8GBOlP6APXrVcClxLBJ+TIqk3rQXcU
S1leBYYjbGMXCnNuoVjPq4SsWDVYqg8mmsExyKtSl7y2oOht6qUzQTFVLpnx45hshUEqDgMtnTOQ
YFxaPPmA8DpDlK24UQPYV1PREmWRLhVGYEA0jgajsn4R1MM9nNqLAYrwB5aLFausp0vAvFjuksJC
cQKUC0wHGmRDF92gDhQxrjoKRFPL7HW7Sh5NM7wOYMtt2WAnv4mwT8OVhuGmGJLQ27ZDFNpaTsiX
+i2sq7WVzTwTn0yaVEHIT6gDYaypkIHmKpF0E7DLGRsM74RDd0iDq4BETSC9/GPVZmZhuXk2vI1d
v7i9Q9JpEGb2DOj4gWcHglCNYR+CD5Ds2Q4K0WA3ymwT6G53OR+K9ntgEF1PCoYqxJVbhdcZELS7
8pjiMnGhQ8RMnkbyFzQWizAjNW2IPjNCcmXfQX2m4kMbDzDC0ia7+sPDypMbaCaOp9kol1/ec4Fz
z0ipecRXChdifONDm4srXMhO+4KIWX0kDaas6zd02v3EQiEh3q0MitDei3AWMxc6lV0rsO0yckuP
ZDicw/JrivkHaMZa1MOsVBkVlqV9GsYy9Ls37EjPzukwtPnceIlYrrvTA1F2vav2lfnH9JEKJgfv
lOmJrdxTlsWCCjApFH+GIoJGMdZoVSQJyVCcmRmCUti0LHcI4FXQ8bN406sqGgnUwnHOBsDki2xV
/zuwjmjqXJFfVvCJ1vA02puCF8NyJiWoTRNyA4laEwZTw49QXqU+iyvEF3AN3IWgfkeVMO37FQJk
My9gOYzpUxUvaosUphMkw3BgkTDv8B1SI+MHA9dG9VQ5zGgnsDLr6hJ8TS9elcyXIN4B02ofI/hC
7UXKR2vU6aWHFr3cXDA7sTKPeBZuq86DhcBou8JiDvCO0ZKvhgq8LFUkppz7nkFF0V+4Dk9PvN74
cbldqz2KG1DFi+pnzIoimLn2bzWDH+hfqnNbsDgxKeVCaLFwAcnPUHBhj6jZFStKbJrLNFVoVgPR
2uXYHkDTFZiVJTGiX7/f4sdf+LuSKcKEhEfXqEA=


--===============2089334971==--