From: Date: July 3 2009 1:12pm
Subject: bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:2932)
List-Archive: http://lists.mysql.com/commits/77886
Message-Id: <20090703111237.86EF013405D@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_HHLtADXZObmQo+GHaQPJPg)"

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

I0F0IGZpbGU6Ly8vaG9tZS9tc3ZlbnNzb24vbXlzcWwvNy4xLW5kYmluZm8vIGJh
c2VkIG9uIHJldmlkOm1hZ251cy5ibGF1ZGRAc3VuLmNvbS0yMDA5MDcwMzEwMzEz
MC1zbzJjOWs0d2k3d2F0eHUxDQoNCiAyOTMyIE1hZ251cyBCbMOldWRkCTIwMDkt
MDctMDMNCiAgICAgIG5kYmluZm8NCiAgICAgICAtIG1ha2UgbmRiX2Jhc2ljIG9u
bHkgc2hvdyB2YXJpYWJsZXMgcHJlZml4ZWQgd2l0aCAnbmRiXycNCiAgICAgICAt
IGFkZCB0ZXN0IHRvIG5kYmluZm8gdG8gc2hvdyBpdHMgdmFyaWFibGVzLg0KDQog
ICAgbW9kaWZpZWQ6DQogICAgICBteXNxbC10ZXN0L3N1aXRlL25kYi9yL25kYl9i
YXNpYy5yZXN1bHQNCiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvbmRiL3IvbmRiaW5m
by5yZXN1bHQNCiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvbmRiL3QvbmRiX2Jhc2lj
LnRlc3QNCiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvbmRiL3QvbmRiaW5mby50ZXN0
DQo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9uZGIvci9uZGJf
YmFzaWMucmVzdWx0Jw0KLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9uZGIvci9uZGJf
YmFzaWMucmVzdWx0CTIwMDktMDYtMDQgMTM6MTQ6MTQgKzAwMDANCisrKyBiL215
c3FsLXRlc3Qvc3VpdGUvbmRiL3IvbmRiX2Jhc2ljLnJlc3VsdAkyMDA5LTA3LTAz
IDExOjEyOjMzICswMDAwDQpAQCAtNyw3ICs3LDcgQEAgYXR0cjIgSU5ULA0KIGF0
dHIzIFZBUkNIQVIoMTApDQogKSBFTkdJTkU9bmRiY2x1c3RlcjsNCiBkcm9wIHRh
YmxlIHQxOw0KLVNIT1cgR0xPQkFMIFNUQVRVUyBMSUtFICduZGIlJzsNCitTSE9X
IEdMT0JBTCBTVEFUVVMgTElLRSAnbmRiXF8lJzsNCiBWYXJpYWJsZV9uYW1lCVZh
bHVlDQogTmRiX2NsdXN0ZXJfbm9kZV9pZAkjDQogTmRiX2NvbmZpZ19mcm9tX2hv
c3QJIw0KQEAgLTIxLDcgKzIxLDcgQEAgTmRiX3BydW5lZF9zY2FuX2NvdW50CSMN
CiBOZGJfY2x1c3Rlcl9jb25uZWN0aW9uX3Bvb2wJIw0KIE5kYl9jb25mbGljdF9m
bl9tYXgJIw0KIE5kYl9jb25mbGljdF9mbl9vbGQJIw0KLVNIT1cgR0xPQkFMIFZB
UklBQkxFUyBMSUtFICduZGIlJzsNCitTSE9XIEdMT0JBTCBWQVJJQUJMRVMgTElL
RSAnbmRiXF8lJzsNCiBWYXJpYWJsZV9uYW1lCVZhbHVlDQogbmRiX2F1dG9pbmNy
ZW1lbnRfcHJlZmV0Y2hfc3oJIw0KIG5kYl9iYXRjaF9zaXplCSMNCg0KPT09IG1v
ZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvbmRiL3IvbmRiaW5mby5yZXN1
bHQnDQotLS0gYS9teXNxbC10ZXN0L3N1aXRlL25kYi9yL25kYmluZm8ucmVzdWx0
CTIwMDktMDctMDMgMTA6MzE6MzAgKzAwMDANCisrKyBiL215c3FsLXRlc3Qvc3Vp
dGUvbmRiL3IvbmRiaW5mby5yZXN1bHQJMjAwOS0wNy0wMyAxMToxMjozMyArMDAw
MA0KQEAgLTEzNCw1ICsxMzQsMTEgQEAgVEFCTEVfSUQNCiA1DQogNg0KIDcNCitT
SE9XIEdMT0JBTCBTVEFUVVMgTElLRSAnbmRiaW5mb1xfJSc7DQorVmFyaWFibGVf
bmFtZQlWYWx1ZQ0KK1NIT1cgR0xPQkFMIFZBUklBQkxFUyBMSUtFICduZGJpbmZv
XF8lJzsNCitWYXJpYWJsZV9uYW1lCVZhbHVlDQorbmRiaW5mb19tYXhfYnl0ZXMJ
MA0KK25kYmluZm9fbWF4X3Jvd3MJMTANCiBkcm9wIHRhYmxlIFRBQkxFUzsNCiBE
Uk9QIERBVEFCQVNFIG5kYiRpbmZvOw0KDQo9PT0gbW9kaWZpZWQgZmlsZSAnbXlz
cWwtdGVzdC9zdWl0ZS9uZGIvdC9uZGJfYmFzaWMudGVzdCcNCi0tLSBhL215c3Fs
LXRlc3Qvc3VpdGUvbmRiL3QvbmRiX2Jhc2ljLnRlc3QJMjAwOC0xMC0wNiAxMTow
MzozMiArMDAwMA0KKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9uZGIvdC9uZGJfYmFz
aWMudGVzdAkyMDA5LTA3LTAzIDExOjEyOjMzICswMDAwDQpAQCAtMjUsOSArMjUs
OSBAQCBkcm9wIHRhYmxlIHQxOw0KICMgU2hvdyBzdGF0dXMgYW5kIHZhcmlhYmxl
cw0KICMNCiAtLXJlcGxhY2VfY29sdW1uIDIgIw0KLVNIT1cgR0xPQkFMIFNUQVRV
UyBMSUtFICduZGIlJzsNCitTSE9XIEdMT0JBTCBTVEFUVVMgTElLRSAnbmRiXF8l
JzsNCiAtLXJlcGxhY2VfY29sdW1uIDIgIw0KLVNIT1cgR0xPQkFMIFZBUklBQkxF
UyBMSUtFICduZGIlJzsNCitTSE9XIEdMT0JBTCBWQVJJQUJMRVMgTElLRSAnbmRi
XF8lJzsNCiANCiAjDQogIyBDcmVhdGUgYSBub3JtYWwgdGFibGUgd2l0aCBwcmlt
YXJ5IGtleQ0KDQo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9u
ZGIvdC9uZGJpbmZvLnRlc3QnDQotLS0gYS9teXNxbC10ZXN0L3N1aXRlL25kYi90
L25kYmluZm8udGVzdAkyMDA5LTA2LTI0IDE0OjMyOjE5ICswMDAwDQorKysgYi9t
eXNxbC10ZXN0L3N1aXRlL25kYi90L25kYmluZm8udGVzdAkyMDA5LTA3LTAzIDEx
OjEyOjMzICswMDAwDQpAQCAtMjUsNSArMjUsOSBAQCB1cGRhdGUgVEFCTEVTIHNl
dCBUQUJMRV9JRD0yIHdoZXJlIFRBQkxFDQogDQogRkxVU0ggIFRBQkxFUzsNCiBT
RUxFQ1QgVEFCTEVfSUQgZnJvbSBUQUJMRVM7DQorDQorU0hPVyBHTE9CQUwgU1RB
VFVTIExJS0UgJ25kYmluZm9cXyUnOw0KK1NIT1cgR0xPQkFMIFZBUklBQkxFUyBM
SUtFICduZGJpbmZvXF8lJzsNCisNCiBkcm9wIHRhYmxlIFRBQkxFUzsNCiBEUk9Q
IERBVEFCQVNFIG5kYiRpbmZvOw0KDQo=

--Boundary_(ID_HHLtADXZObmQo+GHaQPJPg)
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: 56631722ecff9fdf993a9bf0a8ae22340fbc3f60
# timestamp: 2009-07-03 13:12:37 +0200
# base_revision_id: magnus.blaudd@stripped\
#   so2c9k4wi7watxu1
# 
# Begin bundle
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
FCQ+4fVpAA==


--Boundary_(ID_HHLtADXZObmQo+GHaQPJPg)--