From: marko.makela
Date: January 17 2011 12:06pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3686)
List-Archive: http://lists.mysql.com/commits/128938
Message-Id: <201101171207.p0HBP4Km028018@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0768655697=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMTAxMTQxNzAyMjgtNzg4bDEz
NmhrZ3B5c2twdQoKIDM2ODYgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0xNwogICAgICBOb24tZnVu
Y3Rpb25hbCBjaGFuZ2VzLgogICAgICAKICAgICAgUmVtb3ZlIHRoZSB1bnVzZWQgZGF0YSB0eXBl
IGRpY3RfY2x1c3Rlcl90LgogICAgICBSZW1vdmUgYSBib2d1cyBjb21tZW50IGFib3V0IGxhdGNo
aW5nIG9yZGVyLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv
ZGljdDB0eXBlcy5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwcnNlZy5oCiAg
ICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2RpY3QwdHlwZXMuaAogICAgICBzdG9y
YWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS90cngwcnNlZy5oCj09PSBtb2RpZmllZCBmaWxlICdz
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvZGljdDB0eXBlcy5oJwotLS0gYS9zdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvZGljdDB0eXBlcy5oCXJldmlkOmppbW15LnlhbmdAb3JhY2xlLmNvbS0yMDEx
MDExNDE3MDIyOC03ODhsMTM2aGtncHlza3B1CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS9kaWN0MHR5cGVzLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMTcxMjA2
NDgtdGVsa2pzMDF0NzVrajltbgpAQCAtMTYsMTEgKzE2LDYgQEAgdHlwZWRlZiBzdHJ1Y3QgZGlj
dF9pbmRleF9zdHJ1Y3QJZGljdF9pbgogdHlwZWRlZiBzdHJ1Y3QgZGljdF90YWJsZV9zdHJ1Y3QJ
ZGljdF90YWJsZV90OwogdHlwZWRlZiBzdHJ1Y3QgZGljdF9mb3JlaWduX3N0cnVjdAlkaWN0X2Zv
cmVpZ25fdDsKIAotLyogQSBjbHVzdGVyIG9iamVjdCBpcyBhIHRhYmxlIG9iamVjdCB3aXRoIHRo
ZSB0eXBlIGZpZWxkIHNldCB0bwotRElDVF9DTFVTVEVSRUQgKi8KLQotdHlwZWRlZiBkaWN0X3Rh
YmxlX3QJCQlkaWN0X2NsdXN0ZXJfdDsKLQogdHlwZWRlZiBzdHJ1Y3QgaW5kX25vZGVfc3RydWN0
CQlpbmRfbm9kZV90OwogdHlwZWRlZiBzdHJ1Y3QgdGFiX25vZGVfc3RydWN0CQl0YWJfbm9kZV90
OwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDByc2Vn
LmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwcnNlZy5oCXJldmlkOmppbW15
LnlhbmdAb3JhY2xlLmNvbS0yMDExMDExNDE3MDIyOC03ODhsMTM2aGtncHlza3B1CisrKyBiL3N0
b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwcnNlZy5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTEwMTE3MTIwNjQ4LXRlbGtqczAxdDc1a2o5bW4KQEAgLTEyMSw5ICsxMjEsNyBA
QCBzdHJ1Y3QgdHJ4X3JzZWdfc3RydWN0ewogCXVsaW50CQlpZDsJLyogcm9sbGJhY2sgc2VnbWVu
dCBpZCA9PSB0aGUgaW5kZXggb2YKIAkJCQlpdHMgc2xvdCBpbiB0aGUgdHJ4IHN5c3RlbSBmaWxl
IGNvcHkgKi8KIAltdXRleF90CQltdXRleDsJLyogbXV0ZXggcHJvdGVjdGluZyB0aGUgZmllbGRz
IGluIHRoaXMKLQkJCQlzdHJ1Y3QgZXhjZXB0IGlkOyBOT1RFIHRoYXQgdGhlIGxhdGNoaW5nCi0J
CQkJb3JkZXIgbXVzdCBhbHdheXMgYmUga2VybmVsIG11dGV4IC0+Ci0JCQkJcnNlZyBtdXRleCAq
LworCQkJCXN0cnVjdCBleGNlcHQgaWQsIHdoaWNoIGlzIGNvbnN0YW50ICovCiAJdWxpbnQJCXNw
YWNlOwkvKiBzcGFjZSB3aGVyZSB0aGUgcm9sbGJhY2sgc2VnbWVudCBpcwogCQkJCWhlYWRlciBp
cyBwbGFjZWQgKi8KIAl1bGludAkJcGFnZV9ubzsvKiBwYWdlIG51bWJlciBvZiB0aGUgcm9sbGJh
Y2sgc2VnbWVudAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNs
dWRlL2RpY3QwdHlwZXMuaCcKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvZGlj
dDB0eXBlcy5oCXJldmlkOmppbW15LnlhbmdAb3JhY2xlLmNvbS0yMDExMDExNDE3MDIyOC03ODhs
MTM2aGtncHlza3B1CisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2RpY3QwdHlw
ZXMuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDExNzEyMDY0OC10ZWxranMw
MXQ3NWtqOW1uCkBAIC0zMywxMSArMzMsNiBAQCB0eXBlZGVmIHN0cnVjdCBkaWN0X2luZGV4X3N0
cnVjdAlkaWN0X2luCiB0eXBlZGVmIHN0cnVjdCBkaWN0X3RhYmxlX3N0cnVjdAlkaWN0X3RhYmxl
X3Q7CiB0eXBlZGVmIHN0cnVjdCBkaWN0X2ZvcmVpZ25fc3RydWN0CWRpY3RfZm9yZWlnbl90Owog
Ci0vKiBBIGNsdXN0ZXIgb2JqZWN0IGlzIGEgdGFibGUgb2JqZWN0IHdpdGggdGhlIHR5cGUgZmll
bGQgc2V0IHRvCi1ESUNUX0NMVVNURVJFRCAqLwotCi10eXBlZGVmIGRpY3RfdGFibGVfdAkJCWRp
Y3RfY2x1c3Rlcl90OwotCiB0eXBlZGVmIHN0cnVjdCBpbmRfbm9kZV9zdHJ1Y3QJCWluZF9ub2Rl
X3Q7CiB0eXBlZGVmIHN0cnVjdCB0YWJfbm9kZV9zdHJ1Y3QJCXRhYl9ub2RlX3Q7CiAKCj09PSBt
b2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS90cngwcnNlZy5oJwot
LS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS90cngwcnNlZy5oCXJldmlkOmppbW15
LnlhbmdAb3JhY2xlLmNvbS0yMDExMDExNDE3MDIyOC03ODhsMTM2aGtncHlza3B1CisrKyBiL3N0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3RyeDByc2VnLmgJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMTAxMTcxMjA2NDgtdGVsa2pzMDF0NzVrajltbgpAQCAtMTM1LDkgKzEz
NSw3IEBAIHN0cnVjdCB0cnhfcnNlZ19zdHJ1Y3R7CiAJdWxpbnQJCWlkOwkvKiE8IHJvbGxiYWNr
IHNlZ21lbnQgaWQgPT0gdGhlIGluZGV4IG9mCiAJCQkJaXRzIHNsb3QgaW4gdGhlIHRyeCBzeXN0
ZW0gZmlsZSBjb3B5ICovCiAJbXV0ZXhfdAkJbXV0ZXg7CS8qITwgbXV0ZXggcHJvdGVjdGluZyB0
aGUgZmllbGRzIGluIHRoaXMKLQkJCQlzdHJ1Y3QgZXhjZXB0IGlkOyBOT1RFIHRoYXQgdGhlIGxh
dGNoaW5nCi0JCQkJb3JkZXIgbXVzdCBhbHdheXMgYmUga2VybmVsIG11dGV4IC0+Ci0JCQkJcnNl
ZyBtdXRleCAqLworCQkJCXN0cnVjdCBleGNlcHQgaWQsIHdoaWNoIGlzIGNvbnN0YW50ICovCiAJ
dWxpbnQJCXNwYWNlOwkvKiE8IHNwYWNlIHdoZXJlIHRoZSByb2xsYmFjayBzZWdtZW50IGlzCiAJ
CQkJaGVhZGVyIGlzIHBsYWNlZCAqLwogCXVsaW50CQl6aXBfc2l6ZTsvKiBjb21wcmVzc2VkIHBh
Z2Ugc2l6ZSBvZiBzcGFjZQoK

--===============0768655697==
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: 551a34753d95058157948e17f741142e83c431bd
# timestamp: 2011-01-17 14:06:57 +0200
# base_revision_id: jimmy.yang@stripped\
#   788l136hkgpyskpu
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUNGrf0AA5HflEAwUnf/91MD
EAC//9/wBAAIAFAF/uSkgAS0Kpt7uaNhJSKep6aaYU81GU8o9I9Gg0TTCGRiGAAAAAAAAAAASKBT
ARqntEn6JlNqaeoYmTRoA9QNqlPU0yNNGJkAAGgNAAACqKAEMTTU9NTU0zUnqek1H5Uaeo0Damki
hi46Obtmk+/3fB43o7dvGrXtjkKsqIhcvabJ1WPQ6QjD7mQdwbwbbbbaNXklOVK4O+CL4uCwdsKT
lN0cXf01+Nvh9fwvnOYw9P7EluIbQ9PzBAXcJ9nNtrgKzpuVbftd7hXKFpoRJ+faXRyF48x/qIj/
Itj5jMUikcnXPTesisZ04VzxAM92gbGNj60KxdxaGwHGoKEgWUkzDKCd/fKYiKoiPoJtI2jXBVSP
cW1tugpI83hlF8kxjWpoKHJUmhXTU9PjiLvwjxFrK2iSax99cgLUlZl7O07NZzvSVw1ewU6QA1nU
C2FDkAy+ksO2m26JaqzA0TAjULzUljCbf8u+VnDm8M33RtHYWkZN/XNtFWljkoKENLFjq3luRTxi
IwuItSs8s7o8XVZdMFqyhd0pyYRvyFu2lERc+JmYmZn9SG/oL2mji4pMFeSpjc5qbDYTGk1rYSi5
Q4OCsUbilUwtcfK0XVzDSbcKIrExSJjdqM2A5scZqItc5/cm+G4uW2aOahOM9d5trYsWubyhxcIk
XVLOdY2YJdNONRDWim3lTxomrO+zLFWxV75sVeLIjTTPm1XdeGVw15q9WWiNRW5iaGsUTeKoiF0X
u1YzVLWfNS5qh6EUq2Tn1jLppojR1ZKFngnjq0myMBWRZwGxtcz2dNMnluvNM+lNKzbTBxiea9qO
UErBT1ooak59BkrtGDLhev021/6RtwujvTHeZooXXyraVcuk1VxywkikBOp0RalVIqK4wqbGMY14
o3U39UMwIKDHzCMTLkHfgC7lxQqXDY02P7QmCM8HMxitKXKYj9Peoe11G541o4SdBil3eb0hFTId
sVT5lkAHDyYPlkzyVKE25gY/BXqd0liSOcCiOOlHtqNh16PpvIveDu2dWGD6vUeq/5a+kekIvFyq
5kvYZONjliMRQYDN9RS5jlZELH490aPh3d52ofPOqQpI/HuFl0sFsRZzUPH1pc91DrZStRaid1UG
Lwcez9bxuK4qyBUVmfD6gaDB+hsI7kSy7nbgc0yAnQR5kxsnqR7bt9K/lXulx/mfYw5R+UqMjGIz
pbd+/Ti8lA/SW2Ya1mjCK0j0sf+3DchZATOpTcixMFMNK8BHlqlHZ9ODCI/JdBTvwHcUfJQfR3Nu
qhX2PmqVqYL1kJ/OGUP3PsZnzl9H2p80TGQnzj6+o4jAZwEPOyB0HtWCUy7f1jvySxMe9A6pI2gn
DivG8E1KLFB1onealDmITOla8F8QKBMBUNSGMV4R5iLITpFNItoHx24TjGg5QElDiSgCRbURr8W2
QiruHeEfs/rCTw7ZxxOtWKisguYK0pRFETaKGYQCCWIUUwWppSnAkHCYlHOhMsQSYpwXZvEtGHlk
IOmgDjEmfQEsYRPk7SF+MfTsjEmIaLrSYh6JyNRnAkaJ4AuTikU4XIpymJUWmN3gKk5iQ1fqJIPg
CnyjPYLA3MLgrSYa1WfFhWbyypLoNETF7j1FI2yF5gqQkHoBHFOGoFfLYBzdNmWkt0JWgyJEe57L
K0bYbo2rciNY81KIs4+WFuWhKmN4iwdTyGgmLCMmJQgJYhTJ78q/f+LuSKcKEgho1b+g


--===============0768655697==--