From: Date: July 3 2009 4:54pm
Subject: bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:2930)
List-Archive: http://lists.mysql.com/commits/77915
Message-Id: <20090703145438.B2F5F13405D@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_/bbzW4y5q3bLSPAQbUhoHQ)"

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

I0F0IGZpbGU6Ly8vaG9tZS9tc3ZlbnNzb24vbXlzcWwvNy4xLW5kYmluZm8vIGJh
c2VkIG9uIHJldmlkOm1hZ251cy5ibGF1ZGRAc3VuLmNvbS0yMDA5MDcwMzExMTM1
OS0zN2MwbDgzb2dld3RkMWx3DQoNCiAyOTMwIE1hZ251cyBCbMOldWRkCTIwMDkt
MDctMDMNCiAgICAgIG5kYmluZm8NCiAgICAgICAtIGZpeCA0IGNvbXBpbGVyIHdh
cm5pbmdzDQoNCiAgICBtb2RpZmllZDoNCiAgICAgIHN0b3JhZ2UvbmRiL3NyYy9r
ZXJuZWwvYmxvY2tzL2RiaW5mby9EYmluZm8uY3BwDQo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9uZGIvc3JjL2tlcm5lbC9ibG9ja3MvZGJpbmZvL0RiaW5mby5j
cHAnDQotLS0gYS9zdG9yYWdlL25kYi9zcmMva2VybmVsL2Jsb2Nrcy9kYmluZm8v
RGJpbmZvLmNwcAkyMDA5LTA3LTAzIDEwOjMxOjMwICswMDAwDQorKysgYi9zdG9y
YWdlL25kYi9zcmMva2VybmVsL2Jsb2Nrcy9kYmluZm8vRGJpbmZvLmNwcAkyMDA5
LTA3LTAzIDE0OjU0OjM0ICswMDAwDQpAQCAtMjI0LDcgKzIyNCw3IEBAIHZvaWQg
RGJpbmZvOjpleGVjREJJTkZPX1NDQU5SRVEoU2lnbmFsICoNCiANCiAgIC8vIFZh
bGlkYXRlIHRhYmxlSWQNCiAgIGNvbnN0IFVpbnQzMiB0YWJsZUlkID0gcmVxLnRh
YmxlSWQ7DQotICBpZiAodGFibGVJZCA+PSBOZGJpbmZvOjpnZXROdW1UYWJsZXMo
KSkNCisgIGlmICh0YWJsZUlkID49IChVaW50MzIpTmRiaW5mbzo6Z2V0TnVtVGFi
bGVzKCkpDQogICB7DQogICAgIGphbSgpOw0KICAgICBEYmluZm9TY2FuUmVmICpy
ZWY9IChEYmluZm9TY2FuUmVmKilzaWduYWwtPmdldERhdGFQdHJTZW5kKCk7DQpA
QCAtMjczLDcgKzI3Myw3IEBAIHZvaWQgRGJpbmZvOjpleGVjREJJTkZPX1NDQU5S
RVEoU2lnbmFsICoNCiAgICAgY2hhciBjcmVhdGVfc3FsWzUxMl07DQogICAgIFVp
bnQzMiB0YWJsZUlkID0gY3Vyc29yLT5kYXRhWzBdOw0KIA0KLSAgICB3aGlsZSh0
YWJsZUlkIDwgTmRiaW5mbzo6Z2V0TnVtVGFibGVzKCkpDQorICAgIHdoaWxlKHRh
YmxlSWQgPCAoVWludDMyKU5kYmluZm86OmdldE51bVRhYmxlcygpKQ0KICAgICB7
DQogICAgICAgamFtKCk7DQogICAgICAgY29uc3QgTmRiaW5mbzo6VGFibGUmIHRh
YiA9IE5kYmluZm86OmdldFRhYmxlKHRhYmxlSWQpOw0KQEAgLTMxMCwxMSArMzEw
LDExIEBAIHZvaWQgRGJpbmZvOjpleGVjREJJTkZPX1NDQU5SRVEoU2lnbmFsICoN
CiAgICAgVWludDMyIHRhYmxlSWQgPSBjdXJzb3ItPmRhdGFbMF07DQogICAgIFVp
bnQzMiBjb2x1bW5JZCA9IGN1cnNvci0+ZGF0YVsxXTsNCiANCi0gICAgd2hpbGUo
dGFibGVJZCA8IE5kYmluZm86OmdldE51bVRhYmxlcygpKQ0KKyAgICB3aGlsZSh0
YWJsZUlkIDwgKFVpbnQzMilOZGJpbmZvOjpnZXROdW1UYWJsZXMoKSkNCiAgICAg
ew0KICAgICAgIGphbSgpOw0KICAgICAgIGNvbnN0IE5kYmluZm86OlRhYmxlJiB0
YWIgPSBOZGJpbmZvOjpnZXRUYWJsZSh0YWJsZUlkKTsNCi0gICAgICB3aGlsZShj
b2x1bW5JZCA8IHRhYi5tLm5jb2xzKQ0KKyAgICAgIHdoaWxlKGNvbHVtbklkIDwg
KFVpbnQzMil0YWIubS5uY29scykNCiAgICAgICB7DQogICAgICAgICBqYW0oKTsN
CiAgICAgICAgIE5kYmluZm86OlJvdyByb3coc2lnbmFsLCByZXEpOw0KDQo=

--Boundary_(ID_/bbzW4y5q3bLSPAQbUhoHQ)
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/7.1-ndbinfo/
# testament_sha1: 29a9e1259e20b3edffff8efc1a717b97dff6ed65
# timestamp: 2009-07-03 16:54:38 +0200
# base_revision_id: magnus.blaudd@stripped\
#   37c0l83ogewtd1lw
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSDADoQAAcjfgFAQWWP//1Yj
BgC////wUAPZLPbNbcdq213XCShTKPT0TIaaaE0zUwTym1DQGajQJJIaaDI0jKajzU1G1MTamR6g
AaaCRQJFP9U8hJ+KaZNRgnqMD1Ag0aYcwAAAAAAAAAAJKBNJN6SZlNP1TyjEyaGQPU0AGmnBJXGy
oPzjkY8ISmoDVXjmxjJInxUxblSfFagkHXu3KnbPA7L22jz8BfyWa6BgPVqIRcfaNKT0h61+fj1q
+cRliaQXNKGCbv61xzVXY2u8Hsd3ibkwuSN/S6elMDKxgzanbK1IEGha9848ROqVPQ65osmpjZki
NIevWtxrn9MPuitED6YQvb0g0LebtQSYpwairxDkL9mwqmROR3wLkyiKAy7XLyp1U77YUKhNYd2O
/Zg9VrQWR8yyoCtYd+ZZomKLCZE88jiy61bn1Ep4w43iT7E4mr5jbJkU4wTdAJBokouesQSeNSZz
B2aRXKxTjEzpqpMWKrZtroFbYEFTOKO3xcK4ndkXmA48+eGUiJbSo3j1M96vFYTURxqGu9PfbmXS
knxILxrhmN8oCNFs0Ol1ZfhFMjIvUuT3VLIZVaYiWsqpmXiy0rCIgZkzA8iOn1tIlZIcQ2kn08U6
ngstExiqtpaFcyPqXZ0IsLgw3uznYON74yT+zX18jqtjZApGF0rEh2tM/MqRkWOOStXcsgbChMQz
De+pkxwaSZwhmGL8U5dBI5g+8iR4C2Vj4ZuMYrIkyxIrg2lBwHGo5sFYkOE/vkFqS4D1YY3G4zDb
Tk4sIc3rK0duwpHAYsfQKt5jlNS0p6vJkYokhuWxlydOCiFhzlutGgwZ0yYxEnprK5dh1K4GMUUh
7eUj2du4TeiZEKJW+GgVLeRxVTlYAyinwxyqZmN2MrGDC4pPjRqVkxDVbrpE9yzpwJ316zCR1Azx
Q61EWjtxdP0FUY8DLbqmWrx/iEeaCXANt0I5QJgaKnadwrTv3C5QvitSrSLUMTExaa6qsDZNqakW
wr92WMLRqZtUY3RKUvvwxDpoW4VCkO8BcU4sYOB8Lp2h+OddAipqJ9FxpCIMyPIE5UCeLnYEc6uS
VAG16O0KFsasTVgssLrrlOBSDQkt0IDfbDTMLQ39lIod2NrKiD4KvKiQVFTDKLlzQSMlslmG8DCL
PkawHNbOWioHukPRHjDJcGiZAoOZ98VNyXcKCakfRrHHaDxOYsnipbxf5V3kjZ7q2oKqShtvAh0/
3TPhUz3/x251fvFBWXtt7dYtAoWUj3Rs/xdyRThQkCDADoQ=


--Boundary_(ID_/bbzW4y5q3bLSPAQbUhoHQ)--