From: Marc Alff Date: June 30 2010 2:05pm Subject: bzr commit into mysql-next-mr-wl5291 branch (marc.alff:3155) List-Archive: http://lists.mysql.com/commits/112581 Message-Id: <20100630140522.BC9C045E80@linux-su11.site> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7113102448350710581==" --===============7113102448350710581== 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-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 === 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 === 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" --===============7113102448350710581== 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-wl5291/ # testament_sha1: c3ed82f8e513127557c8d026ab8366da632ab259 # timestamp: 2010-06-30 08:05:22 -0600 # source_branch: file:///home/malff/BZR_TREE/mysql-next-mr/ # base_revision_id: marc.alff@stripped\ # lw7sp7gkv418gs2l # # Begin bundle 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 U4UJDoh5RRA= --===============7113102448350710581==--