List:Commits« Previous MessageNext Message »
From:Marc Alff Date:July 2 2010 4:16pm
Subject:bzr push into mysql-next-mr branch (marc.alff:3158 to 3159)
View as plain text  
 3159 Marc Alff	2010-07-02
      Implemented code review comments

    modified:
      storage/perfschema/pfs_defaults.cc
      storage/perfschema/pfs_defaults.h
      storage/perfschema/pfs_setup_actor.cc
      storage/perfschema/pfs_setup_actor.h
      storage/perfschema/table_events_waits.h
      storage/perfschema/table_events_waits_summary.h
      storage/perfschema/table_file_instances.h
      storage/perfschema/table_file_summary.h
      storage/perfschema/table_setup_actors.cc
      storage/perfschema/table_setup_actors.h
      storage/perfschema/table_setup_objects.h
      storage/perfschema/table_sync_instances.h
      storage/perfschema/table_threads.cc
      storage/perfschema/table_threads.h
 3158 Marc Alff	2010-06-29 [merge]
      Merge mysql-next-mr --> mysql-next-mr-wl4674

    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 'storage/perfschema/pfs_defaults.cc'
--- a/storage/perfschema/pfs_defaults.cc	2010-05-11 10:36:37 +0000
+++ b/storage/perfschema/pfs_defaults.cc	2010-07-02 16:15:37 +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 */
 
 /**
   @file storage/perfschema/pfs_defaults.cc

=== modified file 'storage/perfschema/pfs_defaults.h'
--- a/storage/perfschema/pfs_defaults.h	2010-05-11 10:36:37 +0000
+++ b/storage/perfschema/pfs_defaults.h	2010-07-02 16:15:37 +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_DEFAULTS_H
 #define PFS_DEFAULTS_H

=== modified file 'storage/perfschema/pfs_setup_actor.cc'
--- a/storage/perfschema/pfs_setup_actor.cc	2010-05-11 10:36:37 +0000
+++ b/storage/perfschema/pfs_setup_actor.cc	2010-07-02 16:15:37 +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 */
 
 /**
   @file storage/perfschema/pfs_setup_actor.cc

=== modified file 'storage/perfschema/pfs_setup_actor.h'
--- a/storage/perfschema/pfs_setup_actor.h	2010-05-07 10:08:23 +0000
+++ b/storage/perfschema/pfs_setup_actor.h	2010-07-02 16:15:37 +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_SETUP_ACTOR_H
 #define PFS_SETUP_ACTOR_H

=== modified file 'storage/perfschema/table_events_waits.h'
--- a/storage/perfschema/table_events_waits.h	2010-06-03 13:30:54 +0000
+++ b/storage/perfschema/table_events_waits.h	2010-07-02 16:15:37 +0000
@@ -141,7 +141,7 @@ protected:
 
   /** Current row. */
   row_events_waits m_row;
-  /** True is the current row exists. */
+  /** True if the current row exists. */
   bool m_row_exists;
 };
 

=== modified file 'storage/perfschema/table_events_waits_summary.h'
--- a/storage/perfschema/table_events_waits_summary.h	2010-06-03 13:30:54 +0000
+++ b/storage/perfschema/table_events_waits_summary.h	2010-07-02 16:15:37 +0000
@@ -136,7 +136,7 @@ private:
 
   /** Current row. */
   row_events_waits_summary_by_thread_by_event_name m_row;
-  /** True is the current row exists. */
+  /** True if the current row exists. */
   bool m_row_exists;
   /** Current position. */
   pos_events_waits_summary_by_thread_by_event_name m_pos;
@@ -253,7 +253,7 @@ private:
 
   /** Current row. */
   row_events_waits_summary_by_instance m_row;
-  /** True is the current row exists. */
+  /** True if the current row exists. */
   bool m_row_exists;
 };
 

=== modified file 'storage/perfschema/table_file_instances.h'
--- a/storage/perfschema/table_file_instances.h	2010-06-03 13:30:54 +0000
+++ b/storage/perfschema/table_file_instances.h	2010-07-02 16:15:37 +0000
@@ -78,7 +78,7 @@ private:
 
   /** Current row. */
   row_file_instances m_row;
-  /** True is the current row exists. */
+  /** True if the current row exists. */
   bool m_row_exists;
   /** Current position. */
   PFS_simple_index m_pos;

=== modified file 'storage/perfschema/table_file_summary.h'
--- a/storage/perfschema/table_file_summary.h	2010-06-03 13:30:54 +0000
+++ b/storage/perfschema/table_file_summary.h	2010-07-02 16:15:37 +0000
@@ -139,7 +139,7 @@ private:
 
   /** Current row. */
   row_file_summary_by_instance m_row;
-  /** True is the current row exists. */
+  /** True if the current row exists. */
   bool m_row_exists;
   /** Current position. */
   PFS_simple_index m_pos;

=== modified file 'storage/perfschema/table_setup_actors.cc'
--- a/storage/perfschema/table_setup_actors.cc	2010-05-12 14:04:32 +0000
+++ b/storage/perfschema/table_setup_actors.cc	2010-07-02 16:15:37 +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 */
 
 /**
   @file storage/perfschema/table_setup_actors.cc

=== modified file 'storage/perfschema/table_setup_actors.h'
--- a/storage/perfschema/table_setup_actors.h	2010-05-12 14:04:32 +0000
+++ b/storage/perfschema/table_setup_actors.h	2010-07-02 16:15:37 +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 TABLE_SETUP_ACTORS_H
 #define TABLE_SETUP_ACTORS_H
@@ -94,7 +94,7 @@ private:
 
   /** Current row. */
   row_setup_actors m_row;
-  /** True is the current row exists. */
+  /** True if the current row exists. */
   bool m_row_exists;
   /** Current position. */
   PFS_simple_index m_pos;

=== modified file 'storage/perfschema/table_setup_objects.h'
--- a/storage/perfschema/table_setup_objects.h	2010-06-03 13:30:54 +0000
+++ b/storage/perfschema/table_setup_objects.h	2010-07-02 16:15:37 +0000
@@ -113,7 +113,7 @@ private:
 
   /** Current row. */
   row_setup_objects m_row;
-  /** True is the current row exists. */
+  /** True if the current row exists. */
   bool m_row_exists;
   /** Current position. */
   pos_setup_objects m_pos;

=== modified file 'storage/perfschema/table_sync_instances.h'
--- a/storage/perfschema/table_sync_instances.h	2010-06-03 13:30:54 +0000
+++ b/storage/perfschema/table_sync_instances.h	2010-07-02 16:15:37 +0000
@@ -82,7 +82,7 @@ private:
 
   /** Current row. */
   row_mutex_instances m_row;
-  /** True is the current row exists. */
+  /** True if the current row exists. */
   bool m_row_exists;
   /** Current position. */
   PFS_simple_index m_pos;
@@ -141,7 +141,7 @@ private:
 
   /** Current row. */
   row_rwlock_instances m_row;
-  /** True is the current row exists. */
+  /** True if the current row exists. */
   bool m_row_exists;
   /** Current position. */
   PFS_simple_index m_pos;
@@ -194,7 +194,7 @@ private:
 
   /** Current row. */
   row_cond_instances m_row;
-  /** True is the current row exists. */
+  /** True if the current row exists. */
   bool m_row_exists;
   /** Current position. */
   PFS_simple_index m_pos;

=== modified file 'storage/perfschema/table_threads.cc'
--- a/storage/perfschema/table_threads.cc	2010-05-11 10:36:37 +0000
+++ b/storage/perfschema/table_threads.cc	2010-07-02 16:15:37 +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 */
 
 #include "my_global.h"
 #include "my_pthread.h"

=== modified file 'storage/perfschema/table_threads.h'
--- a/storage/perfschema/table_threads.h	2010-05-11 10:36:37 +0000
+++ b/storage/perfschema/table_threads.h	2010-07-02 16:15:37 +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 TABLE_THREADS_H
 #define TABLE_THREADS_H
@@ -97,7 +97,7 @@ private:
 
   /** Current row. */
   row_threads m_row;
-  /** True is the current row exists. */
+  /** True if the current row exists. */
   bool m_row_exists;
   /** Current position. */
   PFS_simple_index m_pos;


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100702161537-pslgsvnacoae4nqi.bundle
Thread
bzr push into mysql-next-mr branch (marc.alff:3158 to 3159) Marc Alff2 Jul