From: marko.makela
Date: February 17 2011 8:29pm
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3325)
List-Archive: http://lists.mysql.com/commits/131583
Message-Id: <201102172030.p1HK77fp003575@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1217695867=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMjE3MTcxNDQxLWtmcXIx
OGR3b2wycW96djcKCiAzMzI1IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDItMTcgW21lcmdlXQogICAg
ICBNZXJnZSBteXNxbC01LjEtaW5ub2RiIHRvIG15c3FsLTUuNS1pbm5vZGIuCgogICAgbW9kaWZp
ZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYwMDQ5LnRlc3QK
PT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYw
MDQ5LnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYwMDQ5
LnRlc3QJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDExMDIxNzE3MTQ0MS1rZnFyMThk
d29sMnFvenY3CisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYwMDQ5
LnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMTcyMDI3NTYtaHI4ODlh
cW10MTUydGZuMApAQCAtMTMsNyArMTMsNyBAQCBsZXQgJE1ZU1FMRF9EQVRBRElSPWBzZWxlY3Qg
QEBkYXRhZGlyYDsKIAogIyBTaHV0IGRvd24gdGhlIHNlcnZlcgogLS0gZXhlYyBlY2hvICJ3YWl0
IiA+ICRNWVNRTFRFU1RfVkFSRElSL3RtcC9teXNxbGQuMS5leHBlY3QKLS0tIHNodXRkb3duX3Nl
cnZlciAxMAorLS0gc2h1dGRvd25fc2VydmVyIDMwCiAtLSBzb3VyY2UgaW5jbHVkZS93YWl0X3Vu
dGlsX2Rpc2Nvbm5lY3RlZC5pbmMKIAogIyBDaGVjayB0aGUgdGFpbCBvZiBJRF9JTkQgKFNZU19U
QUJMRVMuSUQpCgo=

--===============1217695867==
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: 1fb9fb8c1591cfdcccf15fdd66dd3b7dc29dbaf2
# timestamp: 2011-02-17 22:29:30 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   kfqr18dwol2qozv7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcB5XoIAAx7flAAQWGP/93IC
AAC////wBAAIAFAFt7WcZhbZrobsFaSOEpKbRGgxManqZMg00DRpoABJQBNGjKnk00o8poAABkNB
IoAppHqm3pEj0npojaTT1AMQDAADQABk0AAAaASSTIJtE1T8TIxJtCZE1P0Uw0aihuYjD6eI40tb
XXlQUR9tqpQY9iUB5PB5g6jiEvaiw6EwwwyPHqLh+YE0rOCorY/B8wHwdU4uD6LGijzd8LZHXpSF
QmKHWLyOhgtiZljYLvYyk0Rb0HFuSNTZYcS+NbB+kkUnEz/RatwyRqPDcUG7VmYon6L9SkTlSTjN
Aqixt1SDAXI5lq4DW4jSsUJ1h7uHLRJqy/Y14xIUxpDdqQsSCSaQA6om8ziG0Zek5yNCiZKw0miV
rTiU87lTNwskMvUzQst/kTXAoVZzzySFI7zeGORnNCUSRyuSxtrOB0+dMyAvwrJ+hkVrtMg4hWEQ
ZZbGTkIkwm3aHYK8CVgcVUGOHUo6d1IQ8p6LdLRgSZJalXmkWzXBoySIFrh+uBCR6RQ66QMScxZK
8+fVejlHjX+dVBLehwOye1WEtU8xHpFyEohUYLOeg0iGBLvIZSTJZaPGjDLALjDriuNNoKmLV5nL
ZT58lF1+JYFKaPYlMIBuJt8CaRnsVIqFjXoxk8ixuNO7EuYhpd7gqmMW6RoJ1BNIqwwT8GulcG2R
8iT9oQoDGAT+MxZGl9fApa5Iqt03aFkV3YLZDu/cN7JGiLsR2DSXtbJFo9P8UQpiSMygs+lcyeVC
5Z/zDvJ1nDoMWmzNTE9b3kh9hKxmE9gRtJ7igfIGh3meE8BkqSLP2OHbnGPknKe0xKNoURCYjiep
/aHkBSsUUjsRtCA0pkl0EQmQEyo5hdKthkRcw4nIwXGaHkMND8HQyOYmQHKNDMMwMzfNUj044CkI
lY5KrisWDHBKlCiNkr7ZylECb7OWVoCQPtrgJB5EnSDv1MDAgVkbwjWI/pSkHETI9Dv0WORl14Vw
eSid5+UshPAmOOp8L6F5iH67D1MB2CRAjW7Eqt6npZeke88WOvI52MMgUh7oFQdj/bcOxPSXlJfU
jvOJxtgLFIsNx1KY/Zt4XCmSOy90iqJHNZepTHgRSF3Ednd1nU5nC9FSRGPHv6zWdvB6EFDMulqt
237cGZpZp3F/adC+BKVjs1plDwHB+UI+QfETBTuLt8T736jGpmQSYbYBqOFIa224n26O8iUslMhn
XQFWGp/DzPBYGjg7GSvcUJHp2PCQ4XNI4VoLR2bswOBZHWkUFkXClWE5SXk57CYlN4aJFIuAng8W
83pVTxb2PhmZx/NC8mKgOoGXMkPa8+9Z4M1xSD5LFwSyQjFI/J0FsA6rmolgLEEhRM0CYGex/tix
PCrSRQqkj8GQxp8JBvNDRMOBhzszcj3KR5cGZsHCePDaHI1T8XUPgDCJMsTSknoRIJHakYEQYmK3
M6MkGp1Jki3edNq4JCpAbwSqP0gVSTkc3CtxFE6LFSGG8YYT0iQJTCK2cpjfyUod1tXzmpZQzTWN
4SAD7FBGs8DAWu/GiEWRujsOaoTYxbon0K4KGXRqGaMcCK1i7AIljJjZPCoSKEme6fYc2DkNkDyQ
6A8yTiug7Cq4sDGgO2G7ibQfFKpJ7CdScc1f+3Cg8bivByVQqhUiiYgZQOi+xcQKkiCsX7XdLcmC
wmFwKhc+9CQSlBMj5dEn4JDufxdyRThQkMB5XoI=


--===============1217695867==--