List:Commits« Previous MessageNext Message »
From:kent Date:December 31 2006 1:29am
Subject:bk commit into 5.1 tree (kent:1.2372)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-12-31 02:29:11+01:00, kent@stripped +79 -0
  Many files:
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 
    Added GPL copyright text
  my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
    Changed copyright header formatting some
  plugin_example.c, daemon_example.c:
    Added "Copyright (C) 2006 MySQL AB" to GPL header

  CMakeLists.txt@stripped, 2006-12-31 01:37:21+01:00, kent@stripped +15 -0
    Added GPL copyright text

  client/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  dbug/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  extra/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  extra/yassl/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  extra/yassl/taocrypt/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  include/my_uctype.h@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +15 -0
    Added GPL copyright text

  include/my_vle.h@stripped, 2006-12-31 02:17:58+01:00, kent@stripped +2 -5
    Changed copyright header formatting some

  libmysql/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  libmysqld/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  libmysqld/examples/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  mysys/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  mysys/my_vle.c@stripped, 2006-12-31 02:17:58+01:00, kent@stripped +2 -5
    Changed copyright header formatting some

  plugin/Makefile.am@stripped, 2006-12-31 02:24:03+01:00, kent@stripped +5 -5
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 

  plugin/daemon_example/Makefile.am@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +15 -0
    Added GPL copyright text

  plugin/daemon_example/daemon_example.c@stripped, 2006-12-31 02:20:56+01:00, kent@stripped +4 -4
    Added "Copyright (C) 2006 MySQL AB" to GPL header

  plugin/fulltext/Makefile.am@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +15 -0
    Added GPL copyright text

  plugin/fulltext/plugin_example.c@stripped, 2006-12-31 02:20:56+01:00, kent@stripped +4 -4
    Added "Copyright (C) 2006 MySQL AB" to GPL header

  regex/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  scripts/make_win_bin_dist@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +14 -0
    Added GPL copyright text

  server-tools/instance-manager/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  server-tools/instance-manager/user_management_commands.cc@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +15 -0
    Added GPL copyright text

  sql/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  sql/authors.h@stripped, 2006-12-31 02:24:03+01:00, kent@stripped +2 -2
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 

  sql/contributors.h@stripped, 2006-12-31 02:24:03+01:00, kent@stripped +2 -2
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 

  sql/item_xmlfunc.cc@stripped, 2006-12-31 02:24:03+01:00, kent@stripped +2 -3
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 

  sql/partition_element.h@stripped, 2006-12-31 02:24:03+01:00, kent@stripped +2 -2
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 

  sql/partition_info.h@stripped, 2006-12-31 02:24:03+01:00, kent@stripped +2 -2
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 

  sql/rpl_injector.cc@stripped, 2006-12-31 02:24:03+01:00, kent@stripped +2 -3
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 

  sql/rpl_injector.h@stripped, 2006-12-31 02:24:03+01:00, kent@stripped +2 -3
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 

  sql/rpl_utility.cc@stripped, 2006-12-31 02:27:31+01:00, kent@stripped +2 -2
    Changed copyright header formatting some

  sql/rpl_utility.h@stripped, 2006-12-31 02:27:31+01:00, kent@stripped +2 -2
    Changed copyright header formatting some

  sql/sql_binlog.cc@stripped, 2006-12-31 02:24:03+01:00, kent@stripped +2 -2
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 

  sql/sql_builtin.cc.in@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +14 -0
    Added GPL copyright text

  sql/sql_servers.h@stripped, 2006-12-31 02:24:03+01:00, kent@stripped +2 -2
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 

  sql/sql_show.h@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +14 -0
    Added GPL copyright text

  storage/Makefile.am@stripped, 2006-12-31 02:24:03+01:00, kent@stripped +5 -5
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 

  storage/archive/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  storage/archive/Makefile.am@stripped, 2006-12-31 02:24:03+01:00, kent@stripped +5 -5
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 

  storage/archive/archive_test.c@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +15 -0
    Added GPL copyright text

  storage/blackhole/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  storage/blackhole/Makefile.am@stripped, 2006-12-31 02:24:03+01:00, kent@stripped +5 -5
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 

  storage/csv/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  storage/csv/Makefile.am@stripped, 2006-12-31 02:24:03+01:00, kent@stripped +2 -2
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 

  storage/example/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  storage/example/Makefile.am@stripped, 2006-12-31 02:24:03+01:00, kent@stripped +5 -5
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 

  storage/federated/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  storage/federated/Makefile.am@stripped, 2006-12-31 02:24:03+01:00, kent@stripped +5 -5
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 

  storage/heap/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  storage/innobase/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  storage/myisam/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  storage/myisammrg/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +15 -0
    Added GPL copyright text

  storage/ndb/src/kernel/blocks/diskpage.cpp@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +14 -0
    Added GPL copyright text

  storage/ndb/src/kernel/vm/Rope.cpp@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +15 -0
    Added GPL copyright text

  storage/ndb/src/mgmsrv/ParamInfo.hpp@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +15 -0
    Added GPL copyright text

  strings/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  strings/uctypedump.c@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +15 -0
    Added GPL copyright text

  tests/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  unittest/Makefile.am@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +15 -0
    Added GPL copyright text

  unittest/examples/Makefile.am@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +15 -0
    Added GPL copyright text

  unittest/examples/core-t.c@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +14 -0
    Added GPL copyright text

  unittest/examples/no_plan-t.c@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +14 -0
    Added GPL copyright text

  unittest/examples/simple-t.c@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +14 -0
    Added GPL copyright text

  unittest/examples/skip-t.c@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +14 -0
    Added GPL copyright text

  unittest/examples/skip_all-t.c@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +14 -0
    Added GPL copyright text

  unittest/examples/todo-t.c@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +14 -0
    Added GPL copyright text

  unittest/mysys/Makefile.am@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +14 -0
    Added GPL copyright text

  unittest/mysys/base64-t.c@stripped, 2006-12-31 02:27:31+01:00, kent@stripped +1 -2
    Changed copyright header formatting some

  unittest/mytap/Makefile.am@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +14 -0
    Added GPL copyright text

  unittest/mytap/t/Makefile.am@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +14 -0
    Added GPL copyright text

  unittest/mytap/t/basic-t.c@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +14 -0
    Added GPL copyright text

  unittest/unit.pl@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +14 -0
    Added GPL copyright text

  vio/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

  win/Makefile.am@stripped, 2006-12-31 02:24:03+01:00, kent@stripped +2 -2
    Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
    Adjusted year(s) in copyright header 

  win/build-vs71.bat@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +15 -0
    Added GPL copyright text

  win/build-vs8.bat@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +15 -0
    Added GPL copyright text

  win/configure.js@stripped, 2006-12-31 02:28:54+01:00, kent@stripped +15 -0
    Added GPL copyright text

  zlib/CMakeLists.txt@stripped, 2006-12-31 01:37:58+01:00, kent@stripped +15 -0
    Added GPL copyright text

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	kent-amd64.(none)
# Root:	/home/kent/bk/main/mysql-5.1

--- 1.1/storage/ndb/src/mgmsrv/ParamInfo.hpp	2006-12-31 02:29:20 +01:00
+++ 1.2/storage/ndb/src/mgmsrv/ParamInfo.hpp	2006-12-31 02:29:20 +01:00
@@ -1,3 +1,18 @@
+/* Copyright (C) 2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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 */
+
 #ifndef PARAMINFO_H
 #define PARAMINFO_H
 

--- 1.1/sql/sql_builtin.cc.in	2006-12-31 02:29:20 +01:00
+++ 1.2/sql/sql_builtin.cc.in	2006-12-31 02:29:20 +01:00
@@ -1,3 +1,17 @@
+/* Copyright (C) 2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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 */
 
 #include <mysql/plugin.h>
 

--- 1.6/storage/blackhole/Makefile.am	2006-12-31 02:29:21 +01:00
+++ 1.7/storage/blackhole/Makefile.am	2006-12-31 02:29:21 +01:00
@@ -1,17 +1,17 @@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# 
+# Copyright (C) 2006 MySQL AB
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #called from the top level Makefile
 

--- 1.5/storage/blackhole/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.6/storage/blackhole/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.11/storage/csv/Makefile.am	2006-12-31 02:29:21 +01:00
+++ 1.12/storage/csv/Makefile.am	2006-12-31 02:29:21 +01:00
@@ -1,4 +1,4 @@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2005-2006 MySQL AB
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #called from the top level Makefile
 

--- 1.12/storage/example/Makefile.am	2006-12-31 02:29:21 +01:00
+++ 1.13/storage/example/Makefile.am	2006-12-31 02:29:21 +01:00
@@ -1,17 +1,17 @@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# 
+# Copyright (C) 2005-2006 MySQL AB
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #called from the top level Makefile
 

--- 1.4/server-tools/instance-manager/user_management_commands.cc	2006-12-31 02:29:21 +01:00
+++ 1.5/server-tools/instance-manager/user_management_commands.cc	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+/* Copyright (C) 2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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 */
+
 #if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
 #pragma implementation
 #endif

--- 1.1/include/my_uctype.h	2006-12-31 02:29:21 +01:00
+++ 1.2/include/my_uctype.h	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+/* Copyright (C) 2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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 */
+
 /*
   Unicode ctype data
   Generated from UnicodeData-5.0.0d9.txt

--- 1.23/sql/item_xmlfunc.cc	2006-12-31 02:29:21 +01:00
+++ 1.24/sql/item_xmlfunc.cc	2006-12-31 02:29:21 +01:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2005-2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,8 +11,7 @@
 
    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 */
-
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 #ifdef __GNUC__
 #pragma implementation

--- 1.1/strings/uctypedump.c	2006-12-31 02:29:21 +01:00
+++ 1.2/strings/uctypedump.c	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+/* Copyright (C) 2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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 */
+
 /*
 #include <stdio.h>
 #include <stdlib.h>

--- 1.16/sql/authors.h	2006-12-31 02:29:21 +01:00
+++ 1.17/sql/authors.h	2006-12-31 02:29:21 +01:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2005-2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    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 */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 /* Structure of the name list */
 

--- 1.1/plugin/daemon_example/Makefile.am	2006-12-31 02:29:21 +01:00
+++ 1.2/plugin/daemon_example/Makefile.am	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 #Makefile.am example for a daemon
 MYSQLDATAdir =          $(localstatedir)
 MYSQLSHAREdir =         $(pkgdatadir)

--- 1.1/plugin/daemon_example/daemon_example.c	2006-12-31 02:29:21 +01:00
+++ 1.2/plugin/daemon_example/daemon_example.c	2006-12-31 02:29:21 +01:00
@@ -1,8 +1,8 @@
-/*
+/* Copyright (C) 2006 MySQL AB
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -11,7 +11,7 @@
 
    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 */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 #include <stdlib.h>
 #include <ctype.h>

--- 1.2/sql/contributors.h	2006-12-31 02:29:21 +01:00
+++ 1.3/sql/contributors.h	2006-12-31 02:29:21 +01:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    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 */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 /* Structure of the name list */
 

--- 1.6/storage/Makefile.am	2006-12-31 02:29:21 +01:00
+++ 1.7/storage/Makefile.am	2006-12-31 02:29:21 +01:00
@@ -1,17 +1,17 @@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# 
+# Copyright (C) 2005-2006 MySQL AB
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 # Process this file with automake to create Makefile.in
 

--- 1.9/storage/archive/Makefile.am	2006-12-31 02:29:21 +01:00
+++ 1.10/storage/archive/Makefile.am	2006-12-31 02:29:21 +01:00
@@ -1,17 +1,17 @@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# 
+# Copyright (C) 2005-2006 MySQL AB
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #called from the top level Makefile
 

--- 1.4/storage/archive/archive_test.c	2006-12-31 02:29:21 +01:00
+++ 1.5/storage/archive/archive_test.c	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+/* Copyright (C) 2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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 */
+
 #include "azlib.h"
 #include <stdio.h>
 

--- 1.2/storage/federated/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.3/storage/federated/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.3/storage/federated/Makefile.am	2006-12-31 02:29:21 +01:00
+++ 1.4/storage/federated/Makefile.am	2006-12-31 02:29:21 +01:00
@@ -1,17 +1,17 @@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# 
+# Copyright (C) 2006 MySQL AB
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #called from the top level Makefile
 

--- 1.3/storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp	2006-12-31 02:29:21 +01:00
+++ 1.4/storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+/* Copyright (C) 2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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 */
+
 #include <ndb_global.h>
 #include "tuppage.hpp"
 #include <Vector.hpp>

--- 1.1/storage/ndb/src/kernel/blocks/diskpage.cpp	2006-12-31 02:29:21 +01:00
+++ 1.2/storage/ndb/src/kernel/blocks/diskpage.cpp	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,17 @@
+/* Copyright (C) 2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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 */
 
 #include <signaldata/SignalData.hpp>
 #include "diskpage.hpp"

--- 1.3/storage/ndb/src/kernel/vm/Rope.cpp	2006-12-31 02:29:21 +01:00
+++ 1.4/storage/ndb/src/kernel/vm/Rope.cpp	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+/* Copyright (C) 2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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 */
+
 #include "Rope.hpp"
 
 #define DEBUG_ROPE 0

--- 1.10/libmysqld/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.11/libmysqld/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.3/libmysqld/examples/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.4/libmysqld/examples/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/libmysqld/include
                     ${CMAKE_SOURCE_DIR}/extra/yassl/include)

--- 1.2/scripts/make_win_bin_dist	2006-12-31 02:29:21 +01:00
+++ 1.3/scripts/make_win_bin_dist	2006-12-31 02:29:21 +01:00
@@ -1,4 +1,18 @@
 #!/bin/sh
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
 
 # Exit if failing to copy, we want exact specifications, not
 # just "what happen to be built".

--- 1.4/storage/example/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.5/storage/example/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.4/win/Makefile.am	2006-12-31 02:29:21 +01:00
+++ 1.5/win/Makefile.am	2006-12-31 02:29:21 +01:00
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2006 MySQL AB
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 ## Process this file with automake to create Makefile.in
 EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat configure.js README

--- 1.2/include/my_vle.h	2006-12-31 02:29:21 +01:00
+++ 1.3/include/my_vle.h	2006-12-31 02:29:21 +01:00
@@ -1,5 +1,4 @@
-/* 
-   Copyright (C) 2005 MySQL AB
+/* Copyright (C) 2005 MySQL AB
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -12,9 +11,7 @@
 
    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
-*/
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA */
 
 #ifndef VLE_H
 #define VLE_H

--- 1.3/mysys/my_vle.c	2006-12-31 02:29:21 +01:00
+++ 1.4/mysys/my_vle.c	2006-12-31 02:29:21 +01:00
@@ -1,5 +1,4 @@
-/* 
-   Copyright (C) 2005 MySQL AB
+/* Copyright (C) 2005 MySQL AB
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -12,9 +11,7 @@
 
    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
-*/
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA */
 
 /*
   Variable length encoding.

--- 1.7/sql/sql_binlog.cc	2006-12-31 02:29:21 +01:00
+++ 1.8/sql/sql_binlog.cc	2006-12-31 02:29:21 +01:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2005-2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    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 */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 #include "mysql_priv.h"
 #include "base64.h"

--- 1.3/sql/sql_show.h	2006-12-31 02:29:21 +01:00
+++ 1.4/sql/sql_show.h	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,17 @@
+/* Copyright (C) 2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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 */
 
 #ifndef SQL_SHOW_H
 #define SQL_SHOW_H

--- 1.3/unittest/mytap/Makefile.am	2006-12-31 02:29:21 +01:00
+++ 1.4/unittest/mytap/Makefile.am	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,17 @@
+# Copyright (C) 2006 MySQL AB
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
 
 AM_CPPFLAGS  = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)
 

--- 1.7/unittest/mytap/t/Makefile.am	2006-12-31 02:29:21 +01:00
+++ 1.8/unittest/mytap/t/Makefile.am	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,17 @@
+# Copyright (C) 2006 MySQL AB
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
 
 AM_CPPFLAGS     = -I$(srcdir) -I$(top_builddir)/include -I$(srcdir)/.. -I$(top_srcdir)/include
 

--- 1.6/unittest/mytap/t/basic-t.c	2006-12-31 02:29:21 +01:00
+++ 1.7/unittest/mytap/t/basic-t.c	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,17 @@
+/* Copyright (C) 2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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 */
 
 #include "my_config.h"
 

--- 1.5/sql/rpl_utility.cc	2006-12-31 02:29:21 +01:00
+++ 1.6/sql/rpl_utility.cc	2006-12-31 02:29:21 +01:00
@@ -1,4 +1,4 @@
-/* Copyright 2006 MySQL AB. All rights reserved.
+/* Copyright (C) 2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    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 */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 #include "rpl_utility.h"
 

--- 1.3/sql/rpl_utility.h	2006-12-31 02:29:21 +01:00
+++ 1.4/sql/rpl_utility.h	2006-12-31 02:29:21 +01:00
@@ -1,4 +1,4 @@
-/* Copyright 2006 MySQL AB. All rights reserved.
+/* Copyright (C) 2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    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 */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 #ifndef RPL_UTILITY_H
 #define RPL_UTILITY_H

--- 1.12/unittest/Makefile.am	2006-12-31 02:29:21 +01:00
+++ 1.13/unittest/Makefile.am	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SUBDIRS      = mytap . mysys examples
 
 EXTRA_DIST = unit.pl

--- 1.7/unittest/examples/Makefile.am	2006-12-31 02:29:21 +01:00
+++ 1.8/unittest/examples/Makefile.am	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 AM_CPPFLAGS        = -I$(srcdir) -I$(top_builddir)/include \
 		     -I$(top_srcdir)/unittest/mytap -I$(top_srcdir)/include
 

--- 1.4/unittest/examples/no_plan-t.c	2006-12-31 02:29:21 +01:00
+++ 1.5/unittest/examples/no_plan-t.c	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,17 @@
+/* Copyright (C) 2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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 */
 
 #include "my_config.h"
 

--- 1.2/unittest/examples/simple-t.c	2006-12-31 02:29:21 +01:00
+++ 1.3/unittest/examples/simple-t.c	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,17 @@
+/* Copyright (C) 2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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 */
 
 #include <tap.h>
 

--- 1.3/unittest/examples/skip-t.c	2006-12-31 02:29:21 +01:00
+++ 1.4/unittest/examples/skip-t.c	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,17 @@
+/* Copyright (C) 2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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 */
 
 #include <tap.h>
 #include <stdlib.h>

--- 1.4/unittest/examples/skip_all-t.c	2006-12-31 02:29:21 +01:00
+++ 1.5/unittest/examples/skip_all-t.c	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,17 @@
+/* Copyright (C) 2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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 */
 
 #include "my_config.h"
 

--- 1.3/unittest/examples/todo-t.c	2006-12-31 02:29:21 +01:00
+++ 1.4/unittest/examples/todo-t.c	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,17 @@
+/* Copyright (C) 2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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 */
 
 #include "my_config.h"
 

--- 1.6/unittest/mysys/Makefile.am	2006-12-31 02:29:21 +01:00
+++ 1.7/unittest/mysys/Makefile.am	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,17 @@
+# Copyright (C) 2006 MySQL AB
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
 
 AM_CPPFLAGS      = @ZLIB_INCLUDES@ -I$(top_builddir)/include 
 AM_CPPFLAGS     += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap

--- 1.6/unittest/mysys/base64-t.c	2006-12-31 02:29:21 +01:00
+++ 1.7/unittest/mysys/base64-t.c	2006-12-31 02:29:21 +01:00
@@ -11,8 +11,7 @@
 
    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 */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA */
 
 #include <my_global.h>
 #include <base64.h>

--- 1.6/unittest/unit.pl	2006-12-31 02:29:21 +01:00
+++ 1.7/unittest/unit.pl	2006-12-31 02:29:21 +01:00
@@ -1,4 +1,18 @@
 #!/usr/bin/perl
+# Copyright (C) 2006 MySQL AB
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
 
 use Test::Harness qw(&runtests $verbose);
 use File::Find;

--- 1.1/unittest/examples/core-t.c	2006-12-31 02:29:21 +01:00
+++ 1.2/unittest/examples/core-t.c	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,17 @@
+/* Copyright (C) 2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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 */
 
 #include "my_config.h"
 

--- 1.2/sql/sql_servers.h	2006-12-31 02:29:21 +01:00
+++ 1.3/sql/sql_servers.h	2006-12-31 02:29:21 +01:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    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 */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 #include "slave.h" // for tables_ok(), rpl_filter
 

--- 1.11/sql/partition_element.h	2006-12-31 02:29:21 +01:00
+++ 1.12/sql/partition_element.h	2006-12-31 02:29:21 +01:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000,200666666 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    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 */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 /**
  * An enum and a struct to handle partitioning and subpartitioning.

--- 1.20/sql/partition_info.h	2006-12-31 02:29:21 +01:00
+++ 1.21/sql/partition_info.h	2006-12-31 02:29:21 +01:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000,2006 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    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 */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 #ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */

--- 1.5/storage/csv/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.6/storage/csv/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.5/win/build-vs71.bat	2006-12-31 02:29:21 +01:00
+++ 1.6/win/build-vs71.bat	2006-12-31 02:29:21 +01:00
@@ -1,5 +1,20 @@
 @echo off
 
+REM Copyright (C) 2006 MySQL AB
+REM 
+REM This program is free software; you can redistribute it and/or modify
+REM it under the terms of the GNU General Public License as published by
+REM the Free Software Foundation; version 2 of the License.
+REM 
+REM This program is distributed in the hope that it will be useful,
+REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+REM GNU General Public License for more details.
+REM 
+REM You should have received a copy of the GNU General Public License
+REM along with this program; if not, write to the Free Software
+REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 if exist cmakecache.txt del cmakecache.txt
 copy win\vs71cache.txt cmakecache.txt
 cmake -G "Visual Studio 7 .NET 2003"

--- 1.5/win/build-vs8.bat	2006-12-31 02:29:21 +01:00
+++ 1.6/win/build-vs8.bat	2006-12-31 02:29:21 +01:00
@@ -1,5 +1,20 @@
 @echo off
 
+REM Copyright (C) 2006 MySQL AB
+REM 
+REM This program is free software; you can redistribute it and/or modify
+REM it under the terms of the GNU General Public License as published by
+REM the Free Software Foundation; version 2 of the License.
+REM 
+REM This program is distributed in the hope that it will be useful,
+REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+REM GNU General Public License for more details.
+REM 
+REM You should have received a copy of the GNU General Public License
+REM along with this program; if not, write to the Free Software
+REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 if exist cmakecache.txt del cmakecache.txt
 copy win\vs8cache.txt cmakecache.txt
 cmake -G "Visual Studio 8 2005"

--- 1.24/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.25/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 PROJECT(MySql)
 
 # This reads user configuration, generated by configure.js.

--- 1.14/client/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.15/client/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.5/dbug/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.6/dbug/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -D__WIN32__")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.10/extra/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.11/extra/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.6/storage/heap/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.7/storage/heap/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.8/server-tools/instance-manager/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.9/server-tools/instance-manager/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.9/storage/innobase/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.10/storage/innobase/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 #SET(CMAKE_CXX_FLAGS_DEBUG "-DSAFEMALLOC -DSAFE_MUTEX")
 #SET(CMAKE_C_FLAGS_DEBUG "-DSAFEMALLOC -DSAFE_MUTEX")
 ADD_DEFINITIONS(-DMYSQL_SERVER -D_WIN32 -DWIN32 -D_LIB)

--- 1.7/storage/myisammrg/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.8/storage/myisammrg/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.7/storage/myisam/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.8/storage/myisam/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.10/mysys/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.11/mysys/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.6/regex/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.7/regex/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.32/sql/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.33/sql/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG 
     "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR")
 SET(CMAKE_C_FLAGS_DEBUG 

--- 1.6/strings/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.7/strings/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.8/extra/yassl/taocrypt/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.9/extra/yassl/taocrypt/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 INCLUDE_DIRECTORIES(mySTL include)
 
 ADD_LIBRARY(taocrypt src/aes.cpp src/aestables.cpp src/algebra.cpp src/arc4.cpp src/asn.cpp src/coding.cpp 

--- 1.6/vio/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.7/vio/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.6/extra/yassl/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.7/extra/yassl/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 ADD_DEFINITIONS("-DWIN32 -D_LIB -DYASSL_PREFIX")
 
 INCLUDE_DIRECTORIES(include taocrypt/include taocrypt/mySTL)

--- 1.6/zlib/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.7/zlib/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
 

--- 1.5/win/configure.js	2006-12-31 02:29:21 +01:00
+++ 1.6/win/configure.js	2006-12-31 02:29:21 +01:00
@@ -1,4 +1,19 @@
 // Configure.js
+//
+// Copyright (C) 2006 MySQL AB
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// 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
 
 ForReading = 1;
 ForWriting = 2;

--- 1.6/storage/archive/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.7/storage/archive/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.11/libmysql/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.12/libmysql/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 # Need to set USE_TLS, since __declspec(thread) approach to thread local
 # storage does not work properly in DLLs.
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")

--- 1.7/tests/CMakeLists.txt	2006-12-31 02:29:21 +01:00
+++ 1.8/tests/CMakeLists.txt	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

--- 1.6/plugin/Makefile.am	2006-12-31 02:29:21 +01:00
+++ 1.7/plugin/Makefile.am	2006-12-31 02:29:21 +01:00
@@ -1,17 +1,17 @@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# 
+# Copyright (C) 2005-2006 MySQL AB
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 # Process this file with automake to create Makefile.in
 

--- 1.8/plugin/fulltext/Makefile.am	2006-12-31 02:29:21 +01:00
+++ 1.9/plugin/fulltext/Makefile.am	2006-12-31 02:29:21 +01:00
@@ -1,3 +1,18 @@
+# Copyright (C) 2005-2006 MySQL AB
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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
+
 #Makefile.am example for a plugin
 
 pkglibdir=$(libdir)/mysql

--- 1.16/plugin/fulltext/plugin_example.c	2006-12-31 02:29:21 +01:00
+++ 1.17/plugin/fulltext/plugin_example.c	2006-12-31 02:29:21 +01:00
@@ -1,8 +1,8 @@
-/*
+/* Copyright (C) 2006 MySQL AB
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -11,7 +11,7 @@
 
    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 */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 #include <stdlib.h>
 #include <ctype.h>

--- 1.7/sql/rpl_injector.cc	2006-12-31 02:29:21 +01:00
+++ 1.8/sql/rpl_injector.cc	2006-12-31 02:29:21 +01:00
@@ -1,5 +1,4 @@
-/*
-   Copyright (C) 2005 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +11,7 @@
 
    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 */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 #include "mysql_priv.h" 
 #include "rpl_injector.h"

--- 1.7/sql/rpl_injector.h	2006-12-31 02:29:21 +01:00
+++ 1.8/sql/rpl_injector.h	2006-12-31 02:29:21 +01:00
@@ -1,5 +1,4 @@
-/*
-   Copyright (C) 2005 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +11,7 @@
 
    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 */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 #ifndef INJECTOR_H
 #define INJECTOR_H
Thread
bk commit into 5.1 tree (kent:1.2372)kent31 Dec