From: marko.makela
Date: January 17 2011 12:13pm
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3285)
List-Archive: http://lists.mysql.com/commits/128944
Message-Id: <201101171214.p0HAiDqS019328@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0054016319=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMTAxMTUwNzI0NDctZ2NkN2Jz
YjFuanYyMTJiYwoKIDMyODUgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0xNyBbbWVyZ2VdCiAgICAg
IE1lcmdlIGZyb20gbXlzcWwtNS4xLWlubm9kYiB0byBteXNxbC01LjUtaW5ub2RiLgoKICAgIG1v
ZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvZGljdDB0eXBlcy5oCiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwcnNlZy5oCj09PSBtb2RpZmllZCBmaWxlICdz
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvZGljdDB0eXBlcy5oJwotLS0gYS9zdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvZGljdDB0eXBlcy5oCXJldmlkOmppbW15LnlhbmdAb3JhY2xlLmNvbS0yMDEx
MDExNTA3MjQ0Ny1nY2Q3YnNiMW5qdjIxMmJjCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS9kaWN0MHR5cGVzLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMTcxMjEx
NDMtM3BmbmI1ZjRudHdibm1qMApAQCAtMzMsMTEgKzMzLDYgQEAgdHlwZWRlZiBzdHJ1Y3QgZGlj
dF9pbmRleF9zdHJ1Y3QJZGljdF9pbgogdHlwZWRlZiBzdHJ1Y3QgZGljdF90YWJsZV9zdHJ1Y3QJ
ZGljdF90YWJsZV90OwogdHlwZWRlZiBzdHJ1Y3QgZGljdF9mb3JlaWduX3N0cnVjdAlkaWN0X2Zv
cmVpZ25fdDsKIAotLyogQSBjbHVzdGVyIG9iamVjdCBpcyBhIHRhYmxlIG9iamVjdCB3aXRoIHRo
ZSB0eXBlIGZpZWxkIHNldCB0bwotRElDVF9DTFVTVEVSRUQgKi8KLQotdHlwZWRlZiBkaWN0X3Rh
YmxlX3QJCQlkaWN0X2NsdXN0ZXJfdDsKLQogdHlwZWRlZiBzdHJ1Y3QgaW5kX25vZGVfc3RydWN0
CQlpbmRfbm9kZV90OwogdHlwZWRlZiBzdHJ1Y3QgdGFiX25vZGVfc3RydWN0CQl0YWJfbm9kZV90
OwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDByc2Vn
LmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwcnNlZy5oCXJldmlkOmppbW15
LnlhbmdAb3JhY2xlLmNvbS0yMDExMDExNTA3MjQ0Ny1nY2Q3YnNiMW5qdjIxMmJjCisrKyBiL3N0
b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwcnNlZy5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTEwMTE3MTIxMTQzLTNwZm5iNWY0bnR3Ym5tajAKQEAgLTE0MSw5ICsxNDEsNyBA
QCBzdHJ1Y3QgdHJ4X3JzZWdfc3RydWN0ewogCXVsaW50CQlpZDsJLyohPCByb2xsYmFjayBzZWdt
ZW50IGlkID09IHRoZSBpbmRleCBvZgogCQkJCWl0cyBzbG90IGluIHRoZSB0cnggc3lzdGVtIGZp
bGUgY29weSAqLwogCW11dGV4X3QJCW11dGV4OwkvKiE8IG11dGV4IHByb3RlY3RpbmcgdGhlIGZp
ZWxkcyBpbiB0aGlzCi0JCQkJc3RydWN0IGV4Y2VwdCBpZDsgTk9URSB0aGF0IHRoZSBsYXRjaGlu
ZwotCQkJCW9yZGVyIG11c3QgYWx3YXlzIGJlIGtlcm5lbCBtdXRleCAtPgotCQkJCXJzZWcgbXV0
ZXggKi8KKwkJCQlzdHJ1Y3QgZXhjZXB0IGlkLCB3aGljaCBpcyBjb25zdGFudCAqLwogCXVsaW50
CQlzcGFjZTsJLyohPCBzcGFjZSB3aGVyZSB0aGUgcm9sbGJhY2sgc2VnbWVudCBpcwogCQkJCWhl
YWRlciBpcyBwbGFjZWQgKi8KIAl1bGludAkJemlwX3NpemU7LyogY29tcHJlc3NlZCBwYWdlIHNp
emUgb2Ygc3BhY2UKCg==

--===============0054016319==
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: 094229a42bc6e9b151d38dac7d72c23ffe3eaec9
# timestamp: 2011-01-17 14:13:46 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: jimmy.yang@stripped\
#   gcd7bsb1njv212bc
# 
# Begin bundle
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


--===============0054016319==--