From: Date: July 3 2009 12:04pm
Subject: bzr commit into mysql-5.1-telco-6.3 branch (magnus.blaudd:2993)
 Bug#45899
List-Archive: http://lists.mysql.com/commits/77868
X-Bug: 45899
Message-Id: <20090703100437.6C6E413405D@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_xvvRfKoqQsGXHQYghHZRwA)"

--Boundary_(ID_xvvRfKoqQsGXHQYghHZRwA)
MIME-version: 1.0
Content-type: text/plain; charset=utf-8
Content-transfer-encoding: BASE64
Content-disposition: inline

I0F0IGZpbGU6Ly8vaG9tZS9tc3ZlbnNzb24vbXlzcWwvNi4zLWJ1ZzQ1ODk5LyBi
YXNlZCBvbiByZXZpZDpqb25hc0BteXNxbC5jb20tMjAwOTA2MjMxODQzMDEtb25j
cnFmdjhkcmZpMXdrNw0KDQogMjk5MyBNYWdudXMgQmzDpXVkZAkyMDA5LTA3LTAz
DQogICAgICBCdWcjNDU4OTkgYXBpIG5vZGVzIChyZS0pY29ubmVjdGluZyB0byBz
dGFydGluZyBkYXRhIG5vZGVzIHRvbyBmYXN0IC4uLg0KICAgICAgIC0gVGhlIG5k
YmQgc3RhcnRzIHRvIGFjY2VwdCBpbmNvbWluZyBjb25uZWN0aW9ucyBmcm9tIG90
aGVyIG5vZGVzIHF1aXRlIGVhcmx5DQogICAgICAgICBpbiBzdGFydHVwLCBpbml0
aWFsbHkgb25seSBuZGJkIGFuZCBtZ20gbm9kZXMgYXJlIGFsbG93ZWQgdG8gY29u
bmVjdC4gRHVyaW5nDQogICAgICAgICB0aGlzIHRpbWUgYWxsIGFwaSBub2RlcyB3
aWxsIHF1aWNrbHkgYmUgZGlzY29ubmVjdGVkLCBzaW5jZSB0aGUgYXBpIG5vZGVz
DQogICAgICAgICB3aWxsIHJldHJ5IGNvbm5lY3QgcXVpdGUgcmFwaWRseSB0aGlz
IG1heSBleGhhdXN0IHRoZSBhdmFpbGFibGUgcG9ydHMgaW4gdGhlDQogICAgICAg
ICBtYWNoaW5lLg0KICAgICAgIC0gU2luY2UgYWxsIGluY29taW5nIGNvbm5lY3Rp
b25zIGFyZSBoYW5kbGVkIGJ5IGEgc2VwYXJhdGUgdGhyZWFkLCB3ZSBjYW4NCiAg
ICAgICAgIGFsbG93IGl0IHRvIHNsZWVwIGFuZCB3YWl0IGZvciBhIGxpdHRsZSB3
aGlsZS4gSG9wZWZ1bGx5IHRoZSBpbmNvbWluZyBjb25uZWN0aW9uDQogICAgICAg
ICB3aWxsIGJlIGFsbG93ZWQgYWZ0ZXIgdGhlIDMwMCozMDBtcyBwb29sIGxvb3Au
IEJ1dCBldmVuIGlmIHRoYXQgaXMgbm90IHRoZSBjYXNlDQogICAgICAgICB0aGUg
cmF0ZSBvZiBjb25uZWN0aW9uIGF0dGVtcHRzIGhhdmUgYmVlbiByZWR1Y2VkLg0K
DQogICAgbW9kaWZpZWQ6DQogICAgICBzdG9yYWdlL25kYi9pbmNsdWRlL3RyYW5z
cG9ydGVyL1RyYW5zcG9ydGVyUmVnaXN0cnkuaHBwDQogICAgICBzdG9yYWdlL25k
Yi9zcmMvY29tbW9uL3RyYW5zcG9ydGVyL1RyYW5zcG9ydGVyUmVnaXN0cnkuY3Bw
DQo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9uZGIvaW5jbHVkZS90cmFuc3Bv
cnRlci9UcmFuc3BvcnRlclJlZ2lzdHJ5LmhwcCcNCi0tLSBhL3N0b3JhZ2UvbmRi
L2luY2x1ZGUvdHJhbnNwb3J0ZXIvVHJhbnNwb3J0ZXJSZWdpc3RyeS5ocHAJMjAw
OS0wNS0yNyAxMjoxMTo0NiArMDAwMA0KKysrIGIvc3RvcmFnZS9uZGIvaW5jbHVk
ZS90cmFuc3BvcnRlci9UcmFuc3BvcnRlclJlZ2lzdHJ5LmhwcAkyMDA5LTA3LTAz
IDEwOjA0OjMyICswMDAwDQpAQCAtMzcwLDYgKzM3MCw4IEBAIHByaXZhdGU6DQog
DQogICBpbnQgbV9zaG1fb3duX3BpZDsNCiAgIGludCBtX3RyYW5zcF9jb3VudDsN
CisNCisgIGJvb2wgYWxsb3dfd2FpdF9jb25uZWN0aW5nKCkgY29uc3Q7DQogfTsN
CiANCiBpbmxpbmUgdm9pZA0KDQo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9u
ZGIvc3JjL2NvbW1vbi90cmFuc3BvcnRlci9UcmFuc3BvcnRlclJlZ2lzdHJ5LmNw
cCcNCi0tLSBhL3N0b3JhZ2UvbmRiL3NyYy9jb21tb24vdHJhbnNwb3J0ZXIvVHJh
bnNwb3J0ZXJSZWdpc3RyeS5jcHAJMjAwOS0wNS0yNyAxMjoxMTo0NiArMDAwMA0K
KysrIGIvc3RvcmFnZS9uZGIvc3JjL2NvbW1vbi90cmFuc3BvcnRlci9UcmFuc3Bv
cnRlclJlZ2lzdHJ5LmNwcAkyMDA5LTA3LTAzIDEwOjA0OjMyICswMDAwDQpAQCAt
MjE3LDYgKzIxNywxOSBAQCBUcmFuc3BvcnRlclJlZ2lzdHJ5Ojppbml0KE5vZGVJ
ZCBub2RlSWQpDQogfQ0KIA0KIGJvb2wNCitUcmFuc3BvcnRlclJlZ2lzdHJ5Ojph
bGxvd193YWl0X2Nvbm5lY3RpbmcoKSBjb25zdCB7DQorICBEQlVHX0VOVEVSKCJU
cmFuc3BvcnRlclJlZ2lzdHJ5OjphbGxvd193YWl0X2Nvbm5lY3RpbmciKTsNCisN
CisgIC8vIENoZWNrIGlmIGFueSBub2RlIGlzIGluIGNvbm5lY3RpbmcNCisgIGZv
ciAodW5zaWduZWQgaT0wOyBpPG1heFRyYW5zcG9ydGVyczsgaSsrKSB7DQorICAg
IGlmIChwZXJmb3JtU3RhdGVzW2ldID09IENPTk5FQ1RJTkcpDQorICAgICAgREJV
R19SRVRVUk4oZmFsc2UpOw0KKyAgfQ0KKw0KKyAgREJVR19SRVRVUk4odHJ1ZSk7
DQorfQ0KKw0KK2Jvb2wNCiBUcmFuc3BvcnRlclJlZ2lzdHJ5Ojpjb25uZWN0X3Nl
cnZlcihOREJfU09DS0VUX1RZUEUgc29ja2ZkKQ0KIHsNCiAgIERCVUdfRU5URVIo
IlRyYW5zcG9ydGVyUmVnaXN0cnk6OmNvbm5lY3Rfc2VydmVyIik7DQpAQCAtMjU2
LDkgKzI2OSwyMCBAQCBUcmFuc3BvcnRlclJlZ2lzdHJ5Ojpjb25uZWN0X3NlcnZl
cihOREJfDQogICAgICAgREJVR19SRVRVUk4oZmFsc2UpOw0KICAgfQ0KIA0KLSAg
Ly9jaGVjayB0aGF0IHRoZSB0cmFuc3BvcnRlciBzaG91bGQgYmUgY29ubmVjdGVk
DQotICBpZiAocGVyZm9ybVN0YXRlc1tub2RlSWRdICE9IFRyYW5zcG9ydGVyUmVn
aXN0cnk6OkNPTk5FQ1RJTkcpIHsNCi0gICAgREJVR19QUklOVCgiZXJyb3IiLCAo
IlRyYW5zcG9ydGVyIGluIHdyb25nIHN0YXRlIGZvciB0aGlzIG5vZGUgaWQgZnJv
bSBjbGllbnQiKSk7DQorICAvLyBjaGVjayB0aGF0IHRoZSB0cmFuc3BvcnRlciBz
aG91bGQgYmUgY29ubmVjdGVkDQorICBpbnQgbG9vcHMgPSAwOw0KKyAgd2hpbGUg
KHBlcmZvcm1TdGF0ZXNbbm9kZUlkXSAhPSBUcmFuc3BvcnRlclJlZ2lzdHJ5OjpD
T05ORUNUSU5HKSB7DQorICAgIERCVUdfUFJJTlQoImluZm8iLCAoIlRyYW5zcG9y
dGVyWyVkXSBpcyBub3QgaW4gQ09OTkVDVElORyIsIG5vZGVJZCkpOw0KKyAgICBp
ZiAoYWxsb3dfd2FpdF9jb25uZWN0aW5nKCkgJiYgbG9vcHMrKyA8IDMwMCkNCisg
ICAgew0KKyAgICAgIERCVUdfUFJJTlQoImluZm8iLCAoIkFsbG93aW5nIGNvbm5l
Y3Rpb24gdG8gd2FpdCBmb3IgQ09OTkVDVElORyIpKTsNCisgICAgICBnX2V2ZW50
TG9nZ2VyLT5pbmZvKCJDb25uZWN0aW9uIGZyb20gbm9kZSAlZCBpcyB3YWl0aW5n
IGZvciBDT05ORUNUSU5HIiwNCisgICAgICAgICAgICAgICAgICAgICAgICAgIG5v
ZGVJZCk7DQorICAgICAgTmRiU2xlZXBfTWlsbGlTbGVlcCgzMDApOw0KKyAgICAg
IGNvbnRpbnVlOw0KKyAgICB9DQorDQorICAgIERCVUdfUFJJTlQoImVycm9yIiwg
KCJEaXNjb25uZWN0aW5nIG5vZGUgJWQsIG5vdCBDT05ORUNUSU5HIikpOw0KICAg
ICBEQlVHX1JFVFVSTihmYWxzZSk7DQogICB9DQogDQoNCg==

--Boundary_(ID_xvvRfKoqQsGXHQYghHZRwA)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/magnus.blaudd@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/magnus.blaudd@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped
# target_branch: file:///home/msvensson/mysql/6.3-bug45899/
# testament_sha1: f63c18ce3db017e2211ac5cc24415413297ee384
# timestamp: 2009-07-03 12:04:36 +0200
# base_revision_id: jonas@stripped
# 
# Begin bundle
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
MG1ZtZt2iLdmyUubEexJc//F3JFOFCQ8V6yiQA==


--Boundary_(ID_xvvRfKoqQsGXHQYghHZRwA)--