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

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

I0F0IGZpbGU6Ly8vaG9tZS9tc3ZlbnNzb24vbXlzcWwvdG1wL2tBUnhxdGlwU1Iv
Ny4xLW5kYmluZm8vIGJhc2VkIG9uIHJldmlkOmZyYXplckBteXNxbC5jb20tMjAw
OTA3MDMxNTQwMTAtMzBzdTQyc2Y1OG80Z2VvZA0KDQogMjkzMiBNYWdudXMgQmzD
pXVkZAkyMDA5LTA3LTAzIFttZXJnZV0NCiAgICAgIE1lcmdlDQoNCiAgICBtb2Rp
ZmllZDoNCiAgICAgIHN0b3JhZ2UvbmRiL3NyYy9jb21tb24vdXRpbC9DTWFrZUxp
c3RzLnR4dA0KICAgICAgc3RvcmFnZS9uZGIvc3JjL2tlcm5lbC9ibG9ja3MvZGJp
bmZvL0RiaW5mby5jcHANCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL25kYi9z
cmMvY29tbW9uL3V0aWwvQ01ha2VMaXN0cy50eHQnDQotLS0gYS9zdG9yYWdlL25k
Yi9zcmMvY29tbW9uL3V0aWwvQ01ha2VMaXN0cy50eHQJMjAwOS0wNi0yMyAxMTo1
NTo0MSArMDAwMA0KKysrIGIvc3RvcmFnZS9uZGIvc3JjL2NvbW1vbi91dGlsL0NN
YWtlTGlzdHMudHh0CTIwMDktMDctMDMgMTQ6NTU6NDIgKzAwMDANCkBAIC01Myw3
ICs1Myw2IEBAIEFERF9MSUJSQVJZKG5kYmdlbmVyYWwgU1RBVElDDQogICAgICAg
ICAgICAgbmRiX29wdHMuYw0KICAgICAgICAgICAgIGJhc2VzdHJpbmdfdnNucHJp
bnRmLmMNCiAgICAgICAgICAgICBCaXRtYXNrLmNwcA0KLQkgICAgbmRiaW5mby5j
cHANCiApDQogVEFSR0VUX0xJTktfTElCUkFSSUVTKG5kYmdlbmVyYWwgemxpYikN
CiANCg0KPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvbmRiL3NyYy9rZXJuZWwv
YmxvY2tzL2RiaW5mby9EYmluZm8uY3BwJw0KLS0tIGEvc3RvcmFnZS9uZGIvc3Jj
L2tlcm5lbC9ibG9ja3MvZGJpbmZvL0RiaW5mby5jcHAJMjAwOS0wNy0wMyAxMDoz
MTozMCArMDAwMA0KKysrIGIvc3RvcmFnZS9uZGIvc3JjL2tlcm5lbC9ibG9ja3Mv
ZGJpbmZvL0RiaW5mby5jcHAJMjAwOS0wNy0wMyAxNDo1NDozNCArMDAwMA0KQEAg
LTIyNCw3ICsyMjQsNyBAQCB2b2lkIERiaW5mbzo6ZXhlY0RCSU5GT19TQ0FOUkVR
KFNpZ25hbCAqDQogDQogICAvLyBWYWxpZGF0ZSB0YWJsZUlkDQogICBjb25zdCBV
aW50MzIgdGFibGVJZCA9IHJlcS50YWJsZUlkOw0KLSAgaWYgKHRhYmxlSWQgPj0g
TmRiaW5mbzo6Z2V0TnVtVGFibGVzKCkpDQorICBpZiAodGFibGVJZCA+PSAoVWlu
dDMyKU5kYmluZm86OmdldE51bVRhYmxlcygpKQ0KICAgew0KICAgICBqYW0oKTsN
CiAgICAgRGJpbmZvU2NhblJlZiAqcmVmPSAoRGJpbmZvU2NhblJlZiopc2lnbmFs
LT5nZXREYXRhUHRyU2VuZCgpOw0KQEAgLTI3Myw3ICsyNzMsNyBAQCB2b2lkIERi
aW5mbzo6ZXhlY0RCSU5GT19TQ0FOUkVRKFNpZ25hbCAqDQogICAgIGNoYXIgY3Jl
YXRlX3NxbFs1MTJdOw0KICAgICBVaW50MzIgdGFibGVJZCA9IGN1cnNvci0+ZGF0
YVswXTsNCiANCi0gICAgd2hpbGUodGFibGVJZCA8IE5kYmluZm86OmdldE51bVRh
YmxlcygpKQ0KKyAgICB3aGlsZSh0YWJsZUlkIDwgKFVpbnQzMilOZGJpbmZvOjpn
ZXROdW1UYWJsZXMoKSkNCiAgICAgew0KICAgICAgIGphbSgpOw0KICAgICAgIGNv
bnN0IE5kYmluZm86OlRhYmxlJiB0YWIgPSBOZGJpbmZvOjpnZXRUYWJsZSh0YWJs
ZUlkKTsNCkBAIC0zMTAsMTEgKzMxMCwxMSBAQCB2b2lkIERiaW5mbzo6ZXhlY0RC
SU5GT19TQ0FOUkVRKFNpZ25hbCAqDQogICAgIFVpbnQzMiB0YWJsZUlkID0gY3Vy
c29yLT5kYXRhWzBdOw0KICAgICBVaW50MzIgY29sdW1uSWQgPSBjdXJzb3ItPmRh
dGFbMV07DQogDQotICAgIHdoaWxlKHRhYmxlSWQgPCBOZGJpbmZvOjpnZXROdW1U
YWJsZXMoKSkNCisgICAgd2hpbGUodGFibGVJZCA8IChVaW50MzIpTmRiaW5mbzo6
Z2V0TnVtVGFibGVzKCkpDQogICAgIHsNCiAgICAgICBqYW0oKTsNCiAgICAgICBj
b25zdCBOZGJpbmZvOjpUYWJsZSYgdGFiID0gTmRiaW5mbzo6Z2V0VGFibGUodGFi
bGVJZCk7DQotICAgICAgd2hpbGUoY29sdW1uSWQgPCB0YWIubS5uY29scykNCisg
ICAgICB3aGlsZShjb2x1bW5JZCA8IChVaW50MzIpdGFiLm0ubmNvbHMpDQogICAg
ICAgew0KICAgICAgICAgamFtKCk7DQogICAgICAgICBOZGJpbmZvOjpSb3cgcm93
KHNpZ25hbCwgcmVxKTsNCg0K

--Boundary_(ID_G941SrGr1zcYVYGWWsK2tQ)
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 17:52:22 +0200
# source_branch: file:///home/msvensson/mysql/7.1-ndbinfo/
# base_revision_id: frazer@stripped
# 
# Begin bundle
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


--Boundary_(ID_G941SrGr1zcYVYGWWsK2tQ)--