From: Magnus Blåudd
Date: November 26 2010 10:37am
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4021)
List-Archive: http://lists.mysql.com/commits/125112
Message-Id: <20101126103748.E646F134061@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4438043786195098724=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tc3ZlbnNzb24vbXlzcWwvNy4wLyBiYXNlZCBvbiByZXZpZDptYWdu
dXMuYmxhdWRkQG9yYWNsZS5jb20tMjAxMDExMjYwOTQ1NDEtaWZ5aGJmaXV4OHg1MXhqZgoKIDQw
MjEgTWFnbnVzIEJsw6V1ZGQJMjAxMC0xMS0yNgogICAgICBuZGIKICAgICAgICByZW1vdmUgdXNl
IG9mIG15X3N0YXQoKSBmcm9tIG5kYl9wcmludF9zeXNfZmlsZQoKICAgIG1vZGlmaWVkOgogICAg
ICBzdG9yYWdlL25kYi9zcmMva2VybmVsL2Jsb2Nrcy9kYmRpaC9wcmludFN5c2ZpbGUuY3BwCj09
PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL25kYi9zcmMva2VybmVsL2Jsb2Nrcy9kYmRpaC9wcmlu
dFN5c2ZpbGUuY3BwJwotLS0gYS9zdG9yYWdlL25kYi9zcmMva2VybmVsL2Jsb2Nrcy9kYmRpaC9w
cmludFN5c2ZpbGUuY3BwCTIwMTAtMDMtMTAgMDc6NDM6MDYgKzAwMDAKKysrIGIvc3RvcmFnZS9u
ZGIvc3JjL2tlcm5lbC9ibG9ja3MvZGJkaWgvcHJpbnRTeXNmaWxlLmNwcAkyMDEwLTExLTI2IDEw
OjM3OjQ0ICswMDAwCkBAIC0xOCwxMSArMTgsMTEgQEAKIAogCiAjaW5jbHVkZSA8bmRiX2dsb2Jh
bC5oPgotI2luY2x1ZGUgPG15X2Rpci5oPgorI2luY2x1ZGUgPHN5cy9zdGF0Lmg+CiAKICNpbmNs
dWRlIDxOZGJNYWluLmg+CiAjaW5jbHVkZSA8TmRiT3V0LmhwcD4KLSNpbmNsdWRlIDxTeXNmaWxl
LmhwcD4KKyNpbmNsdWRlICJTeXNmaWxlLmhwcCIKIAogc3RhdGljIGludCBnX2FsbCA9IDA7CiAK
QEAgLTEzOSw5ICsxMzksOSBAQCBOREJfQ09NTUFORChwcmludFN5c2ZpbGUsIAogICAgICAgY29u
dGludWU7CiAgICAgfQogICAgIAotICAgIE1ZX1NUQVQgc2J1Ziwqc3Q7CisgICAgc3RydWN0IHN0
YXQgc2J1ZjsKIAotICAgIGlmKCEoc3Q9bXlfc3RhdChmaWxlbmFtZSwgJnNidWYsMCkpKQorICAg
IGlmKHN0YXQoZmlsZW5hbWUsICZzYnVmKSAhPSAwKQogICAgIHsKICAgICAgIG5kYm91dCA8PCAi
Q291bGQgbm90IGZpbmQgZmlsZTogXCIiIDw8IGZpbGVuYW1lIDw8ICJcIiIgPDwgZW5kbDsKICAg
ICAgIGNvbnRpbnVlOwoK

--===============4438043786195098724==
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\
#   bpmwd8d4oim916l6
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: c67001ce422e3af5a1bbccef7a7fddeba71fb476
# timestamp: 2010-11-26 11:37:48 +0100
# source_branch: bzr+ssh://peek02.mysql.com/users/msvensson/mysql/7.0/
# base_revision_id: magnus.blaudd@stripped\
#   ifyhbfiux8x51xjf
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXnBrXsAAZFflEAQeWf//1IC
CAC////wAgAIAFADzXPO72Yejzu3e3QlEEAKnsm1G0RGJ5I1MTJppo9IBqnpJ7VPJ6TSbUADQAAA
AAJRGgkwmTUzUYmgGg0NNDQaASSEaJjSajyjCZD1AMQAA0CUU0NMp6QNT8qMm0bUmgABkBoYQyjS
yZfX2wIR2GihTRJYiGL2xir24sotEYk/hhRd31KiqnPu8hL98Z5BnlqjM57x79le9d3C6G273l8P
zKWijm/Fu9mOpd20ZKwTEZSLZLKzSrVSahDaJXGrBPcpOzjvNd1WgR8XIVbXyyPtjVOgtYZwzQYQ
4RUwmH821QIM5+WZSUytjeM/ZYOK0FY1C0xrZBurFYNuIT3G0yj0Btg2zOMQHmJup2bz4cEtGKa7
YNLRIys6OUaSooIOuhVKDCKZqh7zLeUqIUD2yYVoCqlihYWLTCOJcrmlExtATspvaWkcgYnpBKCv
Ww+qMNT0cJBHZYPJC/dxWi5yJha0WB8pZRelaT20Ezi2ZDpBZHI6IBgear6hCNjq4BBBKG1jjEU4
e+Byhs9SvkIsCpxdCpk1EXFeOGspMl5FYu1TdNS8tYRxlLeJNKUzMBK4pddhYaJ0cUzMw7jwqWOV
wKpKL0WSvJglmW7QtPPOFOe1qm/T1jzeISVKin4rbxrpjOVukyVDc/6PG9zGhExzJye/rgMy/nh3
iHOaUqteh8ZCFl5c/nUg6R4KbBDTfgZmtpsPRw3lHFOp0EOvkJxrwM0TpWvQl7MXGdF/zjvzOxmG
5og4eXohOqTRsz4l8OWFjharpKmhZh/6KZWCHrRahVYlD44UHPlw4npK44Ka13t8fRh3zRborKJE
Je6nHGWXhOpGx8i9vuwfynU1oqQ13Q+2UdowmCRGxfjaW8NysgD9mh2DBks47raHLy5e0yWYvOar
SldQj1RDB3bzWwPNJ9HD9QkThAyLOkEWv5wGItyBeJUR+iYY4GlTn5KZBtCe8xpTucb0dgW6RskI
4qfCjSFYdiFqsrUHiGxggoE7r6qiam3QiG2gR2RPY9BXZ8E1Yxpmei6EDYJzcJyCTOkwow0TVTat
NL2ZkzJjqSNZi9T+OamvcJ2cFENuyBYXCEgxJGhM8mAuCY5KqMKkvErfkTXq0aB9JEmR+kDLJNQi
UapLpEKuDSay4OJSjobJJHPf3eI1L0Q8bFqOb2+RlSmBBQfQAVCRYbmQmmgcrSaAayzLQVRgIbFF
OoWKFFUCdfN0wMHA8FpoQlFnFwg8mmg2PcZEiTDk3byGcugnB1it9UxOvJYk6gqcaJKRvYZl2Qg/
v/o/4u5IpwoSDzg1r2A=


--===============4438043786195098724==--