From: Marc Alff
Date: July 2 2010 4:16pm
Subject: bzr push into mysql-next-mr branch (marc.alff:3158 to 3159)
List-Archive: http://lists.mysql.com/commits/112770
Message-Id: <20100702161604.4B18E45E81@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1840607556021942353=="

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

 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;


--===============1840607556021942353==
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: 56ee2cae784427b2ca047b7c84908ce35f16cc7b
# timestamp: 2010-07-02 10:16:04 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-next-mr/
# base_revision_id: marc.alff@stripped\
#   6b7yz8qhrfy2ug92
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWaNEMIACfNfgBAQUHf//3Mi
DgC////wYAx/eovqjIAAAACkQAGgUkUW2tK0hzAAAAAAAAAABzAAAAAAAAAABzAAAAAAAAAAAk1J
NCaaU2RqNMIAAAAaACKSCnoZJjKn6nlM1R6mxTT1DIPUDI0BUogBAaaEBMQQ0Cmmj9UaZHqbjfy5
yjlTnbTa/x1kKQ/4vtYZVmLtZ1fyw0wkbAtA2rYKqt1FXNjd0x22i82W8JJqSXNmGVZb787O+Exy
tGSlMcbbKSJf3nqKDaR1SfdJmSIrAYCqCrIfTEDjAOXZt7M7JwbvatQFNmyAyJyNIvDZIcLZXwwr
NMM/cBvAwxxrMqqbVbKtmiVhhVOxp1cnBpwffv5wNwXCgqKDmKj0kYjiP5/1hIpIoXp6cAJlKMBd
IHlIXzAokripALvApY/AuH4HMdfGmvnZ4e9fDysw9LZTD0uuuUtyu3x6IYiIpFpyFnNU1NdVhLVN
1HMBzQKu7TkpxVZIew3ig8A/Hn5+OtbbbbeCTEWvwk7MSj6Kr1j/FVVFFYqqrIjXzLR5vhUo854r
vRE6dH+N2bE8mQMUzrHP0conS3ihLF2Ih1kCJSZKglFE6ZA6IE4XxJOYk13JJ1ORJNzJIpDk3775
Yd7ICgMkwBRExVVRDN41MmciResmKJTK1EvZqZjUGdiYRitarLGCkUUkOyaLLEqpJRWoN8VufC0q
Uu4LUTDLepoxWqMgurGbB5KrFnF8fva4snDJi4tFMMzRhaWnH941gs0qX0v52LK1sxhhIYSpjxsG
K+RJUoDGP6N05XRfzVOLR5q2s3R1wLbZmLIYlCkSxEtyNmWfDddDJEyavddpy0bdsbOmuF1uF99v
Vvoc06j+3LZfKNmqwLpJa7hZzUkuckTe/z2tL2nV27dgdVl04QOKb3VaycmLY+PlsxcqabLXim5o
k5MFW53/pEpOS5g735XqKvCm6RfhzqLOK2/EzrIkXolr73tpeMi9hYDdOdrcro8mWVe1ilHg6Imy
zg0c2zNpgzuv03rl/dumPa1shlBwa5LHB0PRsuYPGx0dHos1b36PlNmfa/PDlblovtMNUvwXsFnP
VNGDbl/s4NW+7v25JxUHPBx4vsu7qZXcRwdn0YNm0at7Pg3OoPGN+G1VXZuwpqsvaMccFlFOt1Wd
V6je7pcv75NCyzkwYRqq3PJzeDR/TxvWXU543bXwooUpL77+aJRNrpJSqrZXVYGSlq51aLXpRycl
yy5ov22uODJUk3vjsc1reo3yTBcuWlzWiqxipg00qDHvOHLy49N1lfCkpaKXcsLVi8cHSMlGK0dd
CxbIZZ0WuOjNllm6QcObjVaDPi4JYspxl/BTesMqTp1XuFjcxvsUXtnF5xwmb14tGMbLJz5c7KaS
lLLd1i25tuHJfcDFyRLpWNrl0tN7dxxXTvazWNWy+/sub3E7bg3OF7WUdFFiro5tHM3LXBXRZV+6
e8cX5onjtGG2/rmIqC53WrIpTu4MZ3Y7OTo379NGjLLBc4zf5ZcVLq9+Kk2UdVyrs3PDVDmsWs2j
ZuaLV7lNiuFL999l21VrBioxtpbcpVoXFtY3M165RvvwUsoppPpazcLVNOrpa53qm5QzYKubFycu
fK5qsL2q9XdZY4s3TNSE9IdzTtmjLvGxwp1bTHQ1K43vxOZibpz5mbgxcKqs6tXNu1b7G5wc180U
sc1lsGajNstYNVTBRm4MmrJe73LW5PsmXGnakKra1Q25uOJA0tJLlADk3kl4Bjk94D3yThn1Jugo
ggsYegk7sksqqqKiIiorz+sk2cSBOwDsA256gKRkFB+9gsoJ2oKf5FZEdyfolxOPNJUPGUQul380
FkLiStSUTik7PZeHdRJq7KMbng3PJ5MHk+ax54P4ergyVvYt+59MGjoklq9t90J2B/onX6ubqrxV
k/gHBoufR0eW+Dr90/RCff5D9V46JO0lYbvr7oTMd5JKyeo9E/W18ns83V7PJ5va1Yq8XtHm4Pk9
2+Ln7FWL2cWODVw7KaKq5L3Dim+rBT3mKSfNq+v5SI8+Jy160qksT4VJchNXdRhbg6KOqro2aP/W
2bVc8GbFe/XX3m93XuiNWrm04MFj+uLRM31ZllfySfW1nbFEI+3BCU5WE3yyR7RVwZIlV3R0x8t/
FkwauzVc8Hi3KLlXssXN+/g+23g8Ti8A5vdsFrJdveLBiziTpeLmNiUdHS1s1e+jR+aZcFq1tty9
TuV41pnG2yD1eAYAdwHEDWBCngLwUxpHpaBs8LNa+Lv48PLv1VWumPeynnWlKynq8AUYNGTUrcuV
fZJ5JLO9IdaRXrEnOCkR1sd/BNVjl1dqNX2m+uCi9ViO/xuZS6nxeKvJg7JY8fLlypt/3V0Sbdze
id/rClQ329vRJ1p3Tji3C6SfNM0LvtI1ziT4Mtb5Dw4vhR2WdnguXPJ5tT6fT1ZNOz5rVr5tFrg5
ITQdZRIYKQkQTq2blB1q+QvIXAXtGwxsdPQnmk8hZWXDqwfd+U/ZaaofmmY5g9h90i98JJotkOFq
SqClE/qcn2RJFyLCuMC0dYxqNaW5yLeAfDsRYpL9Gf3YKGSuQAzk2AHRAtrHzywnqA7UDACxA7yO
47Dog6J1+pkk56PeWImzweLaCo/OP3S0yeXocc4LbPOk+aTBCUSbyUgpCkpD5f+dEJkD1Fbnl3sR
uqnzgnUcEoAmsFyQOhzVgWW/cGTvzC1T02kwTbzR7GGEk/++vqWZwwgfMH1SfiZSXQaDuwztqK+q
8aFTIfsD5RinNJKUkik+n1Gb3B9ZTv2PwKiwiYjAUgePsAoOZQP9EGECtgeUPQC4C/0AzKaw39wn
RJOfrSRANpeSZQ8ZJo+NFFF0L8M8xncDoon9pxB9tz19jdYnpPBWQP1BvvAqUXiMgLwL1J1XZs75
K1i1Mb8Q3zPuLaYSOkd5F6Y0/qR/dKuBT3G5owGsJvnkqI2W1rQSj2nhJhEjJ00SY245ySiPSkVS
aQUSeiJcGmwP7vXN1TmNINJGhXzBWdL5GAwFfv7Il1iSwk8PiVFirFUWKLxk8u4Avjy9YSeK4FZC
iJQcE03+PNYOK8bx9kpBRN0/Q7wJTqTljZEpEjRJoVItV2gY0KYORoBdxTccx0kleEjm+x+8cpxE
vB/KuUj4Tumg+T3j+HiPwiWfhkd0uHguXsET5E/AzjpUmCBXNtCBwbh7EuZBf912njyd1J6ysWwI
jmC3Gw/4u5IpwoSDNGiGEA==


--===============1840607556021942353==--