Merge mysql.com:/home/kent/bk/main/mysql-5.0

into  mysql.com:/home/kent/bk/main/mysql-5.1

18 files changed, 18 insertions, 18 deletions

diff --git a/sql-bench/Makefile.am b/sql-bench/Makefile.am
index ffaa6d5b5eb..a7aff83e7aa 100644
--- a/sql-bench/Makefile.am
+++ b/sql-bench/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2003, 2005 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/sql-bench/as3ap.sh b/sql-bench/as3ap.sh
index bf428c9bf5e..d84219a37eb 100644
--- a/sql-bench/as3ap.sh
+++ b/sql-bench/as3ap.sh
@@ -1,5 +1,5 @@
 #!@PERL@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/sql-bench/bench-count-distinct.sh b/sql-bench/bench-count-distinct.sh
index f6cba162e41..31558aa0b2e 100644
--- a/sql-bench/bench-count-distinct.sh
+++ b/sql-bench/bench-count-distinct.sh
@@ -1,5 +1,5 @@
 #!@PERL@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/sql-bench/bench-init.pl.sh b/sql-bench/bench-init.pl.sh
index 48396d1f47b..5ae1155fd0f 100644
--- a/sql-bench/bench-init.pl.sh
+++ b/sql-bench/bench-init.pl.sh
@@ -1,5 +1,5 @@
 #!@PERL@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2003, 2005 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/sql-bench/compare-results.sh b/sql-bench/compare-results.sh
index f9ac70ea866..145c4894ca2 100644
--- a/sql-bench/compare-results.sh
+++ b/sql-bench/compare-results.sh
@@ -1,5 +1,5 @@
 #!@PERL@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/sql-bench/copy-db.sh b/sql-bench/copy-db.sh
index c1379d2d3fc..f74fa68a081 100644
--- a/sql-bench/copy-db.sh
+++ b/sql-bench/copy-db.sh
@@ -1,5 +1,5 @@
 #!@PERL@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/sql-bench/crash-me.sh b/sql-bench/crash-me.sh
index c5718991dbb..b28bdba7f9f 100644
--- a/sql-bench/crash-me.sh
+++ b/sql-bench/crash-me.sh
@@ -1,6 +1,6 @@
 #!@PERL@
 # -*- perl -*-
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2006 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/sql-bench/run-all-tests.sh b/sql-bench/run-all-tests.sh
index 0b0d164530c..7e607b313e4 100644
--- a/sql-bench/run-all-tests.sh
+++ b/sql-bench/run-all-tests.sh
@@ -1,5 +1,5 @@
 #!@PERL@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh
index 9b71563e432..a7492f67d1a 100644
--- a/sql-bench/server-cfg.sh
+++ b/sql-bench/server-cfg.sh
@@ -1,6 +1,6 @@
 #!@PERL@
 # -*- perl -*-
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2006 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/sql-bench/test-ATIS.sh b/sql-bench/test-ATIS.sh
index 4b47029af09..6d102fd3977 100644
--- a/sql-bench/test-ATIS.sh
+++ b/sql-bench/test-ATIS.sh
@@ -1,5 +1,5 @@
 #!@PERL@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/sql-bench/test-alter-table.sh b/sql-bench/test-alter-table.sh
index afb4f43a258..eb06582dc0b 100644
--- a/sql-bench/test-alter-table.sh
+++ b/sql-bench/test-alter-table.sh
@@ -1,5 +1,5 @@
 #!@PERL@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/sql-bench/test-big-tables.sh b/sql-bench/test-big-tables.sh
index f6fba955403..0226967bc54 100644
--- a/sql-bench/test-big-tables.sh
+++ b/sql-bench/test-big-tables.sh
@@ -1,5 +1,5 @@
 #!@PERL@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/sql-bench/test-connect.sh b/sql-bench/test-connect.sh
index 6c8ac19cab4..84175c357aa 100644
--- a/sql-bench/test-connect.sh
+++ b/sql-bench/test-connect.sh
@@ -1,5 +1,5 @@
 #!@PERL@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/sql-bench/test-create.sh b/sql-bench/test-create.sh
index 850f05dfb94..bc2f17c1f0a 100644
--- a/sql-bench/test-create.sh
+++ b/sql-bench/test-create.sh
@@ -1,5 +1,5 @@
 #!@PERL@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/sql-bench/test-insert.sh b/sql-bench/test-insert.sh
index 70af0447c84..5189e8851e1 100644
--- a/sql-bench/test-insert.sh
+++ b/sql-bench/test-insert.sh
@@ -1,5 +1,5 @@
 #!@PERL@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/sql-bench/test-select.sh b/sql-bench/test-select.sh
index 57446713126..809755ab4d7 100644
--- a/sql-bench/test-select.sh
+++ b/sql-bench/test-select.sh
@@ -1,5 +1,5 @@
 #!@PERL@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/sql-bench/test-transactions.sh b/sql-bench/test-transactions.sh
index e60b811d0c8..5723c856564 100644
--- a/sql-bench/test-transactions.sh
+++ b/sql-bench/test-transactions.sh
@@ -1,5 +1,5 @@
 #!@PERL@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/sql-bench/test-wisconsin.sh b/sql-bench/test-wisconsin.sh
index fe4586f147c..38ab93e7f4a 100644
--- a/sql-bench/test-wisconsin.sh
+++ b/sql-bench/test-wisconsin.sh
@@ -1,5 +1,5 @@
 #!@PERL@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public