From: jack andrews
Date: September 23 2009 2:17am
Subject: bzr push into mysql-5.1-telco-7.0 branch (jack:3028 to 3030) Bug#47426
List-Archive: http://lists.mysql.com/commits/84229
X-Bug: 47426
Message-Id: <0KQE00GHBJP7QDD0@mail-apac.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_MhThSkxNlKBuBe2yWNK5Ww)"

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

IDMwMzAgamFjayBhbmRyZXdzCTIwMDktMDktMjMNCiAgICAgIEJ1ZyAjNDc0MjY6
IFBhcnNlci5jcHAgd29uJ3QgcGFyc2UgIng9Yzpcd2luZG93cyINCiAgICAgICAg
LiBub3cgZmluZHMgZmlyc3Qgb2YgJzonIG9yICc9JyBmb3IgdGhlIHNwbGl0DQoN
CiAgICBtb2RpZmllZDoNCiAgICAgIHN0b3JhZ2UvbmRiL3NyYy9jb21tb24vdXRp
bC9DTWFrZUxpc3RzLnR4dA0KICAgICAgc3RvcmFnZS9uZGIvc3JjL2NvbW1vbi91
dGlsL1BhcnNlci5jcHANCiAzMDI5IGphY2sgYW5kcmV3cwkyMDA5LTA5LTIzDQog
ICAgICBCdWcgIzQ3NDI4OiBuZGJnZW5lcmFsIHNob3VsZCB0YXJnZXRfbGluayBt
eXN5cywgYW5kIHdzMl8zMg0KDQogICAgbW9kaWZpZWQ6DQogICAgICBzdG9yYWdl
L25kYi9zcmMvY29tbW9uL3V0aWwvQ01ha2VMaXN0cy50eHQNCiAzMDI4IE1hZ251
cyBCbMOldWRkCTIwMDktMDktMjINCiAgICAgIEJ1ZyM0NzUyNiB1bml0LnBsIGZh
aWxzIHRvIGV4ZWN1dGUgYmluYXJpZXMgd2hlbiB1c2luZyBUZXN0OjpIYXJuZXNz
IDMuMTANCiAgICAgICAtIFJld3JpdGUgdW5pdC5wbCBzbyBpdCBwcmVmZXJzIHRv
IHVzZSBUQVA6Okhhcm5lc3MgZGlyZWN0bHkuDQoNCiAgICBtb2RpZmllZDoNCiAg
ICAgIHVuaXR0ZXN0L3VuaXQucGwNCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl
L25kYi9zcmMvY29tbW9uL3V0aWwvQ01ha2VMaXN0cy50eHQnDQotLS0gYS9zdG9y
YWdlL25kYi9zcmMvY29tbW9uL3V0aWwvQ01ha2VMaXN0cy50eHQJMjAwOS0wNi0w
MiAxNDowMDowNiArMDAwMA0KKysrIGIvc3RvcmFnZS9uZGIvc3JjL2NvbW1vbi91
dGlsL0NNYWtlTGlzdHMudHh0CTIwMDktMDktMjMgMDI6MTM6MjUgKzAwMDANCkBA
IC01NSw3ICs1NSw3IEBAIEFERF9MSUJSQVJZKG5kYmdlbmVyYWwgU1RBVElDDQog
ICAgICAgICAgICAgQml0bWFzay5jcHANCiAJICAgIG5kYmluZm8uYw0KICkNCi1U
QVJHRVRfTElOS19MSUJSQVJJRVMobmRiZ2VuZXJhbCB6bGliKQ0KK1RBUkdFVF9M
SU5LX0xJQlJBUklFUyhuZGJnZW5lcmFsIHpsaWIgbXlzeXMgd3MyXzMyKQ0KIA0K
IEFERF9FWEVDVVRBQkxFKEJhc2VTdHJpbmctdCBCYXNlU3RyaW5nLmNwcCkNCiBT
RVRfVEFSR0VUX1BST1BFUlRJRVMoQmFzZVN0cmluZy10DQpAQCAtNjcsMyArNjcs
NyBAQCBTRVRfVEFSR0VUX1BST1BFUlRJRVMoQml0bWFzay10DQogICAgICAgICAg
ICAgICAgICAgICAgIFBST1BFUlRJRVMgQ09NUElMRV9GTEFHUyAiLURURVNUX0JJ
VE1BU0siKQ0KIFRBUkdFVF9MSU5LX0xJQlJBUklFUyhCaXRtYXNrLXQgbmRiZ2Vu
ZXJhbCkNCiANCitBRERfRVhFQ1VUQUJMRShQYXJzZXItdCBQYXJzZXIuY3BwKQ0K
K1NFVF9UQVJHRVRfUFJPUEVSVElFUyhQYXJzZXItdA0KKyAgICAgICAgICAgICAg
ICAgICAgICBQUk9QRVJUSUVTIENPTVBJTEVfRkxBR1MgIi1EVEVTVF9QQVJTRVIi
KQ0KK1RBUkdFVF9MSU5LX0xJQlJBUklFUyhQYXJzZXItdCBuZGJnZW5lcmFsKQ0K
DQo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9uZGIvc3JjL2NvbW1vbi91dGls
L1BhcnNlci5jcHAnDQotLS0gYS9zdG9yYWdlL25kYi9zcmMvY29tbW9uL3V0aWwv
UGFyc2VyLmNwcAkyMDA5LTA1LTI3IDE1OjIxOjQ1ICswMDAwDQorKysgYi9zdG9y
YWdlL25kYi9zcmMvY29tbW9uL3V0aWwvUGFyc2VyLmNwcAkyMDA5LTA5LTIzIDAy
OjEzOjI1ICswMDAwDQpAQCAtMTIyLDExICsxMjIsMTIgQEAgdHJpbShjaGFyICog
c3RyKXsNCiBzdGF0aWMNCiBib29sDQogc3BsaXQoY2hhciAqIGJ1ZiwgY2hhciAq
KiBuYW1lLCBjaGFyICoqIHZhbHVlKXsNCi0gIA0KLSAgKiB2YWx1ZSA9IHN0cmNo
cihidWYsICc6Jyk7DQotICBpZigqIHZhbHVlID09IDApDQotICAgICogdmFsdWUg
PSBzdHJjaHIoYnVmLCAnPScpOw0KIA0KKyAgZm9yICgqdmFsdWU9YnVmOyAqKnZh
bHVlOyAoKnZhbHVlKSsrKSB7DQorICAgIGlmICgqKnZhbHVlID09ICc6JyB8fCAq
KnZhbHVlID09ICc9Jykgew0KKyAgICAgIGJyZWFrOw0KKyAgICB9DQorICB9DQog
DQogICBpZigqIHZhbHVlID09IDApew0KICAgICByZXR1cm4gZmFsc2U7DQpAQCAt
MzU3LDMgKzM1OCwyMCBAQCBQYXJzZXJJbXBsOjpjaGVja01hbmRhdG9yeShDb250
ZXh0KiBjdHgsDQogfQ0KIA0KIHRlbXBsYXRlIGNsYXNzIFZlY3Rvcjxjb25zdCBQ
YXJzZXJSb3c8UGFyc2VySW1wbDo6RHVtbXk+Kj47DQorDQorI2lmZGVmIFRFU1Rf
UEFSU0VSDQorI2luY2x1ZGUgPE5kYlRhcC5ocHA+DQorDQorVEFQVEVTVChQYXJz
ZXIpDQorew0KKyAgY2hhciAqc3RyLCAqbmFtZSwgKnZhbHVlOw0KKw0KKyAgLy9z
cGxpdCBtb2RpZmllcyBhcmcgc28gZHVwDQorICBzdHIgPSBzdHJkdXAoIng9Yzpc
XHdpbmRvd3MiKTsNCisgIE9LKHNwbGl0KHN0ciwgJm5hbWUsICZ2YWx1ZSkpOw0K
KyAgT0soIXN0cmNtcChuYW1lLCAieCIpKTsNCisgIE9LKCFzdHJjbXAodmFsdWUs
ICJjOlxcd2luZG93cyIpKTsNCisNCisgIHJldHVybiAxOw0KK30NCisjZW5kaWYN
Cg0K

--Boundary_(ID_MhThSkxNlKBuBe2yWNK5Ww)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/jack@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/jack@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jack@stripped
# target_branch: file:///C:/w/repo/bug45447/
# testament_sha1: f30825f0b2681702f909d1ebdb57276ed4a33e60
# timestamp: 2009-09-23 12:17:16 +1000
# source_branch: file:///C:/w/repo/mysql-5.1-telco-7.0-bug45402/
# base_revision_id: magnus.blaudd@stripped\
#   1ntbiqr025y4gcbj
# 
# Begin bundle
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


--Boundary_(ID_MhThSkxNlKBuBe2yWNK5Ww)--