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

--===============1846970896995496796==
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

 3160 Marc Alff	2010-07-02
      Implemented code review comments (continued)

    modified:
      mysql-test/suite/perfschema/include/schema.inc
      mysql-test/suite/perfschema/t/ddl_setup_actors.test
      mysql-test/suite/perfschema/t/ddl_threads.test
      mysql-test/suite/perfschema/t/dml_setup_actors.test
      mysql-test/suite/perfschema/t/dml_threads.test
      mysql-test/suite/perfschema/t/schema_lc0.test
      mysql-test/suite/perfschema/t/schema_lc1.test
      mysql-test/suite/perfschema/t/schema_lc2.test
      mysql-test/suite/perfschema/t/setup_actors.test
      mysql-test/suite/perfschema/t/start_server_no_setup_actors.test
=== modified file 'mysql-test/suite/perfschema/include/schema.inc'
--- a/mysql-test/suite/perfschema/include/schema.inc	2010-05-12 14:04:32 +0000
+++ b/mysql-test/suite/perfschema/include/schema.inc	2010-07-02 16:36:20 +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/ddl_setup_actors.test'
--- a/mysql-test/suite/perfschema/t/ddl_setup_actors.test	2010-05-12 14:04:32 +0000
+++ b/mysql-test/suite/perfschema/t/ddl_setup_actors.test	2010-07-02 16:36:20 +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/ddl_threads.test'
--- a/mysql-test/suite/perfschema/t/ddl_threads.test	2010-05-11 10:36:37 +0000
+++ b/mysql-test/suite/perfschema/t/ddl_threads.test	2010-07-02 16:36:20 +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/dml_setup_actors.test'
--- a/mysql-test/suite/perfschema/t/dml_setup_actors.test	2010-05-12 14:04:32 +0000
+++ b/mysql-test/suite/perfschema/t/dml_setup_actors.test	2010-07-02 16:36:20 +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/dml_threads.test'
--- a/mysql-test/suite/perfschema/t/dml_threads.test	2010-05-11 10:36:37 +0000
+++ b/mysql-test/suite/perfschema/t/dml_threads.test	2010-07-02 16:36:20 +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/schema_lc0.test'
--- a/mysql-test/suite/perfschema/t/schema_lc0.test	2010-05-12 14:04:32 +0000
+++ b/mysql-test/suite/perfschema/t/schema_lc0.test	2010-07-02 16:36:20 +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/schema_lc1.test'
--- a/mysql-test/suite/perfschema/t/schema_lc1.test	2010-05-12 14:04:32 +0000
+++ b/mysql-test/suite/perfschema/t/schema_lc1.test	2010-07-02 16:36:20 +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/schema_lc2.test'
--- a/mysql-test/suite/perfschema/t/schema_lc2.test	2010-05-12 14:04:32 +0000
+++ b/mysql-test/suite/perfschema/t/schema_lc2.test	2010-07-02 16:36:20 +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/setup_actors.test'
--- a/mysql-test/suite/perfschema/t/setup_actors.test	2010-05-20 15:43:53 +0000
+++ b/mysql-test/suite/perfschema/t/setup_actors.test	2010-07-02 16:36:20 +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

=== modified file 'mysql-test/suite/perfschema/t/start_server_no_setup_actors.test'
--- a/mysql-test/suite/perfschema/t/start_server_no_setup_actors.test	2010-05-20 15:43:53 +0000
+++ b/mysql-test/suite/perfschema/t/start_server_no_setup_actors.test	2010-07-02 16:36:20 +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
 


--===============1846970896995496796==
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: b95eb7e484a7a271548179d4cf4672b7a5792e61
# timestamp: 2010-07-02 10:36:24 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-next-mr/
# base_revision_id: marc.alff@stripped\
#   pslgsvnacoae4nqi
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWS0XMZwAB4VfgEAQWGf//3Mi
CgC////wYAofAAAAAAHoAAAAAAGAAAAAAAAAAAwAAAAAAAAAAGAAAAAAAAAAAYpQMgNGjIyaAGIM
mQABgAAAAAAAAAACpRAEAAIARkmKYjaiPTU9qmxrTXKdu9FB/F2+9L6+6xsRaisW4KyvXq55Vuur
v57ERRGGExz631R1YWZ/+aeKP0ReilEUQ/HFH7j/27BRGzVSqKQr0rei6tabFi+tL6VpWllL6LP1
R3IwspH7auqL0ZIoiqKI1oqjkjJH7f1ej8f37ou5I1I/7VHRGNZJPRH+0WI/2jYjx5bq+XHx9Kyt
OtDCzr4wultE7vZH+8tmflWmrph95ClJEexHuyu9EaUURsI12au6+tKW222VRqf08tuUT+XFVPEs
Sq9WJOT59WWmlKSNbbk/nxyTA2TJR3M+yqLHDgJqUb0hwSHacZLaNNNVCxYsWOiLjfrxRYnfokXw
TLNGxVGgS3rqmKLhFVJJM2FTdMZAyRZUlGh0aWlHVvkSjNFKMJRcnBqa7tImlRKvP9bE1sG7BbIm
VmlTUsWL17SSmiVbmDFYyZSl+te0I0Lj8tD8vy3CZT9kz08BSjlsrWuCNMwTdlnSn0XnCcuCMhFC
kibjltWrtljwcfLkjBNKaEbeOGOaMEYIaNbVnjz3+3XPXupS6uzkjcSrakUfiRYmglGpG5/fDNe6
6ZVg4t7br062uVmCslRPhdoaGw3lv+tmPr7ObY3oquUbGp9WtV5ODgqq7mTvydzq1OTuapKcpG5G
OdKXMr2DWmmXCWyBii5rUWvG5mi9CitJE7tDBuZOe9dlpYLmNU4smxhK7aM2TnuySYRPqirsxYqs
Vr5Ou9ub3NxaU3pVuz34brlrNGt4WLlu7LpyzYNbNgnLlzXNKxF/wljhiqitwsUKNarUJVolWbot
wWNGLQzsb+RxaVhobvPq+a5kwX35p+Wlk1OvDpSlCKotVZqSLlENLisbaHFRwZzg63JazcV7BRRR
ioqol2hgua3JajBR4b2u5Wl9FWLSwxpnI2WqMuS9e3MbG5hc+TOeKPJ4Za5GPBGXcJVGwvSTW3Ks
W9VVOETlgwY3JnMVGSixvelrc1ueHFnWamjv79jW6+DaxdlrPS4mte7LtG3Zv0vZfVGxmsj4X2WR
2UkvXiaWu0Sxa28tqXvDNVtb2PVpv3O1hLWDzaGS1xY5zr14WuLHHQ4vB2VxpSmnVVzlVFJE1atT
etvMK0asXdhqbW1c34Lqc1MlqwzYcmVHK8mLctbt1y5ubjdSjb0su2zatwMVzkqsq8mDG5qcd21f
iW8LqOGWLKvDZNbW2tCirapXW6CZNODU1uMtbl61bx0OvNzzV1tra1N29sw1snFuVZ2s72a6ltZK
VruplRdjS+9JwskXKkphS6RdEr2E+CJCQ41I4SwFFF9gQQQ1ghMSSSSQVIdPwjLgkP6R/SNGkyol
CUfzYiyiSd9EU/+RUR7ItNuyqVhSJ1h5T2+t0+ryKUVIon0J8qcZRHyWPBFMSUc1Ue74ez2etGDc
yVoo+z21wsefd98GLt0SHaf2ijY7pO06fR8zwyifZIdfJFiNCPKsjZ7c0h/CN8kXyyfCOLyc328V
zmo9Vyeb9Ja8/sxY6HbFzexWWRmqquXvkubE1J83r+6P0iTu75RIXT7smt75XT4dFZe92Dm1tr5K
Oijk7MLljs2q5qei5jRVoc0Z4NjNpWOrpz7vkTTWiQspPb5JCnX+clyOyPJ+Xm76XOjaw6Ore8+G
druZqOr/LJ3rXSxg9Gpw6k24thKKvFoXaIiiM2hqaGPgsWP29ZSnmJ9b+d6vhvZuWl8SNSatUpT1
bFomCbtnwjojejwR80Y3IprpYE71WlS3PSs21WnE4vvwbOilDPfNLrm7NjWpsU90fRHH0kcq8kb4
nPenN46WPTxvRu/nDnThcjNwdOm7pS3/tW4nDKRy+cpUnHpyuny76Sw4bWVkRTSi4maS/kwwiMO1
yMXr4LXB6uTQ5VdWS54snF9mhIZO56OzQ13xO2aiQ1t0j+kfNH6IyR0q5akUsRra2aS5GibXRHru
U7kj9XolyO8SiNd5OC9ajveYn0WJrcpDxseLaeXVTp/H7xFNEx9u9HpI6vNJLlvcj/E+v4icP1w9
vC2xHnE9UbIn1RyR0R6eLsYo3eq9Gaj1yU5I7onej3eb3aE8fQzaNcS608m+UpSUcGqHyRtSFCPp
/XwkNE8kV/wnhnYjXngycIhVOKi9Fm0njE/V6yKIr6c5gi/jdwd4lnNNDC+R+fjwLMpF8g9Zi90W
zKiTmjqmHg0XWIrejQXHhMkfaaG4mVJnSJQ9Pmj90ak0zwOfu/4iqL3wuEZoyRR2Ukff1Rdi/tIY
RNcoj2pPwjYjf+Ubzz+rxR286IoS2RrY14tWGCMMo8n0ap7+nZp8JseIlZtkJ+EaOCMpIfyojs8U
tR1RbJHDh9ayNPt8kcn+W2Z9kX06Oq5GqZ1pLFZ/AmPsi46HRQoUf8Xd/3+9FKKUUphy2wspLa2I
1UtRoiURiTRtmTcmt+LJI06W1GlJ4Tfthgi5F8LCcO++qOMsItN5Fbd38QnUj4vR9kWEc00atO1o
tRejVJHki2fVFGFCaNxPojU2u4nd7t+WhH2Zb0ZI2an7Org/R8Hq1TjOKTOU0I7lri+7qj6I+a3F
vLkdG0tSPovEz7+RSFVGkTET/S9w7nwabnJPdM2mRwE2ZNYn/4u5IpwoSBaLmM4A


--===============1846970896995496796==--