Skip to content

Commit 033e35d

Browse files
committed
Update License Book
Approved By: Erlend Dahl <[email protected]>
1 parent 6e5fe9c commit 033e35d

File tree

1 file changed

+29
-25
lines changed

1 file changed

+29
-25
lines changed

LICENSE

Lines changed: 29 additions & 25 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 5.6.46 (and later).
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

@@ -3435,33 +3434,38 @@ zlib
34353434
Oracle gratefully acknowledges the contributions of Jean-loup Gailly
34363435
and Mark Adler in creating the zlib general purpose compression library
34373436
which is used in this product.
3438-
zlib.h -- interface of the 'zlib' general purpose compression library
3439-
Copyright (C) 1995-2004 Jean-loup Gailly and Mark Adler
3437+
(C) 1995-2017 Jean-loup Gailly and Mark Adler
34403438

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

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

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

3455-
1. The origin of this software must not be misrepresented; you must not
3456-
claim that you wrote the original software. If you use this software
3457-
in a product, an acknowledgment in the product documentation would
3458-
be appreciated but is not required.
3459-
2. Altered source versions must be plainly marked as such, and must not
3460-
be misrepresented as being the original software.
3461-
3. This notice may not be removed or altered from any source distribution.
3448+
1. The origin of this software must not be misrepresented; you must not
3449+
claim that you wrote the original software. If you use this software
3450+
in a product, an acknowledgment in the product documentation would be
3451+
appreciated but is not required.
34623452

3463-
Jean-loup Gailly [email protected]
3464-
3453+
2. Altered source versions must be plainly marked as such, and must not be
3454+
misrepresented as being the original software.
3455+
3456+
3. This notice may not be removed or altered from any source distribution.
3457+
3458+
Jean-loup Gailly Mark Adler
3459+
3460+
3461+
If you use the zlib library in a product, we would appreciate *not* receiving
3462+
lengthy legal documents to sign. The sources are provided for free but without
3463+
warranty of any kind. The library has been entirely written by Jean-loup
3464+
Gailly and Mark Adler; it does not include third-party code.
3465+
3466+
If you redistribute modified sources, we would appreciate that you include in
3467+
the file ChangeLog history information documenting your changes. Please read
3468+
the FAQ for more information on the distribution of modified source versions.
34653469

34663470
Commonly Used Licenses
34673471

0 commit comments

Comments
 (0)