From: Magnus Blåudd
Date: August 5 2010 8:58am
Subject: bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:3724 to 3725)
List-Archive: http://lists.mysql.com/commits/115063
Message-Id: <20100805085813.417001340DA@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2845643721315209445=="

--===============2845643721315209445==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

IDM3MjUgTWFnbnVzIEJsw6V1ZGQJMjAxMC0wOC0wNSBbbWVyZ2VdCiAgICAgIE1lcmdlIDcuMCAt
PiA3LjEKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9uZGIvaW5jbHVkZS9uZGJfdmVyc2lv
bi5oLmluCiAgICAgIHN0b3JhZ2UvbmRiL25kYl9jb25maWd1cmUubTQKIDM3MjQgTWFnbnVzIEJs
w6V1ZGQJMjAxMC0wOC0wNAogICAgICBuZGIKICAgICAgIC0gTWFrZSB0aGUgU0VUX0pBVkFfTkRC
X1ZFUlNJT04gbWFjcm8gcnVuIGV2ZXJ5dGltZQogICAgICAgLSBGaXggY21ha2Ugc3ludGF4IGVy
cm9yCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvbmRiL2NvbmZpZy90eXBlX0pBVkEuY21h
a2UKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvbmRiL2luY2x1ZGUvbmRiX3ZlcnNpb24uaC5p
bicKLS0tIGEvc3RvcmFnZS9uZGIvaW5jbHVkZS9uZGJfdmVyc2lvbi5oLmluCTIwMTAtMDgtMDQg
MTQ6MDA6MjQgKzAwMDAKKysrIGIvc3RvcmFnZS9uZGIvaW5jbHVkZS9uZGJfdmVyc2lvbi5oLmlu
CTIwMTAtMDgtMDUgMDg6MTI6MzEgKzAwMDAKQEAgLTIyLDIyICsyMiwzOCBAQAogI2luY2x1ZGUg
PG5kYl90eXBlcy5oPgogI2luY2x1ZGUgPG15c3FsX3ZlcnNpb24uaD4KIAotLyogTkRCIHZlcnNp
b24gbnVtYmVycyBhbmQgc3RhdHVzICovCisvKgorICBDcmVhdGVzIGEgY29tcG9zaXRlIHZlcnNp
b24gbnVtYmVyIGZyb20gbWFqb3IsIG1pbm9yIGFuZCBidWlsZAorICBleDogTkRCX01BS0VfVkVS
U0lPTig1LDEsNDcpID0+IDB4MDAwNTAxNDcKKyovCisjZGVmaW5lIE5EQl9NQUtFX1ZFUlNJT04o
QSxCLEMpICgoKEEpIDw8IDE2KSB8ICgoQikgPDwgOCkgIHwgKChDKSA8PCAwKSkKKworLyogTkRC
IHZlcnNpb24gbnVtYmVycyBhbmQgc3RhdHVzICAqLwogI2RlZmluZSBOREJfVkVSU0lPTl9NQUpP
UiBATkRCX1ZFUlNJT05fTUFKT1JACiAjZGVmaW5lIE5EQl9WRVJTSU9OX01JTk9SIEBOREJfVkVS
U0lPTl9NSU5PUkAKICNkZWZpbmUgTkRCX1ZFUlNJT05fQlVJTEQgQE5EQl9WRVJTSU9OX0JVSUxE
QAogI2RlZmluZSBOREJfVkVSU0lPTl9TVEFUVVMgIkBOREJfVkVSU0lPTl9TVEFUVVNAIgogCi0v
KiBNeVNRTCBTZXJ2ZXIgdmVyc2lvbiBudW1iZXJzIGV4dHJhY3RlZCBmcm9tIE1ZU1FMX1ZFUlNJ
T05fSUQgKi8KKy8qIENvbXBvc2l0ZSB2ZXJzaW9uIG51bWJlciBmb3IgTkRCICovCisjZGVmaW5l
IE5EQl9WRVJTSU9OX0QgXAorICBOREJfTUFLRV9WRVJTSU9OKE5EQl9WRVJTSU9OX01BSk9SLCBO
REJfVkVSU0lPTl9NSU5PUiwgTkRCX1ZFUlNJT05fQlVJTEQpCisKKy8qCisgIFRoZSB2ZXJzaW9u
IG51bWJlciBvZiB0aGUgTXlTUUwgU2VydmVyIHRoYXQgTkRCIGlzIGJ1aWx0CisgIHdpdGguIEV4
dHJhY3RlZCBmcm9tIE1ZU1FMX1ZFUlNJT05fSUQKKyovCiAjZGVmaW5lIE5EQl9NWVNRTF9WRVJT
SU9OX01BSk9SICgoTVlTUUxfVkVSU0lPTl9JRCAvIDEwMDAwKSAlIDEwMCkKICNkZWZpbmUgTkRC
X01ZU1FMX1ZFUlNJT05fTUlOT1IgKChNWVNRTF9WRVJTSU9OX0lEIC8xMDApICUgMTAwKQogI2Rl
ZmluZSBOREJfTVlTUUxfVkVSU0lPTl9CVUlMRCAoTVlTUUxfVkVSU0lPTl9JRCAlIDEwMCkKIAot
I2RlZmluZSBOREJfTUFLRV9WRVJTSU9OKEEsQixDKSAoKChBKSA8PCAxNikgfCAoKEIpIDw8IDgp
ICB8ICgoQykgPDwgMCkpCisvKiBDb21wb3NpdGUgdmVyc2lvbiBudW1iZXIgZm9yIE1ZU1FMIFNl
cnZlciAqLworI2RlZmluZSBOREJfTVlTUUxfVkVSU0lPTl9EIFwKKyAgTkRCX01BS0VfVkVSU0lP
TihOREJfTVlTUUxfVkVSU0lPTl9NQUpPUiwgXAorICAgICAgICAgICAgICAgICAgIE5EQl9NWVNR
TF9WRVJTSU9OX01JTk9SLCBcCisgICAgICAgICAgICAgICAgICAgTkRCX01ZU1FMX1ZFUlNJT05f
QlVJTEQpCiAKLSNkZWZpbmUgTkRCX01ZU1FMX1ZFUlNJT05fRCBOREJfTUFLRV9WRVJTSU9OKE5E
Ql9NWVNRTF9WRVJTSU9OX01BSk9SLCBOREJfTVlTUUxfVkVSU0lPTl9NSU5PUiwgTkRCX01ZU1FM
X1ZFUlNJT05fQlVJTEQpCi0jZGVmaW5lIE5EQl9WRVJTSU9OX0QgTkRCX01BS0VfVkVSU0lPTihO
REJfVkVSU0lPTl9NQUpPUiwgTkRCX1ZFUlNJT05fTUlOT1IsIE5EQl9WRVJTSU9OX0JVSUxEKQog
I2RlZmluZSBOREJfVkVSU0lPTl9TVFJJTkdfQlVGX1NaIDEwMAorCiAjaWZkZWYgX19jcGx1c3Bs
dXMKIGV4dGVybiAiQyIgewogI2VuZGlmCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9uZGIv
bmRiX2NvbmZpZ3VyZS5tNCcKLS0tIGEvc3RvcmFnZS9uZGIvbmRiX2NvbmZpZ3VyZS5tNAkyMDEw
LTA4LTA0IDE0OjE1OjE0ICswMDAwCisrKyBiL3N0b3JhZ2UvbmRiL25kYl9jb25maWd1cmUubTQJ
MjAxMC0wOC0wNSAwODoxNDowOCArMDAwMApAQCAtMSw0ICsxLDUgQEAKLSMgVGhlIHZlcnNpb24g
bnVtYmVyIG9mIE5EQgorIyBUaGUgTkRCIHZlcnNpb24gbnVtYmVyIGFuZCBzdGF0dXMuCisjIFNo
b3VsZCBiZSB1cGRhdGVkIHdoZW4gY3JlYXRpbmcgYSBuZXcgTkRCIHZlcnNpb24KIE5EQl9WRVJT
SU9OX01BSk9SPTcKIE5EQl9WRVJTSU9OX01JTk9SPTEKIE5EQl9WRVJTSU9OX0JVSUxEPTYKCg==

--===============2845643721315209445==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/magnus.blaudd@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped
# target_branch: file:///home/msvensson/mysql/7.1/
# testament_sha1: 6623338131c0bb3a6faf14963a961f0c2010415d
# timestamp: 2010-08-05 10:58:13 +0200
# source_branch: file:///home/msvensson/mysql/7.0/
# base_revision_id: magnus.blaudd@stripped\
#   nhqwq2o4xga28mky
# 
# Begin bundle
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


--===============2845643721315209445==--