From: Marc Alff
Date: July 2 2010 5:25pm
Subject: bzr commit into mysql-next-mr-wl4895 branch (marc.alff:3162)
List-Archive: http://lists.mysql.com/commits/112782
Message-Id: <20100702172530.3C72645E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2437135896804893256=="

--===============2437135896804893256==
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-wl4895/ based on revid:marc.alff@stripped

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

    modified:
      include/mysql/psi/mysql_table.h
      mysql-test/include/mtr_check.sql
      mysql-test/suite/perfschema/t/myisam_table_io.test
      mysql-test/suite/perfschema/t/start_server_no_table_hdl.test
      mysql-test/suite/perfschema/t/start_server_no_table_inst.test
      mysql-test/suite/perfschema/t/start_server_nothing.test
      storage/perfschema/table_helper.h
=== modified file 'include/mysql/psi/mysql_table.h'
--- a/include/mysql/psi/mysql_table.h	2010-05-20 14:05:57 +0000
+++ b/include/mysql/psi/mysql_table.h	2010-07-02 17:25:26 +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 */
 
 #ifndef MYSQL_TABLE_H
 #define MYSQL_TABLE_H

=== modified file 'mysql-test/include/mtr_check.sql'
--- a/mysql-test/include/mtr_check.sql	2010-05-05 08:16:47 +0000
+++ b/mysql-test/include/mtr_check.sql	2010-07-02 17:25:26 +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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program; if not, write to the Free Software Foundation,
+# 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
 
 delimiter ||;
 

=== modified file 'mysql-test/suite/perfschema/t/myisam_table_io.test'
--- a/mysql-test/suite/perfschema/t/myisam_table_io.test	2010-05-07 12:14:13 +0000
+++ b/mysql-test/suite/perfschema/t/myisam_table_io.test	2010-07-02 17:25:26 +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
 
 # Tests for PERFORMANCE_SCHEMA
 

=== modified file 'mysql-test/suite/perfschema/t/start_server_no_table_hdl.test'
--- a/mysql-test/suite/perfschema/t/start_server_no_table_hdl.test	2010-05-17 10:05:47 +0000
+++ b/mysql-test/suite/perfschema/t/start_server_no_table_hdl.test	2010-07-02 17:25:26 +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
 
 # Tests for PERFORMANCE_SCHEMA
 

=== modified file 'mysql-test/suite/perfschema/t/start_server_no_table_inst.test'
--- a/mysql-test/suite/perfschema/t/start_server_no_table_inst.test	2010-05-17 10:05:47 +0000
+++ b/mysql-test/suite/perfschema/t/start_server_no_table_inst.test	2010-07-02 17:25:26 +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
 
 # Tests for PERFORMANCE_SCHEMA
 

=== modified file 'mysql-test/suite/perfschema/t/start_server_nothing.test'
--- a/mysql-test/suite/perfschema/t/start_server_nothing.test	2010-05-17 10:05:47 +0000
+++ b/mysql-test/suite/perfschema/t/start_server_nothing.test	2010-07-02 17:25:26 +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
 
 # Tests for PERFORMANCE_SCHEMA
 

=== modified file 'storage/perfschema/table_helper.h'
--- a/storage/perfschema/table_helper.h	2010-06-02 08:31:27 +0000
+++ b/storage/perfschema/table_helper.h	2010-07-02 17:25:26 +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 */
 
 #ifndef PFS_TABLE_HELPER_H
 #define PFS_TABLE_HELPER_H


--===============2437135896804893256==
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-wl4895/
# testament_sha1: 27ffe83f3816a4c3f74040812304fccc2e497705
# timestamp: 2010-07-02 11:25:30 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-next-mr/
# base_revision_id: marc.alff@stripped\
#   talpgikrte4kmg7w
# 
# Begin bundle
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
4u5IpwoSEHTBkcA=


--===============2437135896804893256==--