From: Date: July 3 2009 6:24pm
Subject: bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:2931 to 2932)
List-Archive: http://lists.mysql.com/commits/77927
Message-Id: <20090703162408.BD75613405D@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_8zlslQutn3DeIpJ13jzTIg)"

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

IDI5MzIgTWFnbnVzIEJsw6V1ZGQJMjAwOS0wNy0wMyBbbWVyZ2VdDQogICAgICBN
ZXJnZQ0KDQogICAgbW9kaWZpZWQ6DQogICAgICBzdG9yYWdlL25kYi9zcmMvY29t
bW9uL3V0aWwvQ01ha2VMaXN0cy50eHQNCiAgICAgIHN0b3JhZ2UvbmRiL3NyYy9r
ZXJuZWwvYmxvY2tzL2RiaW5mby9EYmluZm8uY3BwDQogMjkzMSBGcmF6ZXIgQ2xl
bWVudAkyMDA5LTA3LTAzDQogICAgICBXTDQ2NzUgRml4IHNpZ25hbCB0cmFpbiBh
c3NlbWJseSBmb3IgU2NhblRhYlJlcQ0KDQogICAgbW9kaWZpZWQ6DQogICAgICBz
dG9yYWdlL25kYi9zcmMva2VybmVsL2Jsb2Nrcy9kYnRjL0RidGNNYWluLmNwcA0K
PT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvbmRiL3NyYy9jb21tb24vdXRpbC9D
TWFrZUxpc3RzLnR4dCcNCi0tLSBhL3N0b3JhZ2UvbmRiL3NyYy9jb21tb24vdXRp
bC9DTWFrZUxpc3RzLnR4dAkyMDA5LTA2LTIzIDExOjU1OjQxICswMDAwDQorKysg
Yi9zdG9yYWdlL25kYi9zcmMvY29tbW9uL3V0aWwvQ01ha2VMaXN0cy50eHQJMjAw
OS0wNy0wMyAxNDo1NTo0MiArMDAwMA0KQEAgLTUzLDcgKzUzLDYgQEAgQUREX0xJ
QlJBUlkobmRiZ2VuZXJhbCBTVEFUSUMNCiAgICAgICAgICAgICBuZGJfb3B0cy5j
DQogICAgICAgICAgICAgYmFzZXN0cmluZ192c25wcmludGYuYw0KICAgICAgICAg
ICAgIEJpdG1hc2suY3BwDQotCSAgICBuZGJpbmZvLmNwcA0KICkNCiBUQVJHRVRf
TElOS19MSUJSQVJJRVMobmRiZ2VuZXJhbCB6bGliKQ0KIA0KDQo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3RvcmFnZS9uZGIvc3JjL2tlcm5lbC9ibG9ja3MvZGJpbmZvL0Ri
aW5mby5jcHAnDQotLS0gYS9zdG9yYWdlL25kYi9zcmMva2VybmVsL2Jsb2Nrcy9k
YmluZm8vRGJpbmZvLmNwcAkyMDA5LTA3LTAzIDEwOjMxOjMwICswMDAwDQorKysg
Yi9zdG9yYWdlL25kYi9zcmMva2VybmVsL2Jsb2Nrcy9kYmluZm8vRGJpbmZvLmNw
cAkyMDA5LTA3LTAzIDE0OjU0OjM0ICswMDAwDQpAQCAtMjI0LDcgKzIyNCw3IEBA
IHZvaWQgRGJpbmZvOjpleGVjREJJTkZPX1NDQU5SRVEoU2lnbmFsICoNCiANCiAg
IC8vIFZhbGlkYXRlIHRhYmxlSWQNCiAgIGNvbnN0IFVpbnQzMiB0YWJsZUlkID0g
cmVxLnRhYmxlSWQ7DQotICBpZiAodGFibGVJZCA+PSBOZGJpbmZvOjpnZXROdW1U
YWJsZXMoKSkNCisgIGlmICh0YWJsZUlkID49IChVaW50MzIpTmRiaW5mbzo6Z2V0
TnVtVGFibGVzKCkpDQogICB7DQogICAgIGphbSgpOw0KICAgICBEYmluZm9TY2Fu
UmVmICpyZWY9IChEYmluZm9TY2FuUmVmKilzaWduYWwtPmdldERhdGFQdHJTZW5k
KCk7DQpAQCAtMjczLDcgKzI3Myw3IEBAIHZvaWQgRGJpbmZvOjpleGVjREJJTkZP
X1NDQU5SRVEoU2lnbmFsICoNCiAgICAgY2hhciBjcmVhdGVfc3FsWzUxMl07DQog
ICAgIFVpbnQzMiB0YWJsZUlkID0gY3Vyc29yLT5kYXRhWzBdOw0KIA0KLSAgICB3
aGlsZSh0YWJsZUlkIDwgTmRiaW5mbzo6Z2V0TnVtVGFibGVzKCkpDQorICAgIHdo
aWxlKHRhYmxlSWQgPCAoVWludDMyKU5kYmluZm86OmdldE51bVRhYmxlcygpKQ0K
ICAgICB7DQogICAgICAgamFtKCk7DQogICAgICAgY29uc3QgTmRiaW5mbzo6VGFi
bGUmIHRhYiA9IE5kYmluZm86OmdldFRhYmxlKHRhYmxlSWQpOw0KQEAgLTMxMCwx
MSArMzEwLDExIEBAIHZvaWQgRGJpbmZvOjpleGVjREJJTkZPX1NDQU5SRVEoU2ln
bmFsICoNCiAgICAgVWludDMyIHRhYmxlSWQgPSBjdXJzb3ItPmRhdGFbMF07DQog
ICAgIFVpbnQzMiBjb2x1bW5JZCA9IGN1cnNvci0+ZGF0YVsxXTsNCiANCi0gICAg
d2hpbGUodGFibGVJZCA8IE5kYmluZm86OmdldE51bVRhYmxlcygpKQ0KKyAgICB3
aGlsZSh0YWJsZUlkIDwgKFVpbnQzMilOZGJpbmZvOjpnZXROdW1UYWJsZXMoKSkN
CiAgICAgew0KICAgICAgIGphbSgpOw0KICAgICAgIGNvbnN0IE5kYmluZm86OlRh
YmxlJiB0YWIgPSBOZGJpbmZvOjpnZXRUYWJsZSh0YWJsZUlkKTsNCi0gICAgICB3
aGlsZShjb2x1bW5JZCA8IHRhYi5tLm5jb2xzKQ0KKyAgICAgIHdoaWxlKGNvbHVt
bklkIDwgKFVpbnQzMil0YWIubS5uY29scykNCiAgICAgICB7DQogICAgICAgICBq
YW0oKTsNCiAgICAgICAgIE5kYmluZm86OlJvdyByb3coc2lnbmFsLCByZXEpOw0K
DQo=

--Boundary_(ID_8zlslQutn3DeIpJ13jzTIg)
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/tmp/kARxqtipSR/7.1-\
#   ndbinfo/
# testament_sha1: 87c0ac3f0dd3cf3a333a97fda800cf9aa3377577
# timestamp: 2009-07-03 18:24:07 +0200
# source_branch: file:///home/msvensson/mysql/7.1-ndbinfo/
# base_revision_id: frazer@stripped
# 
# Begin bundle
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


--Boundary_(ID_8zlslQutn3DeIpJ13jzTIg)--