From: marko.makela
Date: December 1 2010 8:29am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3663 to 3664) Bug#58623
List-Archive: http://lists.mysql.com/commits/125611
X-Bug: 58623
Message-Id: <201012010829.oB17oL23021558@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2108524204=="

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

IDM2NjQgTWFya28gTcOka2Vsw6QJMjAxMC0xMi0wMQogICAgICBCdWcjNTg2MjM6IEJvZ3VzIGRl
YnVnIGFzc2VydGlvbiBmYWlsdXJlIGluIGlfc19sb2Nrc19yb3dfdmFsaWRhdGUoKQogICAgICAK
ICAgICAgVGhpcyBib2d1cyBhc3NlcnRpb24gd2FzIGludHJvZHVjZWQgaW4gdGhlIGZpeCBvZiBC
dWcgIzU3ODAyOgogICAgICBFbXB0eSBBU1NFUlRJT04gcGFyYW1ldGVyIHBhc3NlZCB0byB0aGUg
SEFTSF9TRUFSQ0ggbWFjcm8uCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi90cngvdHJ4MGlfcy5jCiAzNjYzIGtldmluLmxld2lzQG9yYWNsZS5jb20JMjAxMC0xMS0z
MAogICAgICBSQjovLzUxOCBhcHByb3ZlZCBieSBKaW1teSBZYW5nIGFuZCBTdW5ueSBiYWlucwog
ICAgICAgICAgCiAgICAgIENvZGUgY2xlYW51cCBhZnRlciBjaGFuZ2VzIGZvciBCdWcgNTY2Mjgu
ICBUaGUgZ2VuZXJhbCBhcHByb2FjaCBmb3IgCiAgICAgIElubm9EQiBpcyB0byBtYWtlIGEgcmVm
ZXJlbmNlIHRvIGVhY2ggZW51bSB2YWx1ZSB3aGVuZXZlciBpdCBpcyB1c2VkIGluIGEKICAgICAg
c3dpdGNoIHN0YXRlbWVudC4gIEluIGFkZGl0aW9uLCBubyBkZWZhdWx0IGNhc2Ugc2hvdWxkIGJl
IHVzZWQgZm9yIHN3aXRjaCAKICAgICAgc3RhdGVtZW50cyBvbiBlbnVtIHR5cGVzLiAgVGhpcyBh
c3N1cmVzIHRoYXQgaWYgdGhlcmUgaXMgZXZlciBhbnkgY2hhbmdlIAogICAgICBpbiB0aGUgZW51
bSB2YWx1ZXMsIHRoZSBzd2l0Y2ggd2lsbCBuZWVkIHRvIGNoYW5nZSB0byByZWZsZWN0IGl0IHNp
bmNlIGEgCiAgICAgIGNvbXBpbGVyIHdhcm5pbmcgd2lsbCBvY2N1ci4gIEluIHRoaXMgY2FzZSwg
dGhlIGVudW0gcm93X3R5cGUgaXMgZGVjbGFyZWQgCiAgICAgIGluIGhhbmRsZXIuaCBhbmQgY291
bGQgYmUgY2hhbmdlZCBmb3IgYW5vdGhlciBzdG9yYWdlIGVuZ2luZS4gIElmIHNvLCBhIAogICAg
ICB3YXJuaW5nIHdpbGwgb2NjdXIgaW4gdGhlIElubm9EQiBidWlsZC4gIAogICAgICAKICAgICAg
T3RoZXIgY2hhbmdlczsKICAgICAgKiBUaGlzIHBhdGNoIHVzZXMgMiBtYWNyb3MgdG8gaGVscCBj
b25zb2xpZGF0ZSB3YXJuaW5nIG1lc3NhZ2VzIHRoYXQKICAgICAgICAgbmVlZCB0byBvY2N1ciB0
d2ljZSBpbiB0aGUgc2luZ2xlIHN3aXRjaCBmb3Igcm93X2Zvcm1hdC4KICAgICAgKiBVc2luZyBy
b3dfZm9ybWF0IGFzIHRoZSB2YXJpYWJsZSBuYW1lIHRvIGRpc3Rpbmd1aXNoIGl0IGZyb20gdGhl
IGVudW0KICAgICAgICB0eXBlLgogICAgICAqIEZ1bmN0aW9uIGRlY2xhcmF0aW9uIGZvcm1hdCBj
b3JyZWN0aW9uLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaGFu
ZGxlci9oYV9pbm5vZGIuY2MKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdp
bi90cngvdHJ4MGlfcy5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vdHJ4L3RyeDBpX3Mu
YwlyZXZpZDprZXZpbi5sZXdpc0BvcmFjbGUuY29tLTIwMTAxMTMwMTYwMzU1LWt6amVnZmg5cG5k
NnBiYzMKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3RyeC90cngwaV9zLmMJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEyMDEwODAzNTMtMmkycXlwMGlhcnMzbnQxaQpAQCAt
NDM1LDcgKzQzNSw3IEBAIGlfc19sb2Nrc19yb3dfdmFsaWRhdGUoCiAJCS8qIHJlY29yZCBsb2Nr
ICovCiAJCXV0X2FkKCFzdHJjbXAoIlJFQ09SRCIsIHJvdy0+bG9ja190eXBlKSk7CiAJCXV0X2Fk
KHJvdy0+bG9ja19pbmRleCAhPSBOVUxMKTsKLQkJdXRfYWQocm93LT5sb2NrX2RhdGEgIT0gTlVM
TCk7CisJCS8qIHJvdy0+bG9ja19kYXRhID09IE5VTEwgaWYgYnVmX3BhZ2VfdHJ5X2dldCgpID09
IE5VTEwgKi8KIAkJdXRfYWQocm93LT5sb2NrX3BhZ2UgIT0gVUxJTlRfVU5ERUZJTkVEKTsKIAkJ
dXRfYWQocm93LT5sb2NrX3JlYyAhPSBVTElOVF9VTkRFRklORUQpOwogCX0KCg==

--===============2108524204==
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: 768bb3ef8645a0263020f4c0ba6fdfc4d06d52cb
# timestamp: 2010-12-01 10:29:29 +0200
# base_revision_id: kevin.lewis@stripped\
#   kzjegfh9pnd6pbc3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWX1Rpy0AAZ9flEAwWnP/93tn
ngC////wBAAIAFADwbAbe1FWadwyRE2IQ2pgCap4TJkhp5T1PUep6gPRPUBJQmjTIMmpT9CmYoDQ
aANMgAADEgSn6o2UYahgmmhoNA0GhoYgA5piZMmjCYJiaYBMAhgjAjAJKaqe1EzU9T9RPCam1PUG
j0nqGgBkAAeoxrWpr7cideY4WWtFTkulICrq13Wqy/J3jTkaiIOsx/UET5FqRa1f1/LvP06V7Rm7
CFJsQ+7V0dYUxcKu/pzWpBvQZY2pTcG1XLnIUh20T9gwPGbPF5YJtXaewI2A/k+J7tNMfhsP7TUl
kby8kXuKADD23TwxxNgBlTOQAoDOUJgMxPOVmRuNAnl6oh71BBjR023dp4DiBdUDmySBGVAv4/ye
PfeWhOx7kEGVntgnLrcxhnDlBe5eAxNPFXpyw2bnE9zVXy6wOgUOJW/mERFIpztt5D7lrRwadSWP
PiKgu5J+Ap4yTDOzJA4tWaYQmuAdAqWyNGRYjauLso4WmS1HlVZaPVNzoduwT+Cant2y2dWeabrE
rExsDU0oszbK5pgy5RIzmnFl4yUk3O1Py6d7lNQJ2xWqaXmLFWcC4mZGmI+KxxFfqm2PL9OL8n52
l0ap5lUa1M2FJXGG/dR5keRSqzY8WNhTG9loUMnEGlGJCGgRMRvIVeY9lIsk3LXiE+r335Rlv0lC
enF00hREe4XvfTFRmTok/VnGsThrQ1aafibhVT6jc789rDgYDdyrmXOF4f5Ny6L4McQOp5i0z6AL
otPakWw6dqIHy3gLp6MU6HcwH1YAIgaoNYgDwnx5F4rR9LT7jc6SSwpVz0g4pgpmwwcQGDuwRJ6k
BrjWNuhxhb2GSJEjEzjkv4MaDlEJUs6N6pOJZRJEaxrYwK1po0rAPMUD6uGiDPfs12NjRUcZEuDj
bLfLjTDubqMehI/VQ3kBdQ3FDRNUp9qCcS1ilJC4CotMFsUhu0jXgoWHZZgBgHCY/zwcKxxYSKmA
rK1KVwTqgx5COI75TEnJ5YKOhY6mEmbbMb1Ocy4PM8AgOg4AZW+kNtELBUBpGncZANWTE+I2RVUO
JQPyCyBSgfOsoSBIwLM9IcWqMnzZ9jBLYxki7MAVeg0BNfsmp02W9Nzx41xgggijtRLjkKfS1dpN
Q/KCgHBFHf4cW2wAuChwpv9d4AzBwxGokRgSF6i+ERDiDVLelaIU8zAGbfwZLGYvIG6wBpJasyYi
WOwJUwIFBrtB9iTRBkZRJRU7KhARNoGBaN3iiqUMDCMgFIW1KZUSGa8Sy1hppnxqGBCE84jCy8Io
s/iO/lc9Z1ma8mM4XYT9JKSqlQpzOWcRMpmC4U7yYpV/+Iaf8XckU4UJB9UactA=


--===============2108524204==--