bzr push into mysql-next-mr-wl4895 branch (marc.alff:3161 to 3162)

[Marc Alff]

 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
 3161 Marc Alff	2010-06-29 [merge]
      Merge mysql-next-mr --> mysql-next-mr-wl4895

    added:
      config/ac-macros/gtest.m4
      sql/sql_alloc_error_handler.cc
      sql/thr_malloc.h.moved
      unittest/CMakeLists.txt
      unittest/gunit/
      unittest/gunit/CMakeLists.txt
      unittest/gunit/FindGTest.cmake
      unittest/gunit/Makefile.am
      unittest/gunit/gunit_test_main.cc
      unittest/gunit/mdl-t.cc
      unittest/gunit/mdl_mytap-t.cc
      unittest/gunit/sql_list-t.cc
      unittest/gunit/tap_event_listener.cc
      unittest/gunit/thread_utils-t.cc
      unittest/gunit/thread_utils.cc
      unittest/gunit/thread_utils.h
      unittest/mytap/t/CMakeLists.txt
    modified:
      .bzrignore
      CMakeLists.txt
      Makefile.am
      configure.in
      libmysqld/CMakeLists.txt
      libmysqld/Makefile.am
      sql/CMakeLists.txt
      sql/Makefile.am
      sql/thr_malloc.cc
      unittest/Makefile.am
      unittest/unit.pl
=== 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


Attachment: [text/bzr-bundle] bzr/[e-mail]