Skip to content

Commit 2ee0e71

Browse files
committed
Update License Book
Approved By: Erlend Dahl <[email protected]>
1 parent 0f4482b commit 2ee0e71

File tree

1 file changed

+30
-26
lines changed

1 file changed

+30
-26
lines changed

LICENSE

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Introduction
1010
third-party software which may be included in this distribution of
1111
MySQL 8.0.
1212

13-
Last updated: March 2020
13+
Last updated: May 2020
1414

1515
Licensing Information
1616

@@ -35,8 +35,7 @@ Licensing Information
3535
reproduced below and can also be found along with its FAQ at
3636
http://oss.oracle.com/licenses/universal-foss-exception.
3737

38-
Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights
39-
reserved.
38+
Copyright (c) 1997, 2020, Oracle and/or its affiliates.
4039

4140
Election of GPLv2
4241

@@ -1554,7 +1553,7 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
15541553
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
15551554
POSSIBILITY OF SUCH DAMAGE.
15561555

1557-
ICU 58
1556+
ICU
15581557

15591558
The following software may be included in this product:
15601559
COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later)
@@ -6941,33 +6940,38 @@ zlib
69416940
Oracle gratefully acknowledges the contributions of Jean-loup Gailly
69426941
and Mark Adler in creating the zlib general purpose compression library
69436942
which is used in this product.
6944-
zlib.h -- interface of the 'zlib' general purpose compression library
6945-
Copyright (C) 1995-2004 Jean-loup Gailly and Mark Adler
6943+
(C) 1995-2017 Jean-loup Gailly and Mark Adler
69466944

6947-
zlib.h -- interface of the 'zlib' general purpose compression library
6948-
version 1.2.3, July 18th, 2005
6949-
Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
6945+
This software is provided 'as-is', without any express or implied
6946+
warranty. In no event will the authors be held liable for any damages
6947+
arising from the use of this software.
69506948

6951-
zlib.h -- interface of the 'zlib' general purpose compression library
6952-
version 1.2.5, April 19th, 2010
6953-
Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
6949+
Permission is granted to anyone to use this software for any purpose,
6950+
including commercial applications, and to alter it and redistribute it
6951+
freely, subject to the following restrictions:
69546952

6955-
This software is provided 'as-is', without any express or implied warranty.
6956-
In no event will the authors be held liable for any damages arising from the
6957-
use of this software. Permission is granted to anyone to use this software
6958-
for any purpose,including commercial applications, and to alter it and
6959-
redistribute it freely, subject to the following restrictions:
69606953

6961-
1. The origin of this software must not be misrepresented; you must not
6962-
claim that you wrote the original software. If you use this software
6963-
in a product, an acknowledgment in the product documentation would
6964-
be appreciated but is not required.
6965-
2. Altered source versions must be plainly marked as such, and must not
6966-
be misrepresented as being the original software.
6967-
3. This notice may not be removed or altered from any source distribution.
6954+
1. The origin of this software must not be misrepresented; you must not
6955+
claim that you wrote the original software. If you use this software
6956+
in a product, an acknowledgment in the product documentation would be
6957+
appreciated but is not required.
69686958

6969-
Jean-loup Gailly [email protected]
6970-
6959+
2. Altered source versions must be plainly marked as such, and must not be
6960+
misrepresented as being the original software.
6961+
6962+
3. This notice may not be removed or altered from any source distribution.
6963+
6964+
Jean-loup Gailly Mark Adler
6965+
6966+
6967+
If you use the zlib library in a product, we would appreciate *not* receiving
6968+
lengthy legal documents to sign. The sources are provided for free but without
6969+
warranty of any kind. The library has been entirely written by Jean-loup
6970+
Gailly and Mark Adler; it does not include third-party code.
6971+
6972+
If you redistribute modified sources, we would appreciate that you include in
6973+
the file ChangeLog history information documenting your changes. Please read
6974+
the FAQ for more information on the distribution of modified source versions.
69716975

69726976
ZSTD
69736977

0 commit comments

Comments
 (0)