From: Magnus Blåudd
Date: October 20 2010 10:50am
Subject: bzr commit into mysql-next-mr-stage branch (magnus.blaudd:3315) WL#3126
List-Archive: http://lists.mysql.com/commits/121294
Message-Id: <20101020105059.D5BB6134061@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2529971235913337523=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tc3ZlbnNzb24vbXlzcWwvbmV4dC1tci1zdGFnZS8gYmFzZWQgb24g
cmV2aWQ6bWFnbnVzLmJsYXVkZEBzdW4uY29tLTIwMTAxMDE5MDk1NDE3LTAyZzkxdDVrZWFrZG8w
ZngKCiAzMzE1IE1hZ251cyBCbMOldWRkCTIwMTAtMTAtMjAKICAgICAgV2wjMzEyNgogICAgICAg
LSBmaXggZmFpbGluZyB0ZXN0IG9uIFdpbmRvd3MgYnkgcmVtb3ZpbmcgdGhlIHRyb3VibGVzb21l
IHF1b3RlcwoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3IvbXlzcWwucmVzdWx0CiAg
ICAgIG15c3FsLXRlc3QvdC9teXNxbC50ZXN0Cj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0
L3IvbXlzcWwucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3IvbXlzcWwucmVzdWx0CTIwMTAtMTAt
MTggMTI6MTg6MTggKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9yL215c3FsLnJlc3VsdAkyMDEwLTEw
LTIwIDEwOjUwOjUwICswMDAwCkBAIC00MzUsNCArNDM1LDQgQEAgQnVnICM0NzE0NzogbXlzcWwg
Y2xpZW50IG9wdGlvbiAtLXNraXAtYwogCiBFbmQgb2YgdGVzdHMKIENvbm5lY3RlZAotT0sKKzEK
Cj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3QvbXlzcWwudGVzdCcKLS0tIGEvbXlzcWwt
dGVzdC90L215c3FsLnRlc3QJMjAxMC0xMC0xOCAxMjoxODoxOCArMDAwMAorKysgYi9teXNxbC10
ZXN0L3QvbXlzcWwudGVzdAkyMDEwLTEwLTIwIDEwOjUwOjUwICswMDAwCkBAIC00MzMsNCArNDMz
LDQgQEAgZHJvcCB0YWJsZSB0MTsKICMgV0wjMzEyNiBUQ1AgYWRkcmVzcyBiaW5kaW5nIGZvciBt
eXNxbCBjbGllbnQgbGlicmFyeTsKICMgLSBydW5uaW5nIG15c3FsIC0tcHJvdG9jb2w9dGNwIC0t
YmluZC1hZGRyZXNzPTEyNy4wLjAuMQogIwotLS1leGVjICRNWVNRTCAtLXByb3RvY29sPXRjcCAt
LWJpbmQtYWRkcmVzcz0xMjcuMC4wLjEgLWUgInNlbGVjdCBcIk9LXCIgYXMgQ29ubmVjdGVkIgor
LS1leGVjICRNWVNRTCAtLXByb3RvY29sPXRjcCAtLWJpbmQtYWRkcmVzcz0xMjcuMC4wLjEgLWUg
InNlbGVjdCAxIGFzIENvbm5lY3RlZCIKCg==

--===============2529971235913337523==
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/next-mr-stage/
# testament_sha1: 58349c7b9fa41a6cb8380a6c5f5bb5433f161062
# timestamp: 2010-10-20 12:50:59 +0200
# base_revision_id: magnus.blaudd@stripped\
#   02g91t5keakdo0fx
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQtXe20AAhNflAAQXGP/91oG
KKC////wAgAIAFAEeeHLd2Pcenb09e7ASkQ1NqnkxNMTCeoNRtDUaaaADQElJpqmP1UxP0ZAkMRo
MgAAAEpNBNCngJpqGyI9QAANDRoBioJ6amgGmjIaAaAAAABJImVPDSanppkmZTFHmo0I0ZHpA0Fn
tuwT097N480xQmKsFEGmDb5XyQXDt7HO25tuHkwwYM2+aHy6CsWipRVXx0EYLvqMtuEaijcpI9U9
mAxsb8ra6Tjq0yNlHch7I3sHs4kxi3Uqg/CFSWXxZ5DsY6BEmA9o6NdY0ohcJVCVgqx094xvmQY4
BkB3kzuhxAxDVYQHiVCEwDCVytIAQAmAcDgZp509NtCClqIPgUvfH2kUGagY2I6k6LlqZC63IRcb
5s5yNVMJDyWtmz5LMLB4S2NaHcqozVZmVYYhrJFlZeS0aYwTEAxjhh44xkSs7HBwvUKKx2QVMhSA
fUSP0UbJiobrZFu1xHkobsaE1C4od1UyGpWZaFnK76h+IkpP1OGGsWELZAVSLWmSMqAnHSgMpaaE
eVQV/g0CNosC6YWCU0FAXorp1SVcr6k0HZdygG1UbieolofxOJYZJzC4jYZkdNzkovG0OBTPl1SF
NEYnHY+sMAJT7MSY1FU4QGIWEVperplncRlIPpNgCpcwnrUHJRHAsik85EdLIUFJbrmIjDYW1tSb
gWFvC9kICa2osjQTE+YCGQKcy3Y2paBXdCA0xRcBhfBMLEgkl0pBz36V/H0x75mnGois3RaFJXsH
wUcRZYW7WwFo0NnV/mzGWI1mwCDkhPRqETO1MahmSSREral4icN+aY3Y6B8iaTFiPucXFnIROMwy
fs3IXQESiXE16npXGWo0uqV6XCV264jzcT6yvyMIYTHmaJwiDXD0UiVqSkcErUeKQsyZ7tpqwWS4
UrU4eJS/AaaHWqFxDUI50gMsE97bJrYnoVRw3ebz6rPZY3eHVFBdTK5jnP0Q1vCKWBja5B14WZC6
DXxGRznTEcjRSpNxmQS4zracxFGnwgSA7VqL3pYskn/AJC1yjzLETG6k0U+6GhvVos7yVskfmbjj
9XyhNEEadhwYAQGuuxAXjjcTXkuWxDuhkSvkKQRJkV7Zg47BLgJ7naMMwqKO3BfI8PnWAZI+50TD
t+CzI9ZC0yxEQvjFcvOtwzAWsEYJQE4geJzPNdLHbghBeQERJcMg1jPIwyxo4iVw25tNSL/ecnRS
pOV9tkTXZXvH2CsvYYHq07LyTKypfebiEzcDnIBEWS6Zt+lJ0M7GIlPklGECQjYjJ1FpRTSGm3LF
7xKrFH4ezHJwMOWGc1ocbcoTyUGbM3kA8ChqUMvcSdmauFvizDFkPX0XCeYjAGX7dRpxy3KscDNT
NnYOOoqRJU6R1E7g7NoxiBuKtv9sEuXOxAc2mkILvGnJExLuIneUGwn3mmKwkWFbMKsiX97k4ZYG
YHIumUpgPUpp8D/R/4u5IpwoSAWrvbaA


--===============2529971235913337523==--