From: Marc Alff
Date: July 2 2010 4:50pm
Subject: bzr commit into mysql-next-mr branch (marc.alff:3161)
List-Archive: http://lists.mysql.com/commits/112778
Message-Id: <20100702165054.C523845E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0870406147223289947=="

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

#At file:///home/malff/BZR_TREE/mysql-next-mr-wl4674/ based on revid:marc.alff@stripped

 3161 Marc Alff	2010-07-02
      Implemented code review comments

    modified:
      mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic.test
=== modified file 'mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic.test'
--- a/mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic.test	2010-05-14 14:21:56 +0000
+++ b/mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic.test	2010-07-02 16:50:51 +0000
@@ -10,8 +10,8 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, write to the Free Software Foundation,
+# 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///home/malff/BZR_TREE/mysql-next-mr-wl4674/
# testament_sha1: cbc3c40ac419318c25173f97582336563fd9d952
# timestamp: 2010-07-02 10:50:54 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-next-mr/
# base_revision_id: marc.alff@stripped\
#   xzhmhddr8rzy50ya
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfNLggkAAYbfgAAQWGf//3Mi
CgC////wUAOa8ddJ7evXpQYaTUnlNHqA9RtR6m0jTRiDQGgAGoQj2RTaaagBoA0A0AABoTRqNE8h
BP1T1HohkABoANBpqmpoNGmIZAyGjRoxNGg0yYEkiYIEZDImIZI9MiAE2UZLaYnvncNQzMoXM6sA
X6kdpV0Gl1PMzG+fiPl7GKKab4kwCq2xSUGhZxw1e1dPsyWXfJ+oTAfXBXfezI1rj2EaCN5ynuk0
zoPd/T2Ed+XjoFSR7a7Tfu1XhTxSM0hsbZ1bJkEahp0bmn8ngn4OHAmaqKB6lEUl6DINDNGCnJUP
2Sex0rXa1DnMl4RiCzL61kct16c9rAK5OTCDktEoIVDwhhyj1LPEaZxAHEgCNHDAbg4XxWzy9xPx
nJ61IWfXOARg9B3XYwI5jqSNMiCIgoMQtaFodxY3NG+JMYeUhO1RLMgu11uETJx0ZGqV47hvutIG
grfwFddIXFOvFp4jlxtuDa7TmzOs2uuGKmLLVMnVFSctbC1zo+WvV0L7VjlieZWOQeDUwM8p4ZAp
SKEDOxhGl+Gha2jiUXWGI6XNYiwnSIsUVBgwJQskQWShYcHkGcGCEbG8PAgx7ekce7KO2QceHjFm
RBTTjw5ChHxSikRP5YDml7KWyBD2KKIJWA7/TjPwSPdU6LacSyIU6pHrp5Qwdg86i/2/tu4JH21o
bAUtFM4UC2rodHiTTLMBEATpAtkVr5ms2ETgyIPkIg1z1WXeG3tXWWKKa/0IJ/r8V8sr+4eXivVH
+WdMO+UHAQdIqU2nMVokqjJYDAxi32Mb6Jk4pFC5bOa8mTuoPWLP8TOWGvHTltlU1cFSiI6JKWdU
dRQ5jQSHDxxeCgPvLZG1BsuLJFrsILPkGAESdU9Ks5Wleoz1nDt3Eb9OGQbFUPx+4XavfLVVPSHj
cHxx7ZxC/MThdxjuMgzceu4LJhW8NFckhjf7ZpHnudlrdY2IhmzD7n4GTGhQvo+4LgSxDnj+2Iwe
C1wcBNYOQ0V8QSmAZb+MTPkaPy1nUUEKk2Dyy7TP+SIhcmXFl9ud3827BZLLNmXmKBCXDiVXUpSf
No71YrEl8/nfJCbByLLOTivz6WKempnqDB+1wxJZrctc/EUNFq5OHYWA4O8UVl+q1poiltVW7f/Y
ucRuHPs/GZyi4nXquH1WI5qxfBpMFNCyxi63Qq9JRXUShdsZ4dR4XrYqfVcsCzW5QR6QgkfxdyRT
hQkPNLggkA==


--===============0870406147223289947==--