From: marko.makela
Date: June 2 2010 10:19am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3493)
List-Archive: http://lists.mysql.com/commits/109918
Message-Id: <201006021020.o52ACZtl024624@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2143115564=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMTEzNTgwMi1oZ3Bs
Y3ByODA4OXVyYThnCgogMzQ5MyBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTAyCiAgICAgIGZpbF9w
cmludF9vcnBoYW5lZF90YWJsZXNwYWNlcygpOiBVbnVzZWQgZnVuY3Rpb24sIHJlbW92ZS4KCiAg
ICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2ZpbC9maWwwZmlsLmMKICAg
ICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvZmlsMGZpbC5oCj09PSBtb2RpZmllZCBm
aWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vZmlsL2ZpbDBmaWwuYycKLS0tIGEvc3RvcmFnZS9p
bm5vZGJfcGx1Z2luL2ZpbC9maWwwZmlsLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMDA2MDExMzU4MDItaGdwbGNwcjgwODl1cmE4ZworKysgYi9zdG9yYWdlL2lubm9kYl9wbHVn
aW4vZmlsL2ZpbDBmaWwuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMjEw
MTk0MC02MHgzMnhpaXZ0cWo5dmExCkBAIC0zNTQyLDM5ICszNTQyLDYgQEAgbmV4dF9kYXRhZGly
X2l0ZW06CiAJcmV0dXJuKGVycik7CiB9CiAKLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKLUlmIHdlIG5lZWQg
Y3Jhc2ggcmVjb3ZlcnksIGFuZCB3ZSBoYXZlIGNhbGxlZAotZmlsX2xvYWRfc2luZ2xlX3RhYmxl
X3RhYmxlc3BhY2VzKCkgYW5kIGRpY3RfbG9hZF9zaW5nbGVfdGFibGVfdGFibGVzcGFjZXMoKSwK
LXdlIGNhbiBjYWxsIHRoaXMgZnVuY3Rpb24gdG8gcHJpbnQgYW4gZXJyb3IgbWVzc2FnZSBvZiBv
cnBoYW5lZCAuaWJkIGZpbGVzCi1mb3Igd2hpY2ggdGhlcmUgaXMgbm90IGEgZGF0YSBkaWN0aW9u
YXJ5IGVudHJ5IHdpdGggYSBtYXRjaGluZyB0YWJsZSBuYW1lCi1hbmQgc3BhY2UgaWQuICovCi1V
TklWX0lOVEVSTgotdm9pZAotZmlsX3ByaW50X29ycGhhbmVkX3RhYmxlc3BhY2VzKHZvaWQpCi0v
Kj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KLXsKLQlmaWxfc3BhY2VfdCoJc3Bh
Y2U7Ci0KLQltdXRleF9lbnRlcigmZmlsX3N5c3RlbS0+bXV0ZXgpOwotCi0Jc3BhY2UgPSBVVF9M
SVNUX0dFVF9GSVJTVChmaWxfc3lzdGVtLT5zcGFjZV9saXN0KTsKLQotCXdoaWxlIChzcGFjZSkg
ewotCQlpZiAoc3BhY2UtPnB1cnBvc2UgPT0gRklMX1RBQkxFU1BBQ0UgJiYgc3BhY2UtPmlkICE9
IDAKLQkJICAgICYmICFzcGFjZS0+bWFyaykgewotCQkJZnB1dHMoIklubm9EQjogV2FybmluZzog
dGFibGVzcGFjZSAiLCBzdGRlcnIpOwotCQkJdXRfcHJpbnRfZmlsZW5hbWUoc3RkZXJyLCBzcGFj
ZS0+bmFtZSk7Ci0JCQlmcHJpbnRmKHN0ZGVyciwgIiBvZiBpZCAlbHUgaGFzIG5vIG1hdGNoaW5n
IHRhYmxlIGluXG4iCi0JCQkJIklubm9EQjogdGhlIElubm9EQiBkYXRhIGRpY3Rpb25hcnkuXG4i
LAotCQkJCSh1bG9uZykgc3BhY2UtPmlkKTsKLQkJfQotCi0JCXNwYWNlID0gVVRfTElTVF9HRVRf
TkVYVChzcGFjZV9saXN0LCBzcGFjZSk7Ci0JfQotCi0JbXV0ZXhfZXhpdCgmZmlsX3N5c3RlbS0+
bXV0ZXgpOwotfQotCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFJldHVybnMgVFJVRSBpZiBhIHNpbmdsZS10
YWJsZSB0YWJsZXNwYWNlIGRvZXMgbm90IGV4aXN0IGluIHRoZSBtZW1vcnkgY2FjaGUsCiBvciBp
cyBiZWluZyBkZWxldGVkIHRoZXJlLgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9pbmNsdWRlL2ZpbDBmaWwuaCcKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2lu
Y2x1ZGUvZmlsMGZpbC5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAxMTM1
ODAyLWhncGxjcHI4MDg5dXJhOGcKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUv
ZmlsMGZpbC5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAyMTAxOTQwLTYw
eDMyeGlpdnRxajl2YTEKQEAgLTUwNiwxNiArNTA2LDYgQEAgVU5JVl9JTlRFUk4KIHVsaW50CiBm
aWxfbG9hZF9zaW5nbGVfdGFibGVfdGFibGVzcGFjZXModm9pZCk7CiAvKj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ki8KLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKLUlmIHdlIG5lZWQgY3Jh
c2ggcmVjb3ZlcnksIGFuZCB3ZSBoYXZlIGNhbGxlZAotZmlsX2xvYWRfc2luZ2xlX3RhYmxlX3Rh
Ymxlc3BhY2VzKCkgYW5kIGRpY3RfbG9hZF9zaW5nbGVfdGFibGVfdGFibGVzcGFjZXMoKSwKLXdl
IGNhbiBjYWxsIHRoaXMgZnVuY3Rpb24gdG8gcHJpbnQgYW4gZXJyb3IgbWVzc2FnZSBvZiBvcnBo
YW5lZCAuaWJkIGZpbGVzCi1mb3Igd2hpY2ggdGhlcmUgaXMgbm90IGEgZGF0YSBkaWN0aW9uYXJ5
IGVudHJ5IHdpdGggYSBtYXRjaGluZyB0YWJsZSBuYW1lCi1hbmQgc3BhY2UgaWQuICovCi1VTklW
X0lOVEVSTgotdm9pZAotZmlsX3ByaW50X29ycGhhbmVkX3RhYmxlc3BhY2VzKHZvaWQpOwotLyo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSovCiAvKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFJldHVy
bnMgVFJVRSBpZiBhIHNpbmdsZS10YWJsZSB0YWJsZXNwYWNlIGRvZXMgbm90IGV4aXN0IGluIHRo
ZSBtZW1vcnkgY2FjaGUsCiBvciBpcyBiZWluZyBkZWxldGVkIHRoZXJlLgoK

--===============2143115564==
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: 96903f18e520fc35903bee3ff4bc068e1abab2b5
# timestamp: 2010-06-02 13:19:58 +0300
# base_revision_id: marko.makela@stripped\
#   hgplcpr8089ura8g
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQGlVJ0AAifflAAQUmf/91MC
AgC///9wBAAIAFAEBz3ooe3nIPdrkJJTQp4EyNM0j0iZohPUPUD1PU8phoomn6KMTaIGhiNGQPUD
RpowkimI0NKep6TRpp6Q0DQAAARUSGnpQ/UNTR6jRhMIaeoxBoYJKamRkxAEU9pEGmho9QAAq1PX
X45aTCWJa77MKlHLElgP0OljiintKh4zMzLr0X8jlrrZ1rDmjTRt5uy6HXx9i07Mb2Su0XbWaj9W
aTYc0EYJgbpeIv5n6PLJvH6R4DMCY0jA0NOXDi7tMitrVg+AtJiKr94oUuZQIzoJwUjNGxsG4h6o
J4FhgWCkMCzMiEFBnA5RkNAp9ZP9otBbSgEjFGLM63MbLULbgBedPLQ6Jw0E1CLipfOyprpVYVDs
qH4rD4ikctfT7MQKlRwnYGzP682XRCoMByLal8eG25NiYcuBRM7UXdnDndhEJRYDqt6Y1PD+AS0W
CmTiLKg5PE7uOJxtNi4RYtWkMtJExhaaNlZK256jJcWoUq8jeGwIGRSeaMr9cDO6QnLOthfkJxsW
NFLghfk1qRmBnbtoSkaiysNdQqaiiWGqxL49R4sFdJidwEa3jaDKrgqczaeRAdqUwYjV1BRey1Fz
UYDk8zcXS2JJ9IYtG0yTjbEUyDix6ePFEDEeaPLaxYmblAovgAatcQKBiQmbzAUDpI4AaG8SiCKO
EE0tFMQxC4c6irk5zdQWoSusZkzN6PARnQpBmvZD6u/ucFmXhJ8gqXZ16xQMT1WgS81aPoSCWmFQ
2qNGIlzvJ47tlKXaZAcvYsFw4TYZjyQWZrN1E2XxxSYrF0n6DgbACygqhQVRPHn9w6cM5wkywEsu
9WYmfdubl9obGRDAiDyGPeRRP5eQtFa8ppyF3KUtC9MJZsReNhO4zI4mjL5DSbyywzaKknRxo2vf
uIbsZ2ylkqZndoj8JLmGKYH367YaYXvJ0eiIpxe2A2556jYCcQgq13UgmPqw3Luczob2IxvcpE2a
zWJtFtmuVK37DIgWS+ENJBfkDESHF2C4Irmp7Ptkn1I4o4ZAOOPkDG8TZCXh6LUlOktgUIoiCiAu
RiSFgGyrDbUSpZWi5hcacDSwI2SekqwNM7YxV5KIsyNSwZDwfXAT8M07JmD9dcuxJSaLklILi47i
W9EyhtcrNZC69hgco6PuprrFTNSBp4FWq1akGdJJWZ1Ky2ckl2E1dGNUmgJk74vfMPNE3Q4uDxuV
oqc9hmXiEaNLIOt2PKZvJE14AOeKDBl5Gc10LRS+ai4CjLVF4HMD4AWIsWORJOQ/inv/i7kinChI
ANKqToA=


--===============2143115564==--