From: Magnus Blåudd
Date: October 9 2009 4:20pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3112)
List-Archive: http://lists.mysql.com/commits/86430
Message-Id: <20091009162053.AE96213405D@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_dugrmbC1PS9lFRmMyMTZbw)"

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

I0F0IGZpbGU6Ly8vaG9tZS9tc3ZlbnNzb24vbXlzcWwvNy4wLyBiYXNlZCBvbiBy
ZXZpZDptYWdudXMuYmxhdWRkQHN1bi5jb20tMjAwOTEwMDkxNjEzNTQtOWhtZWdo
c25wY21pN3draw0KDQogMzExMiBNYWdudXMgQmzDpXVkZAkyMDA5LTEwLTA5IFtt
ZXJnZV0NCiAgICAgIE1lcmdlDQoNCiAgICBtb2RpZmllZDoNCiAgICAgIHN0b3Jh
Z2UvbmRiL3NyYy9tZ21zcnYvTWdtdFNydnIuY3BwDQo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9uZGIvc3JjL21nbXNydi9NZ210U3J2ci5jcHAnDQotLS0gYS9z
dG9yYWdlL25kYi9zcmMvbWdtc3J2L01nbXRTcnZyLmNwcAkyMDA5LTA5LTE1IDE5
OjIxOjI1ICswMDAwDQorKysgYi9zdG9yYWdlL25kYi9zcmMvbWdtc3J2L01nbXRT
cnZyLmNwcAkyMDA5LTEwLTA5IDE2OjIwOjM4ICswMDAwDQpAQCAtMTAzOSw3ICsx
MDM5LDkgQEAgaW50IE1nbXRTcnZyOjpzZW5kU3RvcE1nbWQoTm9kZUlkIG5vZGVJ
ZA0KICAgICB9DQogICAgIGlmKCFyZXN0YXJ0KQ0KICAgICB7DQotICAgICAgaWYo
bmRiX21nbV9zdG9wKGgsIDEsIChjb25zdCBpbnQqKSZub2RlSWQpIDwgMCkNCisg
ICAgICBpbnQgbm9kZXNbMV07DQorICAgICAgbm9kZXNbMF09IChpbnQpbm9kZUlk
Ow0KKyAgICAgIGlmKG5kYl9tZ21fc3RvcChoLCAxLCBub2RlcykgPCAwKQ0KICAg
ICAgIHsNCiAgICAgICAgIG5kYl9tZ21fZGVzdHJveV9oYW5kbGUoJmgpOw0KICAg
ICAgICAgcmV0dXJuIFNFTkRfT1JfUkVDRUlWRV9GQUlMRUQ7DQoNCg==

--Boundary_(ID_dugrmbC1PS9lFRmMyMTZbw)
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.0/
# testament_sha1: baebd50e81a86993a8e9cdf3f5d4673f02e5fa67
# timestamp: 2009-10-09 18:20:53 +0200
# source_branch: file:///home/msvensson/mysql/6.3/
# base_revision_id: magnus.blaudd@stripped\
#   9hmeghsnpcmi7wkk
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUPm57cAA2NfgFAQWXf//1Ii
Ggq////wYAZcH0KSikgBQAFHNMTAAmACYAATAAEw5piYAEwATAACYAAmHNMTAAmACYAATAAEwSRN
JoTJglTxphJ6p4mkG0m1D09Sfqg8oc0xMACYAJgABMAATAqUgiemQ0TAmjI0TJpNNJ6am0gekepr
ITZdbbwu9fU9DzKV8bGiwXWDC1jLe1VdzymDsqmSaqzbA+6c90YoKlcfCktiPMoMMyZuWmgdJlZV
vkSbHKmEmm83k47Np0OPO3bp6YjP7DnPYGk6SCo/vytp0ioPsMMxdY4F3xx/Ls57c+82nIvMToeE
a2s67r5Slw5IURxMCBI+RlebzvMWOyzf1bsm/rZysgtC8Th/TfVME0KlSKi9VNiwq9cdNeKJ3InQ
WKH5aO7+Ijtv1GO69ntSdkQMMOMMdSYEmEiYiUgMxxQZBv6GcQOfNhHdCgHohAzIKK41Ewqr5yJG
Go1hCZMy1tZcAnH7/kZWmJVWMYEvSKyzGrVsVrqE5eHQLSYiQ7wdzow7expcb2e5TKzLcDZrdG9R
L1zBRod73SSBaEONh1Wn0O0RE4Oy3V1hsCoYpUwxXme4pAoSoGZacTKESqwvvsibNOScluNb/9Na
SxFYnhmh3WtqtnVvyk0rrZqZKpkZihsXjcrqUjktLlTGdVjHMXsGZHmVr+PYw8M5a1rm4XseJhny
C7KvAc9dcXtslKnkH6Hs5BRi9ZmRZYRna1lSMG56pxZevGZTtaftx4oossmVWqTBqaN+/KmqS5ZZ
WwflxfVXnaex06r8eP8Lx6a3c5V6KTUm3BYtcn62OcqNrwmXHvTUikvpnmtGzhkFRLgvDAtPLZcS
HNg62HjjKV16kMJDskjFSbcW2TnRUtUUVMyWpRlcHNzliMJkTuuuLnLGFDBLNJmkyY/++Zg1/bX9
zRhUTqpF1vzZjUkM3mMD3nzZMwHA+4fU8CRQdQ1RA5BUITFwMhjpmYSihJiLxqy7HUlMrSO5do5C
p9KsaUoyvpYMrt+DmnF1525MI4Q/C9E+HtqMVWRpel5OztofRE3+vm3ODtYubYpHwfBnX2vq+KJi
6PKGhnd7i8WZ3t/Fo1uj2at7Ywd/ivqNkv2olFEvd+dkqxsmpTbkYt7i9W9qjj73JW/GmJeiclkb
3BnURPk30nkZOBuP2t1PPDzaNqpTH+OLe7Wa1b5rVjzWeutTUVl/hSYtOkthc2ZCpv0dZfNzxrfV
KIuw06Ht8LhbtKMWCZTIzIf1WmZLXbLuCampvVvZscJtqezlzpxLl7A+7qzGp4VJ5vse7V6UccYn
Y3TfHNQsJMvgfy8j3fja81PIUaDX48muJnPBsR1l7jFIroLRas26jcfH3QrFYH+1hwPgB2zDjzSx
r2x7vyJrHJD5Pc6Ibdy18vG2ZGg8aUUbpOJ/M9k9j1fVnT0ROg7vRV6tbS8pE/V6fh8X9qPuqKVS
qipVKcotYGc9pa8Wk4R7mmc2K5oMB2uQzZGStoRK3sok8jkyMsnnY0uWVbkYuh+//bvanu6S4vFK
I7SSpPO33nR6TutOfwpWSdiG90LLlBtP9K4YRsqTVarUoahzarZ4vF4prjIYsxL1xfqTnevKP0Pu
+KPfa1s7crR3dOKVFsPRleUyE0P0cWKklcu3FMvhfG/lZvGQtoZ35UMUWJve+SpEv9JxsZyhTHMc
HO1Q0mpCjKm+fE2qOq10ZC5MLM0mh+USq06nJ1lanVuWGCx+5sdtTS3mJc4PQrk7JFyZFIsomYzP
tPRFpV8nL5sUT6ft1PN3GMiaSSsuYLDZLU2NDeh8ZrrFQRocCiwVedgViNLwmKRaMMMbS0R9XWpp
0bppS9kaGVrf/F3JFOFCQQ+bntw=


--Boundary_(ID_dugrmbC1PS9lFRmMyMTZbw)--