From: Date: July 3 2009 5:03pm
Subject: bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:2930)
List-Archive: http://lists.mysql.com/commits/77918
Message-Id: <20090703150332.9131013405D@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_AQ9tY3ShCLBmBKELDzzBlg)"

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

I0F0IGZpbGU6Ly8vaG9tZS9tc3ZlbnNzb24vbXlzcWwvdG1wL1o4aHJoSTBZWDAv
Ny4xLW5kYmluZm8vIGJhc2VkIG9uIHJldmlkOm1hZ251cy5ibGF1ZGRAc3VuLmNv
bS0yMDA5MDcwMzExMTM1OS0zN2MwbDgzb2dld3RkMWx3DQoNCiAyOTMwIE1hZ251
cyBCbMOldWRkCTIwMDktMDctMDMgW21lcmdlXQ0KICAgICAgTWVyZ2UNCg0KICAg
IG1vZGlmaWVkOg0KICAgICAgc3RvcmFnZS9uZGIvc3JjL2NvbW1vbi91dGlsL0NN
YWtlTGlzdHMudHh0DQogICAgICBzdG9yYWdlL25kYi9zcmMva2VybmVsL2Jsb2Nr
cy9kYmluZm8vRGJpbmZvLmNwcA0KPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv
bmRiL3NyYy9jb21tb24vdXRpbC9DTWFrZUxpc3RzLnR4dCcNCi0tLSBhL3N0b3Jh
Z2UvbmRiL3NyYy9jb21tb24vdXRpbC9DTWFrZUxpc3RzLnR4dAkyMDA5LTA2LTIz
IDExOjU1OjQxICswMDAwDQorKysgYi9zdG9yYWdlL25kYi9zcmMvY29tbW9uL3V0
aWwvQ01ha2VMaXN0cy50eHQJMjAwOS0wNy0wMyAxNDo1NTo0MiArMDAwMA0KQEAg
LTUzLDcgKzUzLDYgQEAgQUREX0xJQlJBUlkobmRiZ2VuZXJhbCBTVEFUSUMNCiAg
ICAgICAgICAgICBuZGJfb3B0cy5jDQogICAgICAgICAgICAgYmFzZXN0cmluZ192
c25wcmludGYuYw0KICAgICAgICAgICAgIEJpdG1hc2suY3BwDQotCSAgICBuZGJp
bmZvLmNwcA0KICkNCiBUQVJHRVRfTElOS19MSUJSQVJJRVMobmRiZ2VuZXJhbCB6
bGliKQ0KIA0KDQo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9uZGIvc3JjL2tl
cm5lbC9ibG9ja3MvZGJpbmZvL0RiaW5mby5jcHAnDQotLS0gYS9zdG9yYWdlL25k
Yi9zcmMva2VybmVsL2Jsb2Nrcy9kYmluZm8vRGJpbmZvLmNwcAkyMDA5LTA3LTAz
IDEwOjMxOjMwICswMDAwDQorKysgYi9zdG9yYWdlL25kYi9zcmMva2VybmVsL2Js
b2Nrcy9kYmluZm8vRGJpbmZvLmNwcAkyMDA5LTA3LTAzIDE0OjU0OjM0ICswMDAw
DQpAQCAtMjI0LDcgKzIyNCw3IEBAIHZvaWQgRGJpbmZvOjpleGVjREJJTkZPX1ND
QU5SRVEoU2lnbmFsICoNCiANCiAgIC8vIFZhbGlkYXRlIHRhYmxlSWQNCiAgIGNv
bnN0IFVpbnQzMiB0YWJsZUlkID0gcmVxLnRhYmxlSWQ7DQotICBpZiAodGFibGVJ
ZCA+PSBOZGJpbmZvOjpnZXROdW1UYWJsZXMoKSkNCisgIGlmICh0YWJsZUlkID49
IChVaW50MzIpTmRiaW5mbzo6Z2V0TnVtVGFibGVzKCkpDQogICB7DQogICAgIGph
bSgpOw0KICAgICBEYmluZm9TY2FuUmVmICpyZWY9IChEYmluZm9TY2FuUmVmKilz
aWduYWwtPmdldERhdGFQdHJTZW5kKCk7DQpAQCAtMjczLDcgKzI3Myw3IEBAIHZv
aWQgRGJpbmZvOjpleGVjREJJTkZPX1NDQU5SRVEoU2lnbmFsICoNCiAgICAgY2hh
ciBjcmVhdGVfc3FsWzUxMl07DQogICAgIFVpbnQzMiB0YWJsZUlkID0gY3Vyc29y
LT5kYXRhWzBdOw0KIA0KLSAgICB3aGlsZSh0YWJsZUlkIDwgTmRiaW5mbzo6Z2V0
TnVtVGFibGVzKCkpDQorICAgIHdoaWxlKHRhYmxlSWQgPCAoVWludDMyKU5kYmlu
Zm86OmdldE51bVRhYmxlcygpKQ0KICAgICB7DQogICAgICAgamFtKCk7DQogICAg
ICAgY29uc3QgTmRiaW5mbzo6VGFibGUmIHRhYiA9IE5kYmluZm86OmdldFRhYmxl
KHRhYmxlSWQpOw0KQEAgLTMxMCwxMSArMzEwLDExIEBAIHZvaWQgRGJpbmZvOjpl
eGVjREJJTkZPX1NDQU5SRVEoU2lnbmFsICoNCiAgICAgVWludDMyIHRhYmxlSWQg
PSBjdXJzb3ItPmRhdGFbMF07DQogICAgIFVpbnQzMiBjb2x1bW5JZCA9IGN1cnNv
ci0+ZGF0YVsxXTsNCiANCi0gICAgd2hpbGUodGFibGVJZCA8IE5kYmluZm86Omdl
dE51bVRhYmxlcygpKQ0KKyAgICB3aGlsZSh0YWJsZUlkIDwgKFVpbnQzMilOZGJp
bmZvOjpnZXROdW1UYWJsZXMoKSkNCiAgICAgew0KICAgICAgIGphbSgpOw0KICAg
ICAgIGNvbnN0IE5kYmluZm86OlRhYmxlJiB0YWIgPSBOZGJpbmZvOjpnZXRUYWJs
ZSh0YWJsZUlkKTsNCi0gICAgICB3aGlsZShjb2x1bW5JZCA8IHRhYi5tLm5jb2xz
KQ0KKyAgICAgIHdoaWxlKGNvbHVtbklkIDwgKFVpbnQzMil0YWIubS5uY29scykN
CiAgICAgICB7DQogICAgICAgICBqYW0oKTsNCiAgICAgICAgIE5kYmluZm86OlJv
dyByb3coc2lnbmFsLCByZXEpOw0KDQo=

--Boundary_(ID_AQ9tY3ShCLBmBKELDzzBlg)
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/Z8hrhI0YX0/7.1-\
#   ndbinfo/
# testament_sha1: 957915c50acfeb12990648ec7835c7d030030282
# timestamp: 2009-07-03 17:03:31 +0200
# source_branch: file:///home/msvensson/mysql/7.1-ndbinfo/
# base_revision_id: magnus.blaudd@stripped\
#   37c0l83ogewtd1lw
# 
# Begin bundle
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
i7kinChIesu5qQA=


--Boundary_(ID_AQ9tY3ShCLBmBKELDzzBlg)--