Pre-patch fix: BUG#32368342: UPDATE COPYRIGHT HEADERS TO 2021

Sven Sandberg · Sven Sandberg · commit 80cc7902b146 · 2021-01-19T13:00:10.000+01:00
Before running the script that updates all copyright headers, fix
files that could not be fixed by the script:

- Remove copyright headers from some files that should not have them.

- Fix wrong privileges for some files.

- Fix malformed copyright headers that are hard to match with a
  line-based regex because they have newlines in the middle.

RB#25754, RB#25755, RB#25756
diff --git a/mysql-test/include/bug13581713.inc b/mysql-test/include/bug13581713.inc
@@ -1,5 +1,3 @@
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-
 --source include/turn_off_only_full_group_by.inc
 
 insert into t1 values(100,1,2),(200,1,1),(300,2,1),(400,2,2);
diff --git a/mysql-test/include/server_option_test.pm b/mysql-test/include/server_option_test.pm
@@ -1,6 +1,4 @@
 #!/usr/bin/perl -w
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-# reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
diff --git a/mysql-test/suite/memcached/t/memc213_2_intcols.test b/mysql-test/suite/memcached/t/memc213_2_intcols.test
@@ -1,8 +1,3 @@
-#
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights
-# reserved.
-#
-
 source include/not_valgrind.inc;
 source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
diff --git a/mysql-test/suite/memcached/t/memc234_r_batch_1.test b/mysql-test/suite/memcached/t/memc234_r_batch_1.test
@@ -1,7 +1,3 @@
-#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
 source include/not_valgrind.inc;
 source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
diff --git a/mysql-test/suite/memcached/t/memc245_w_batch_2.test b/mysql-test/suite/memcached/t/memc245_w_batch_2.test
@@ -1,7 +1,3 @@
-#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
 source include/not_valgrind.inc;
 source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
diff --git a/mysql-test/suite/memcached/t/memc283_misc.test b/mysql-test/suite/memcached/t/memc283_misc.test
@@ -1,7 +1,3 @@
-#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
 source include/not_valgrind.inc;
 source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
diff --git a/mysql-test/suite/memcached/t/memc284_misc.test b/mysql-test/suite/memcached/t/memc284_misc.test
@@ -1,7 +1,3 @@
-#
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
-#
-
 source include/not_valgrind.inc;
 source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
diff --git a/mysql-test/suite/memcached/t/memc285_FTWRL.test b/mysql-test/suite/memcached/t/memc285_FTWRL.test
@@ -1,8 +1,3 @@
-#
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights
-# reserved.
-#
-
 source include/not_valgrind.inc;
 source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
diff --git a/mysql-test/suite/memcached/t/memc290_read_committed.test b/mysql-test/suite/memcached/t/memc290_read_committed.test
@@ -1,8 +1,3 @@
-#
-## Copyright (c) 2017, Oracle and/or its affiliates. All rights
-##reserved.
-#
-
 # Bug#20205934 - ENABLE VALGRIND FOR MEMCACHED TESTS
 source include/not_valgrind.inc;
 source include/have_memcached_plugin.inc;
diff --git a/mysql-test/suite/memcached/t/memc_api_disable_rowlock.test b/mysql-test/suite/memcached/t/memc_api_disable_rowlock.test
@@ -1,7 +1,3 @@
-#
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
-#
-
 source include/not_valgrind.inc;
 source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
diff --git a/mysql-test/suite/rpl/extension/bhs.pl b/mysql-test/suite/rpl/extension/bhs.pl
@@ -1,27 +1,5 @@
 #!/usr/bin/perl
 
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License, version 2.0,
-# as published by the Free Software Foundation.
-#
-# This program is also distributed with certain software (including
-# but not limited to OpenSSL) that is licensed under separate terms,
-# as designated in a particular file or component or in included license
-# documentation.  The authors of MySQL hereby grant you an additional
-# permission to link the program and your derivative works with the
-# separately licensed software that they have included with MySQL.
-#
-# 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, version 2.0, 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 File::Basename;
 use File::Copy qw(copy);
 use File::Spec qw(catdir);
diff --git a/mysql-test/suite/rpl/extension/checksum.pl b/mysql-test/suite/rpl/extension/checksum.pl
@@ -1,27 +1,5 @@
 #!/usr/bin/perl
 
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License, version 2.0,
-# as published by the Free Software Foundation.
-#
-# This program is also distributed with certain software (including
-# but not limited to OpenSSL) that is licensed under separate terms,
-# as designated in a particular file or component or in included license
-# documentation.  The authors of MySQL hereby grant you an additional
-# permission to link the program and your derivative works with the
-# separately licensed software that they have included with MySQL.
-#
-# 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, version 2.0, 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 File::Basename;
 use File::Copy qw(copy);
 use File::Spec qw(catdir);
diff --git a/mysql-test/t/opt_costmodel_warnings.test b/mysql-test/t/opt_costmodel_warnings.test
@@ -1,7 +1,3 @@
-#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
-#
-
 #
 # Test that provides code coverage for the code that checks and handles
 # entries in the cost constant tables that has invalid values.
diff --git a/storage/archive/azlib.h b/storage/archive/azlib.h
@@ -3,8 +3,7 @@
      -Brian Aker
 
   This file was modified by Oracle on 02-08-2016.
-  Modifications copyright (c) 2016, Oracle and/or its affiliates.
-  All rights reserved.
+  Modifications copyright (c) 2016, 2021, Oracle and/or its affiliates.
 */
 
 /* zlib.h -- interface of the 'zlib' general purpose compression library
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2002 MySQL AB & tommy@valley.ne.jp
-   Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, tommy@valley.ne.jp
+   Copyright (c) 2002, 2021, Oracle and/or its affiliates.
    
    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/strings/ctype-eucjpms.c b/strings/ctype-eucjpms.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2002 MySQL AB & tommy@valley.ne.jp
-   Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, tommy@valley.ne.jp
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
    
    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/strings/ctype-ujis.c b/strings/ctype-ujis.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2002 MySQL AB & tommy@valley.ne.jp
-   Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, tommy@valley.ne.jp
+   Copyright (c) 2002, 2021, Oracle and/or its affiliates.
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.`
`2`		`-`
`3`	`1`	`--source include/turn_off_only_full_group_by.inc`
`4`	`2`
`5`	`3`	`insert into t1 values(100,1,2),(200,1,1),(300,2,1),(400,2,2);`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`#!/usr/bin/perl -w`
`2`		`-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.`
`3`		`-# reserved.`
`4`	`2`	`#`
`5`	`3`	`# This program is free software; you can redistribute it and/or modify`
`6`	`4`	`# it under the terms of the GNU General Public License, version 2.0,`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,3 @@`
`1`		`-#`
`2`		`-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.`
`3`		`-#`
`4`		`-`
`5`	`1`	`#`
`6`	`2`	`# Test that provides code coverage for the code that checks and handles`
`7`	`3`	`# entries in the cost constant tables that has invalid values.`