List:Commits« Previous MessageNext Message »
From:Marc Alff Date:June 30 2010 2:05pm
Subject:bzr commit into mysql-next-mr-wl5291 branch (marc.alff:3155)
View as plain text  
#At file:///home/malff/BZR_TREE/mysql-next-mr-wl5291/ based on revid:marc.alff@stripped

 3155 Marc Alff	2010-06-30
      Implemented code review comments: fixed FSF address

    modified:
      client/mysql_upgrade.c
      mysql-test/mysql-test-run.pl
      mysql-test/suite/perfschema/include/pfs_upgrade.inc
      mysql-test/suite/perfschema/t/pfs_upgrade_lc0.test
      mysql-test/suite/perfschema/t/pfs_upgrade_lc1.test
      mysql-test/suite/perfschema/t/pfs_upgrade_lc2.test
      scripts/Makefile.am
      scripts/comp_sql.c
      scripts/mysql_system_tables.sql
      sql/CMakeLists.txt
      sql/Makefile.am
      sql/sql_bootstrap.cc
      sql/sql_bootstrap.h
      sql/sql_parse.cc
=== modified file 'client/mysql_upgrade.c'
--- a/client/mysql_upgrade.c	2010-06-17 08:41:20 +0000
+++ b/client/mysql_upgrade.c	2010-06-30 14:05:18 +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 "client_priv.h"
 #include <sslopt-vars.h>

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-06-29 03:15:28 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-06-30 14:05:18 +0000
@@ -15,6 +15,8 @@
 # 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
+# long with this program; if not, write to the Free Software Foundation,
+# 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
 
 #
 ##############################################################################

=== modified file 'mysql-test/suite/perfschema/include/pfs_upgrade.inc'
--- a/mysql-test/suite/perfschema/include/pfs_upgrade.inc	2010-04-28 09:58:50 +0000
+++ b/mysql-test/suite/perfschema/include/pfs_upgrade.inc	2010-06-30 14:05:18 +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
 # Make sure mysql_upgrade does not destroy data in a 'performance_schema'

=== modified file 'mysql-test/suite/perfschema/t/pfs_upgrade_lc0.test'
--- a/mysql-test/suite/perfschema/t/pfs_upgrade_lc0.test	2010-05-12 14:22:21 +0000
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_lc0.test	2010-06-30 14:05:18 +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
 # Make sure mysql_upgrade does not destroy data in a 'performance_schema'

=== modified file 'mysql-test/suite/perfschema/t/pfs_upgrade_lc1.test'
--- a/mysql-test/suite/perfschema/t/pfs_upgrade_lc1.test	2010-05-12 14:22:21 +0000
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_lc1.test	2010-06-30 14:05:18 +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
 # Make sure mysql_upgrade does not destroy data in a 'performance_schema'

=== modified file 'mysql-test/suite/perfschema/t/pfs_upgrade_lc2.test'
--- a/mysql-test/suite/perfschema/t/pfs_upgrade_lc2.test	2010-05-12 14:22:21 +0000
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_lc2.test	2010-06-30 14:05:18 +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
 # Make sure mysql_upgrade does not destroy data in a 'performance_schema'

=== modified file 'scripts/Makefile.am'
--- a/scripts/Makefile.am	2010-05-28 09:00:55 +0000
+++ b/scripts/Makefile.am	2010-06-30 14:05:18 +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
 
 ## Process this file with automake to create Makefile.in
 

=== modified file 'scripts/comp_sql.c'
--- a/scripts/comp_sql.c	2010-04-27 07:18:34 +0000
+++ b/scripts/comp_sql.c	2010-06-30 14:05:18 +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 */
 
 /*
   Converts a SQL file into a C file that can be compiled and linked

=== modified file 'scripts/mysql_system_tables.sql'
--- a/scripts/mysql_system_tables.sql	2010-04-28 09:58:50 +0000
+++ b/scripts/mysql_system_tables.sql	2010-06-30 14:05:18 +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
 
 --
 -- The system tables of MySQL Server

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2010-06-29 22:16:07 +0000
+++ b/sql/CMakeLists.txt	2010-06-30 14:05:18 +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
 
 
 INCLUDE_DIRECTORIES(

=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2010-06-29 22:16:07 +0000
+++ b/sql/Makefile.am	2010-06-30 14:05:18 +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
 
 #called from the top level Makefile
 

=== modified file 'sql/sql_bootstrap.cc'
--- a/sql/sql_bootstrap.cc	2010-04-28 09:58:50 +0000
+++ b/sql/sql_bootstrap.cc	2010-06-30 14:05:18 +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 <ctype.h>

=== modified file 'sql/sql_bootstrap.h'
--- a/sql/sql_bootstrap.h	2010-04-27 07:18:34 +0000
+++ b/sql/sql_bootstrap.h	2010-06-30 14:05:18 +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 SQL_BOOTSTRAP_H

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2010-06-29 03:15:28 +0000
+++ b/sql/sql_parse.cc	2010-06-30 14:05:18 +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 */
 
 #define MYSQL_LEX 1
 #include "my_global.h"


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100630140518-46i8ln6omdsgj476.bundle
Thread
bzr commit into mysql-next-mr-wl5291 branch (marc.alff:3155) Marc Alff30 Jun