Skip to content

Commit 6b5b3e7

Browse files
bjornmubjornmu
committed
GPL License Exception Update
Approved by: Erlend Dahl <erlend.dahl@oracle.com>
1 parent b5d93ab commit 6b5b3e7

File tree

9,168 files changed

+30096
-20715
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

9,168 files changed

+30096
-20715
lines changed

‎.clang-format‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
# it under the terms of the GNU General Public License, version 2.0,
55
# as published by the Free Software Foundation.
66
#
7-
# This program is also distributed with certain software (including
7+
# This program is designed to work with certain software (including
88
# but not limited to OpenSSL) that is licensed under separate terms,
99
# as designated in a particular file or component or in included license
1010
# documentation. The authors of MySQL hereby grant you an additional
1111
# permission to link the program and your derivative works with the
12-
# separately licensed software that they have included with MySQL.
12+
# separately licensed software that they have either included with
13+
# the program or referenced in the documentation.
1314
#
1415
# This program is distributed in the hope that it will be useful,
1516
# but WITHOUT ANY WARRANTY; without even the implied warranty of

‎.clang-tidy‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
# it under the terms of the GNU General Public License, version 2.0,
55
# as published by the Free Software Foundation.
66
#
7-
# This program is also distributed with certain software (including
7+
# This program is designed to work with certain software (including
88
# but not limited to OpenSSL) that is licensed under separate terms,
99
# as designated in a particular file or component or in included license
1010
# documentation. The authors of MySQL hereby grant you an additional
1111
# permission to link the program and your derivative works with the
12-
# separately licensed software that they have included with MySQL.
12+
# separately licensed software that they have either included with
13+
# the program or referenced in the documentation.
1314
#
1415
# This program is distributed in the hope that it will be useful,
1516
# but WITHOUT ANY WARRANTY; without even the implied warranty of

‎.gitconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
# it under the terms of the GNU General Public License, version 2.0,
55
# as published by the Free Software Foundation.
66
#
7-
# This program is also distributed with certain software (including
7+
# This program is designed to work with certain software (including
88
# but not limited to OpenSSL) that is licensed under separate terms,
99
# as designated in a particular file or component or in included license
1010
# documentation. The authors of MySQL hereby grant you an additional
1111
# permission to link the program and your derivative works with the
12-
# separately licensed software that they have included with MySQL.
12+
# separately licensed software that they have either included with
13+
# the program or referenced in the documentation.
1314
#
1415
# This program is distributed in the hope that it will be useful,
1516
# but WITHOUT ANY WARRANTY; without even the implied warranty of

‎CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
# it under the terms of the GNU General Public License, version 2.0,
55
# as published by the Free Software Foundation.
66
#
7-
# This program is also distributed with certain software (including
7+
# This program is designed to work with certain software (including
88
# but not limited to OpenSSL) that is licensed under separate terms,
99
# as designated in a particular file or component or in included license
1010
# documentation. The authors of MySQL hereby grant you an additional
1111
# permission to link the program and your derivative works with the
12-
# separately licensed software that they have included with MySQL.
12+
# separately licensed software that they have either included with
13+
# the program or referenced in the documentation.
1314
#
1415
# This program is distributed in the hope that it will be useful,
1516
# but WITHOUT ANY WARRANTY; without even the implied warranty of

‎Docs/README.build‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,
55
as published by the Free Software Foundation.
66

7-
This program is also distributed with certain software (including
7+
This program is designed to work with certain software (including
88
but not limited to OpenSSL) that is licensed under separate terms,
99
as designated in a particular file or component or in included license
1010
documentation. The authors of MySQL hereby grant you an additional
1111
permission to link the program and your derivative works with the
12-
separately licensed software that they have included with MySQL.
12+
separately licensed software that they have either included with
13+
the program or referenced in the documentation.
1314

1415
This program is distributed in the hope that it will be useful,
1516
but WITHOUT ANY WARRANTY; without even the implied warranty of

‎Docs/sp-imp-spec.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,
55
as published by the Free Software Foundation.
66

7-
This program is also distributed with certain software (including
7+
This program is designed to work with certain software (including
88
but not limited to OpenSSL) that is licensed under separate terms,
99
as designated in a particular file or component or in included license
1010
documentation. The authors of MySQL hereby grant you an additional
1111
permission to link the program and your derivative works with the
12-
separately licensed software that they have included with MySQL.
12+
separately licensed software that they have either included with
13+
the program or referenced in the documentation.
1314

1415
This program is distributed in the hope that it will be useful,
1516
but WITHOUT ANY WARRANTY; without even the implied warranty of

‎Doxyfile-ignored‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
# it under the terms of the GNU General Public License, version 2.0,
55
# as published by the Free Software Foundation.
66
#
7-
# This program is also distributed with certain software (including
7+
# This program is designed to work with certain software (including
88
# but not limited to OpenSSL) that is licensed under separate terms,
99
# as designated in a particular file or component or in included license
1010
# documentation. The authors of MySQL hereby grant you an additional
1111
# permission to link the program and your derivative works with the
12-
# separately licensed software that they have included with MySQL.
12+
# separately licensed software that they have either included with
13+
# the program or referenced in the documentation.
1314
#
1415
# This program is distributed in the hope that it will be useful,
1516
# but WITHOUT ANY WARRANTY; without even the implied warranty of

‎Doxyfile.in‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
## it under the terms of the GNU General Public License, version 2.0,
55
## as published by the Free Software Foundation.
66
##
7-
## This program is also distributed with certain software (including
7+
## This program is designed to work with certain software (including
88
## but not limited to OpenSSL) that is licensed under separate terms,
99
## as designated in a particular file or component or in included license
1010
## documentation. The authors of MySQL hereby grant you an additional
1111
## permission to link the program and your derivative works with the
12-
## separately licensed software that they have included with MySQL.
12+
## separately licensed software that they have either included with
13+
## the program or referenced in the documentation.
1314
##
1415
## This program is distributed in the hope that it will be useful,
1516
## but WITHOUT ANY WARRANTY; without even the implied warranty of

‎LICENSE‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ Licensing Information
1919
General Public License (GPLv2), as set forth below, with the following
2020
additional permissions:
2121

22-
This distribution of MySQL 8.0.36 Community is distributed with certain
22+
This distribution of MySQL 8.0.36 Community is designed to work with certain
2323
software (including but not limited to OpenSSL) that is licensed under
2424
separate terms, as designated in a particular file or component or in
2525
the license documentation. Without limiting your rights under the
2626
GPLv2, the authors of MySQL hereby grant you an additional permission
2727
to link the program and your derivative works with the separately
28-
licensed software that they have included with the program.
28+
licensed software that they have either included with the program
29+
or referenced in the documentation.
2930

3031
This distribution includes the MySQL C API client library
3132
(libmysqlclient) otherwise known as MySQL Connector/C. Without limiting

‎client/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
# it under the terms of the GNU General Public License, version 2.0,
55
# as published by the Free Software Foundation.
66
#
7-
# This program is also distributed with certain software (including
7+
# This program is designed to work with certain software (including
88
# but not limited to OpenSSL) that is licensed under separate terms,
99
# as designated in a particular file or component or in included license
1010
# documentation. The authors of MySQL hereby grant you an additional
1111
# permission to link the program and your derivative works with the
12-
# separately licensed software that they have included with MySQL.
12+
# separately licensed software that they have either included with
13+
# the program or referenced in the documentation.
1314
#
1415
# This program is distributed in the hope that it will be useful,
1516
# but WITHOUT ANY WARRANTY; without even the implied warranty of

0 commit comments

Comments
 (0)