summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
Diffstat (limited to 'myisam')
-rwxr-xr-xmyisam/CMakeLists.txt15
-rw-r--r--myisam/Makefile.am2
-rw-r--r--myisam/ft_boolean_search.c2
-rw-r--r--myisam/ft_eval.c2
-rw-r--r--myisam/ft_nlq_search.c2
-rw-r--r--myisam/ft_parser.c2
-rw-r--r--myisam/ft_static.c2
-rw-r--r--myisam/ft_stem.c2
-rw-r--r--myisam/ft_stopwords.c2
-rw-r--r--myisam/ft_test1.c2
-rw-r--r--myisam/ft_test1.h2
-rw-r--r--myisam/ft_update.c2
-rw-r--r--myisam/ftdefs.h2
-rw-r--r--myisam/fulltext.h2
-rw-r--r--myisam/mi_cache.c2
-rw-r--r--myisam/mi_changed.c2
-rw-r--r--myisam/mi_check.c2
-rw-r--r--myisam/mi_checksum.c2
-rw-r--r--myisam/mi_close.c2
-rw-r--r--myisam/mi_create.c2
-rw-r--r--myisam/mi_dbug.c2
-rw-r--r--myisam/mi_delete.c2
-rw-r--r--myisam/mi_delete_all.c2
-rw-r--r--myisam/mi_delete_table.c2
-rw-r--r--myisam/mi_dynrec.c2
-rw-r--r--myisam/mi_extra.c2
-rw-r--r--myisam/mi_info.c2
-rw-r--r--myisam/mi_key.c2
-rw-r--r--myisam/mi_locking.c2
-rw-r--r--myisam/mi_log.c2
-rw-r--r--myisam/mi_open.c2
-rw-r--r--myisam/mi_packrec.c2
-rw-r--r--myisam/mi_page.c2
-rw-r--r--myisam/mi_panic.c2
-rw-r--r--myisam/mi_preload.c2
-rw-r--r--myisam/mi_range.c2
-rw-r--r--myisam/mi_rename.c2
-rw-r--r--myisam/mi_rfirst.c2
-rw-r--r--myisam/mi_rkey.c2
-rw-r--r--myisam/mi_rlast.c2
-rw-r--r--myisam/mi_rnext.c2
-rw-r--r--myisam/mi_rnext_same.c2
-rw-r--r--myisam/mi_rprev.c2
-rw-r--r--myisam/mi_rrnd.c2
-rw-r--r--myisam/mi_rsame.c2
-rw-r--r--myisam/mi_rsamepos.c2
-rw-r--r--myisam/mi_scan.c2
-rw-r--r--myisam/mi_search.c2
-rw-r--r--myisam/mi_static.c2
-rw-r--r--myisam/mi_statrec.c2
-rw-r--r--myisam/mi_test1.c2
-rw-r--r--myisam/mi_test2.c2
-rw-r--r--myisam/mi_test3.c2
-rw-r--r--myisam/mi_unique.c2
-rw-r--r--myisam/mi_update.c2
-rw-r--r--myisam/mi_write.c2
-rw-r--r--myisam/myisam_ftdump.c2
-rw-r--r--myisam/myisamdef.h2
-rw-r--r--myisam/myisamlog.c2
-rw-r--r--myisam/myisampack.c2
-rw-r--r--myisam/rt_index.c3
-rw-r--r--myisam/rt_index.h3
-rw-r--r--myisam/rt_key.h3
-rw-r--r--myisam/rt_mbr.c3
-rw-r--r--myisam/rt_mbr.h3
-rw-r--r--myisam/rt_split.c3
-rw-r--r--myisam/rt_test.c2
-rw-r--r--myisam/sort.c2
-rw-r--r--myisam/sp_defs.h3
-rw-r--r--myisam/sp_test.c2
70 files changed, 84 insertions, 76 deletions
diff --git a/myisam/CMakeLists.txt b/myisam/CMakeLists.txt
index 3ba7aba4555..28d06254e8a 100755
--- a/myisam/CMakeLists.txt
+++ b/myisam/CMakeLists.txt
@@ -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")
diff --git a/myisam/Makefile.am b/myisam/Makefile.am
index 09ebae2db5c..c8a87bc207b 100644
--- a/myisam/Makefile.am
+++ b/myisam/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-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
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c
index e194ef1c8a0..cdf16d9181c 100644
--- a/myisam/ft_boolean_search.c
+++ b/myisam/ft_boolean_search.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2001-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 published by
diff --git a/myisam/ft_eval.c b/myisam/ft_eval.c
index 1bc05cfab6e..0e554395c84 100644
--- a/myisam/ft_eval.c
+++ b/myisam/ft_eval.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002 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.
diff --git a/myisam/ft_nlq_search.c b/myisam/ft_nlq_search.c
index fc7137c9db0..f63735b7e68 100644
--- a/myisam/ft_nlq_search.c
+++ b/myisam/ft_nlq_search.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2001-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 published by
diff --git a/myisam/ft_parser.c b/myisam/ft_parser.c
index 95efa3eeb9a..6c79f9249cf 100644
--- a/myisam/ft_parser.c
+++ b/myisam/ft_parser.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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 published by
diff --git a/myisam/ft_static.c b/myisam/ft_static.c
index 0d3ac50be2a..85a51ee6382 100644
--- a/myisam/ft_static.c
+++ b/myisam/ft_static.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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 published by
diff --git a/myisam/ft_stem.c b/myisam/ft_stem.c
index 5600cb14e15..dfc132fcfa9 100644
--- a/myisam/ft_stem.c
+++ b/myisam/ft_stem.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000 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
diff --git a/myisam/ft_stopwords.c b/myisam/ft_stopwords.c
index b3f14a91985..1b7933e85ca 100644
--- a/myisam/ft_stopwords.c
+++ b/myisam/ft_stopwords.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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 published by
diff --git a/myisam/ft_test1.c b/myisam/ft_test1.c
index 1f354eb7bae..4810c8a37aa 100644
--- a/myisam/ft_test1.c
+++ b/myisam/ft_test1.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002, 2004 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
diff --git a/myisam/ft_test1.h b/myisam/ft_test1.h
index 4b991ff9502..4b466818460 100644
--- a/myisam/ft_test1.h
+++ b/myisam/ft_test1.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2001 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
diff --git a/myisam/ft_update.c b/myisam/ft_update.c
index d8be7268cf0..ece3f722d58 100644
--- a/myisam/ft_update.c
+++ b/myisam/ft_update.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2004, 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
diff --git a/myisam/ftdefs.h b/myisam/ftdefs.h
index 545c3def1a8..0cd5d20892b 100644
--- a/myisam/ftdefs.h
+++ b/myisam/ftdefs.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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 published by
diff --git a/myisam/fulltext.h b/myisam/fulltext.h
index 5e50461edf6..bea2fa96969 100644
--- a/myisam/fulltext.h
+++ b/myisam/fulltext.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2003 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
diff --git a/myisam/mi_cache.c b/myisam/mi_cache.c
index e9591d645df..59c9b2c8812 100644
--- a/myisam/mi_cache.c
+++ b/myisam/mi_cache.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2003 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
diff --git a/myisam/mi_changed.c b/myisam/mi_changed.c
index aaac3b449ad..7422f995dd0 100644
--- a/myisam/mi_changed.c
+++ b/myisam/mi_changed.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2001 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
diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index 51dbb59a55f..c4df81c7ca9 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/mi_checksum.c b/myisam/mi_checksum.c
index 41b26118a9f..711e87c1547 100644
--- a/myisam/mi_checksum.c
+++ b/myisam/mi_checksum.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2001, 2003-2004 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
diff --git a/myisam/mi_close.c b/myisam/mi_close.c
index 1691e9abb50..81d32be468a 100644
--- a/myisam/mi_close.c
+++ b/myisam/mi_close.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2004 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
diff --git a/myisam/mi_create.c b/myisam/mi_create.c
index a9914d6fdb7..d99c74f6136 100644
--- a/myisam/mi_create.c
+++ b/myisam/mi_create.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/mi_dbug.c b/myisam/mi_dbug.c
index c328fd79e65..07c314c43e6 100644
--- a/myisam/mi_dbug.c
+++ b/myisam/mi_dbug.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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 published by
diff --git a/myisam/mi_delete.c b/myisam/mi_delete.c
index 2016cd6dccc..409930ff7fb 100644
--- a/myisam/mi_delete.c
+++ b/myisam/mi_delete.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/mi_delete_all.c b/myisam/mi_delete_all.c
index ce6d3ddc539..0769415fbdf 100644
--- a/myisam/mi_delete_all.c
+++ b/myisam/mi_delete_all.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2003, 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 published by
diff --git a/myisam/mi_delete_table.c b/myisam/mi_delete_table.c
index 2a41f687b85..dcd32d8f1f0 100644
--- a/myisam/mi_delete_table.c
+++ b/myisam/mi_delete_table.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2001, 2004, 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
diff --git a/myisam/mi_dynrec.c b/myisam/mi_dynrec.c
index 0919569e66e..d8aa1ec964c 100644
--- a/myisam/mi_dynrec.c
+++ b/myisam/mi_dynrec.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/mi_extra.c b/myisam/mi_extra.c
index 72030418d77..5eb5010ad8c 100644
--- a/myisam/mi_extra.c
+++ b/myisam/mi_extra.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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 published by
diff --git a/myisam/mi_info.c b/myisam/mi_info.c
index 81df629d981..0435269ed6d 100644
--- a/myisam/mi_info.c
+++ b/myisam/mi_info.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2001, 2003-2004 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
diff --git a/myisam/mi_key.c b/myisam/mi_key.c
index 8c3546938b3..b203286d544 100644
--- a/myisam/mi_key.c
+++ b/myisam/mi_key.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/mi_locking.c b/myisam/mi_locking.c
index b8c9c0b5a16..96b9f525cd0 100644
--- a/myisam/mi_locking.c
+++ b/myisam/mi_locking.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/mi_log.c b/myisam/mi_log.c
index 256522cd317..2672a9dacd6 100644
--- a/myisam/mi_log.c
+++ b/myisam/mi_log.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2001, 2004 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
diff --git a/myisam/mi_open.c b/myisam/mi_open.c
index 557880daef0..20a50fff9d7 100644
--- a/myisam/mi_open.c
+++ b/myisam/mi_open.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000,2004 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/mi_packrec.c b/myisam/mi_packrec.c
index 10604fe22fc..25a9411f24d 100644
--- a/myisam/mi_packrec.c
+++ b/myisam/mi_packrec.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/mi_page.c b/myisam/mi_page.c
index 2c497dbcf46..eb26cf52ed2 100644
--- a/myisam/mi_page.c
+++ b/myisam/mi_page.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2004, 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
diff --git a/myisam/mi_panic.c b/myisam/mi_panic.c
index aba41a1713f..74c93761b61 100644
--- a/myisam/mi_panic.c
+++ b/myisam/mi_panic.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2001, 2003 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
diff --git a/myisam/mi_preload.c b/myisam/mi_preload.c
index 28228fcf976..78729f18424 100644
--- a/myisam/mi_preload.c
+++ b/myisam/mi_preload.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2003, 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 published by
diff --git a/myisam/mi_range.c b/myisam/mi_range.c
index 5a6a5cb0c92..35b44c92322 100644
--- a/myisam/mi_range.c
+++ b/myisam/mi_range.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2004, 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
diff --git a/myisam/mi_rename.c b/myisam/mi_rename.c
index e07a4751e7c..453808a1c0a 100644
--- a/myisam/mi_rename.c
+++ b/myisam/mi_rename.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2001, 2004 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
diff --git a/myisam/mi_rfirst.c b/myisam/mi_rfirst.c
index e95324976c6..d23bda46b1a 100644
--- a/myisam/mi_rfirst.c
+++ b/myisam/mi_rfirst.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2001 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
diff --git a/myisam/mi_rkey.c b/myisam/mi_rkey.c
index 4f0c8afcf0d..6323c95ffd7 100644
--- a/myisam/mi_rkey.c
+++ b/myisam/mi_rkey.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/mi_rlast.c b/myisam/mi_rlast.c
index 4904c2c6280..7805755ab70 100644
--- a/myisam/mi_rlast.c
+++ b/myisam/mi_rlast.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2001 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
diff --git a/myisam/mi_rnext.c b/myisam/mi_rnext.c
index eb5289500cf..f6a0a47413e 100644
--- a/myisam/mi_rnext.c
+++ b/myisam/mi_rnext.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2004 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
diff --git a/myisam/mi_rnext_same.c b/myisam/mi_rnext_same.c
index 13962de635e..3a7004bf47c 100644
--- a/myisam/mi_rnext_same.c
+++ b/myisam/mi_rnext_same.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/mi_rprev.c b/myisam/mi_rprev.c
index 686d148bf94..09802627185 100644
--- a/myisam/mi_rprev.c
+++ b/myisam/mi_rprev.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2001, 2004 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
diff --git a/myisam/mi_rrnd.c b/myisam/mi_rrnd.c
index c6098deae58..d31e6c24a37 100644
--- a/myisam/mi_rrnd.c
+++ b/myisam/mi_rrnd.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002, 2004 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
diff --git a/myisam/mi_rsame.c b/myisam/mi_rsame.c
index 94a72c7ec2a..4831ebb3d7c 100644
--- a/myisam/mi_rsame.c
+++ b/myisam/mi_rsame.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2001, 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 published by
diff --git a/myisam/mi_rsamepos.c b/myisam/mi_rsamepos.c
index 5f680e7f86e..f78d690f39e 100644
--- a/myisam/mi_rsamepos.c
+++ b/myisam/mi_rsamepos.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2001, 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 published by
diff --git a/myisam/mi_scan.c b/myisam/mi_scan.c
index f0ace427d67..87debb67b37 100644
--- a/myisam/mi_scan.c
+++ b/myisam/mi_scan.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2001 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
diff --git a/myisam/mi_search.c b/myisam/mi_search.c
index ddd0cf03d77..fce720fd904 100644
--- a/myisam/mi_search.c
+++ b/myisam/mi_search.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/mi_static.c b/myisam/mi_static.c
index 1e9ecae93c2..21a25f66b7c 100644
--- a/myisam/mi_static.c
+++ b/myisam/mi_static.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002, 2004-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 published by
diff --git a/myisam/mi_statrec.c b/myisam/mi_statrec.c
index e7bb1d56b00..f88e5b02bcf 100644
--- a/myisam/mi_statrec.c
+++ b/myisam/mi_statrec.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002, 2004-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
diff --git a/myisam/mi_test1.c b/myisam/mi_test1.c
index 1487f66d0de..4664ee5f048 100644
--- a/myisam/mi_test1.c
+++ b/myisam/mi_test1.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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 published by
diff --git a/myisam/mi_test2.c b/myisam/mi_test2.c
index a155bbde693..5aa9250cf18 100644
--- a/myisam/mi_test2.c
+++ b/myisam/mi_test2.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/mi_test3.c b/myisam/mi_test3.c
index 5fd2756ade1..dd798f1a161 100644
--- a/myisam/mi_test3.c
+++ b/myisam/mi_test3.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2004 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
diff --git a/myisam/mi_unique.c b/myisam/mi_unique.c
index 8f934cda42f..cd47e207d2f 100644
--- a/myisam/mi_unique.c
+++ b/myisam/mi_unique.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/mi_update.c b/myisam/mi_update.c
index ef517266337..b35c27d75ad 100644
--- a/myisam/mi_update.c
+++ b/myisam/mi_update.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/mi_write.c b/myisam/mi_write.c
index 43483df35a1..d480c79173e 100644
--- a/myisam/mi_write.c
+++ b/myisam/mi_write.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/myisam_ftdump.c b/myisam/myisam_ftdump.c
index d6f2d822da0..914a47a0c73 100644
--- a/myisam/myisam_ftdump.c
+++ b/myisam/myisam_ftdump.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2001-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
diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h
index f3cf1684daa..3df55fc4780 100644
--- a/myisam/myisamdef.h
+++ b/myisam/myisamdef.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000,2004 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/myisamlog.c b/myisam/myisamlog.c
index d5d791e62c8..0bcf74d87a4 100644
--- a/myisam/myisamlog.c
+++ b/myisam/myisamlog.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/myisampack.c b/myisam/myisampack.c
index b33c8fe87c3..65d35651efa 100644
--- a/myisam/myisampack.c
+++ b/myisam/myisampack.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/rt_index.c b/myisam/rt_index.c
index 26402380e5f..99080c22644 100644
--- a/myisam/rt_index.c
+++ b/myisam/rt_index.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & Ramil Kalimullin & MySQL Finland AB
- & TCX DataKonsult AB
+/* Copyright (C) 2002-2006 MySQL AB & Ramil Kalimullin
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
diff --git a/myisam/rt_index.h b/myisam/rt_index.h
index 65128f4fcfa..20193a1725d 100644
--- a/myisam/rt_index.h
+++ b/myisam/rt_index.h
@@ -1,5 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & Ramil Kalimullin & MySQL Finland AB
- & TCX DataKonsult AB
+/* Copyright (C) 2002, 2004 MySQL AB & Ramil Kalimullin
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
diff --git a/myisam/rt_key.h b/myisam/rt_key.h
index 43d1c92a4c2..4b129aa18f8 100644
--- a/myisam/rt_key.h
+++ b/myisam/rt_key.h
@@ -1,5 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & Ramil Kalimullin & MySQL Finland AB
- & TCX DataKonsult AB
+/* Copyright (C) 2002, 2004 MySQL AB & Ramil Kalimullin
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
diff --git a/myisam/rt_mbr.c b/myisam/rt_mbr.c
index f73dd8ac516..1855e24feb0 100644
--- a/myisam/rt_mbr.c
+++ b/myisam/rt_mbr.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & Ramil Kalimullin & MySQL Finland AB
- & TCX DataKonsult AB
+/* Copyright (C) 2002-2004, 2006 MySQL AB & Ramil Kalimullin
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
diff --git a/myisam/rt_mbr.h b/myisam/rt_mbr.h
index c64383ecafd..d7ff9548e0d 100644
--- a/myisam/rt_mbr.h
+++ b/myisam/rt_mbr.h
@@ -1,5 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & Ramil Kalimullin & MySQL Finland AB
- & TCX DataKonsult AB
+/* Copyright (C) 2002, 2004 MySQL AB & Ramil Kalimullin
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
diff --git a/myisam/rt_split.c b/myisam/rt_split.c
index b3312d37fc9..fdc3e51495c 100644
--- a/myisam/rt_split.c
+++ b/myisam/rt_split.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & Alexey Botchkov & MySQL Finland AB
- & TCX DataKonsult AB
+/* Copyright (C) 2002-2005 MySQL AB & Alexey Botchkov
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
diff --git a/myisam/rt_test.c b/myisam/rt_test.c
index 353d70a5208..1126266d2f9 100644
--- a/myisam/rt_test.c
+++ b/myisam/rt_test.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2002-2004 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
diff --git a/myisam/sort.c b/myisam/sort.c
index d8444b4846d..a6b87141b06 100644
--- a/myisam/sort.c
+++ b/myisam/sort.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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
diff --git a/myisam/sp_defs.h b/myisam/sp_defs.h
index 636e806ecfc..11254d16c97 100644
--- a/myisam/sp_defs.h
+++ b/myisam/sp_defs.h
@@ -1,5 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & Ramil Kalimullin & MySQL Finland AB
- & TCX DataKonsult AB
+/* Copyright (C) 2002, 2004 MySQL AB & Ramil Kalimullin
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
diff --git a/myisam/sp_test.c b/myisam/sp_test.c
index 0457a210f02..c7226589811 100644
--- a/myisam/sp_test.c
+++ b/myisam/sp_test.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2002-2004 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