From: Kent Boortz
Date: May 3 2011 2:27pm
Subject: bzr push into mysql-trunk branch (kent.boortz:3360 to 3361)
List-Archive: http://lists.mysql.com/commits/136581
Message-Id: <20110503142742.26618.qmail@helheim>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0328964089=="

--===============0328964089==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3361 Kent Boortz	2011-05-03 [merge]
      Merge

 3360 Alexander Nozdrin	2011-05-03
      MTR tests for QA sign off of wl#5787.

    modified:
      mysql-test/include/ipv6.inc
      mysql-test/r/ipv4_as_ipv6.result
      mysql-test/r/ipv6.result
      mysql-test/t/ipv4_as_ipv6.test
      mysql-test/t/ipv6.test

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kent.boortz@stripped
# target_branch: file:///net/helheim/store/bteam/bzr/kent/bug43312\
#   /mysql-trunk/
# testament_sha1: 9f2fe67abe14eb46195c09f145b81b9d62ed615d
# timestamp: 2011-05-03 16:27:42 +0200
# source_branch: file:///net/helheim/store/bteam/bzr/kent/bug43312\
#   /mysql-5.5/
# base_revision_id: alexander.nozdrin@stripped\
#   xy365zff0vd1fsu9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXqmRjEAA0ffgEAwXGf//1IO
PAS////wUAXtd69eo1Ds8B6dpEugJKCjaCaaniNMg0U/Un6TU9GnqjQNBoBkgTEDTKanpNANAAAA
AeoJFARM0k8mqbUNomho0yAB6QGgEVBGSnqeRPUNT0YjSfqRo9QDQBoMgikJEyPRij01E/SCehoT
TTRoZDEZNLjSVbQxPr29Bh+zZtludumBw3U2dJTwhc9Pg/M9R1nnj/Y9x4PhZg2fbiL9yVUPazRw
gyN/+KHs+vWcSDLaE72ippw9mo5SDSuLpCiatTs8QvdncB66MWF+ySUAMN4fs1dbcbEOVoz2uk41
8HBv5m0wjXu44639YK/DTQQ3VgYCbNsiuIqlLDPUhD8a2fO4lpvh8IWlSySLGuua5DchQtLpisfg
MBWl1kvAaVvaXVDGJGRQRAD4XLiULwFVXHADMvOALpKLVCN29sL4H0mi0hrHbZydzbJFnSR0QZOu
rc2mOF2mWMdiorJ4+ZBBBRJpRYb1y96yUzGpNN/fjDdE6HvLpLWd+zVdI1Pkum7VojIgaFx6nRFF
55CpQesIoLgjHeb/DOMNFu6HdSV5uw5cQNxSzuxkb48kqiwMQwQOAUYIe91BzDKWZlO/F7A6FMvo
uFEFo6YX1gMi5noQbUvfMhdOCvAPIwN2UaPPgxxtZAsWS5TVwoY02d3KhcYFSGRGoBCzDR6leacm
w8RuQlqlhXDWeOWyZVrMkqQ5oquuBenic7b9AFmhdtXGdcCZlIqQCeBlKuT3o85SwmwVmZCwKrQ6
ytgVkyrbIGOY4icYRDaydZmodl9yXRvAkZEqtGYxrvR1EgosWGx0k7E32KFlQijYF1dpU/I6o0bz
2ECaRIUGCD0ks0vXdkXAPw3FhG6LCgVZM8oRrxKZrDQX62hbcyOAuJ30C13AtZmVqYyAVMgmUopJ
NQVIUC4CNVVQUla2nxBnYtprbngHUuPjUQO1dSoulJO9YsYwbf3sdzl2n6ygu99dFIqYIPTFxnOU
GPS3DLm7tjL40ts2/MRf5WOy8wFmhDcXz1KIDooz24mpeMvkra1IpVzU0ySwUyWbrYdNTcjptMw2
XW2ksXCsA1rj4GDg/XglArV8pMzTfXXpe18V3bx4K+xiYAspUAVKA5TnYZjXt4K9UHeM0TqooRLI
lVNFwzpj7I0aQNZnWo5q9yk2p69wWriZc1oWFwQpotc0En5V9ORM1zX2py8zKD3bDe9/d3wHJnwT
GzxgcaP74Y7ifEspjvNFnub+WR6TBXVWuUNju7ELip6vQzZoS4t2LkXxY55fxmPjR8TPpeNWE0IL
ycQcuKuWRmhzUitDAUojBSIct9h1Gt3kC1ddaGsPWnfhhFnkLFGDSxNqDj2iXl1oWDQ71UurV2gg
lMXeUg4Da+Gpqc6y5gL3ueQ0S40IOu8agsdJzNHySD2Wt4aDBz5xOkb8yo1egm0A0X/ba8zRrEzG
0Tv2tM2xsefYaAeIxhhh4sGXgd5FwQSlvl1+IGZ1oa6HdT90eVTocoOEoQwZgzFyAYGTHdHa72xo
7UNBaHYK7oOJNeDZqbho3VZONraFhxGEnyAoVcLmLgsJvCLW9mBAZMbGmLK35tyrKCwQ39XMUh6l
5wQtE3v1LFcoWgO0DdXquQJqa5V8ITYZN28amUL2hUGV7DPq+fbPcfyYH3jZpckiSnHihWAGDXpO
gtUwex5QuHtw9DLcWeOKyemtWjYITgppDKMF0q1FkGcfK2NYSWYiF65GNj0Mz1dj4LgkZCcYHW74
hNwx3lvPFQkw+5tXUxcnSelgUa5uA1A2XsIL5rIri1kgbCj5u060MmdsMOmj2oSdDrYztcUNYma1
7sz4r3ReFzUDU6Q7YKbXYh359XDgSUqzL4K7tT1HO+80ukyQ8//F3JFOFCQeqZGMQA==


--===============0328964089==--