Implemented code review comments: fixed FSF address

marcalff · marcalff · commit e14a52a6b034 · 2010-06-30T08:05:18.000-06:00
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
@@ -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>
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
@@ -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
 
 #
 ##############################################################################
diff --git a/mysql-test/suite/perfschema/include/pfs_upgrade.inc b/mysql-test/suite/perfschema/include/pfs_upgrade.inc
@@ -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'
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_lc0.test b/mysql-test/suite/perfschema/t/pfs_upgrade_lc0.test
@@ -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'
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_lc1.test b/mysql-test/suite/perfschema/t/pfs_upgrade_lc1.test
@@ -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'
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_lc2.test b/mysql-test/suite/perfschema/t/pfs_upgrade_lc2.test
@@ -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'
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
@@ -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
 
diff --git a/scripts/comp_sql.c b/scripts/comp_sql.c
@@ -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
diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql
@@ -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
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
@@ -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(
diff --git a/sql/Makefile.am b/sql/Makefile.am
@@ -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
 
diff --git a/sql/sql_bootstrap.cc b/sql/sql_bootstrap.cc
@@ -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>
diff --git a/sql/sql_bootstrap.h b/sql/sql_bootstrap.h
@@ -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
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`# You should have received a copy of the GNU General Public License`
`16`	`16`	`# along with this program; if not, write to the Free Software`
`17`	`17`	`# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA`
	`18`	`+# long with this program; if not, write to the Free Software Foundation,`
	`19`	`+# 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA`
`18`	`20`
`19`	`21`	`#`
`20`	`22`	`##############################################################################`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@`
`10`	`10`	`# GNU General Public License for more details.`
`11`	`11`	`#`
`12`	`12`	`# You should have received a copy of the GNU General Public License`
`13`		`-# along with this program; if not, write to the Free Software`
`14`		`-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA`
	`13`	`+# along with this program; if not, write to the Free Software Foundation,`
	`14`	`+# 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA`
`15`	`15`
`16`	`16`	`## Process this file with automake to create Makefile.in`
`17`	`17`