Skip to content

Commit 5ce0d4c

Browse files
nmariznmariz
committed
Update LICENSE.txt
1 parent 2a0196e commit 5ce0d4c

File tree

4 files changed

+40
-57
lines changed

4 files changed

+40
-57
lines changed

‎CHANGES.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ MySQL Connector/Python 8.0 - Release Notes & Changes
33
====================================================
44

55
MySQL Connector/Python
6-
Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
77

88
Full release notes:
99
http://dev.mysql.com/doc/relnotes/connector-python/en/
1010

1111
v8.0.6
1212
======
13+
1314
- WL#11372: Remove configuration API
1415
- WL#11303: Remove CreateTable and CreateView
1516
- WL#11281: Transaction savepoints
@@ -20,6 +21,7 @@ v8.0.6
2021

2122
v8.0.5
2223
======
24+
2325
- WL#11073: Add caching_sha2_password authentication plugin
2426
- WL#10975: Add Single document operations
2527
- WL#10974: Add Row locking methods to find and select operations
@@ -30,6 +32,7 @@ v8.0.5
3032

3133
v8.0.4
3234
======
35+
3336
- WL#10772: Cleanup Drop APIs
3437
- WL#10770: Ensure all Session connections are secure by default
3538
- WL#10754: Forbid modify() and remove() with no condition
@@ -46,6 +49,7 @@ v8.0.4
4649

4750
v2.2.3
4851
======
52+
4953
- WL#10452: Add Protobuf C++ extension for Linux variants and Mac OSX
5054
- WL#10081: DevAPI: IPv6 support
5155
- BUG#25614860: Fix defined_as method in the view creation

‎LICENSE.txt

Lines changed: 32 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,37 @@ Licensing Information User Manual
33
MySQL Connector/Python
44
__________________________________________________________________
55

6-
This is a license book. It contains Oracle's product license and other
7-
licensing information, including licensing information for third-party
8-
software which may be included in this GPL release of MySQL
9-
Connector/Python.
10-
11-
Last updated: December 2017.
12-
136
Introduction
147

15-
This Licensing Information document is a part of the product or program
16-
documentation under the terms of your Oracle license agreement and is
17-
intended to help you understand the program editions, entitlements,
18-
restrictions, prerequisites, special license rights, and/or separately
19-
licensed third party technology terms associated with the Oracle
20-
software program(s) covered by this document (the "Program(s)").
21-
Entitled or restricted use products or components identified in this
22-
document that are not provided with the particular Program may be
23-
obtained from the Oracle Software Delivery Cloud website
24-
(https://edelivery.oracle.com/) or from media Oracle may provide. If
25-
you have a question about your license rights and obligations, please
26-
contact your Oracle sales representative, review the information
27-
provided in Oracle's Software Investment Guide
28-
(http://www.oracle.com/us/corporate/pricing/software-investment-guide/i
29-
ndex.html), and/or contact the applicable Oracle License Management
30-
Services representative listed on
31-
http://www.oracle.com/us/corporate/license-management-services/index.ht
32-
ml.
8+
This License Information User Manual contains Oracle's product license
9+
and other licensing information, including licensing information for
10+
third-party software which may be included in this distribution of
11+
MySQL Connector/Python.
12+
13+
Last updated: January 2018.
3314

3415
Licensing Information
3516

3617
Product License - MySQL Connector/Python
3718

3819
This is a release of MySQL Connector/Python, the dual-license Python
39-
API for MySQL . For the avoidance of doubt, this particular copy of the
20+
API for MySQL. For the avoidance of doubt, this particular copy of the
4021
software is released under version 2 of the GNU General Public License.
4122
MySQL Connector/Python is brought to you by the MySQL team at Oracle.
4223

43-
Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights
24+
Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights
4425
reserved.
4526

27+
Election of GPLv2
28+
29+
For the avoidance of doubt, except that if any license choice other
30+
than GPL or LGPL is available it will apply instead, Oracle elects to
31+
use only the General Public License version 2 (GPLv2) at this time for
32+
any software where a choice of GPL license versions is made available
33+
with the language indicating that GPLv2 or any later version may be
34+
used, or where a choice of which version of the GPL is applied is
35+
otherwise unspecified.
36+
4637
GNU General Public License Version 2.0, June 1991
4738

4839
The following applies to all products licensed under the GNU General
@@ -427,34 +418,23 @@ MySQL FOSS License Exception
427418
This software is OSI Certified Open Source Software. OSI Certified is a
428419
certification mark of the Open Source Initiative.
429420

430-
GPLv2 Disclaimer
431-
432-
For the avoidance of doubt, except that if any license choice other
433-
than GPL or LGPL is available it will apply instead, Oracle elects to
434-
use only the General Public License version 2 (GPLv2) at this time for
435-
any software where a choice of GPL license versions is made available
436-
with the language indicating that GPLv2 or any later version may be
437-
used, or where a choice of which version of the GPL is applied is
438-
otherwise unspecified.
439-
440421
Written Offer for Source Code
441422

442-
For third-party software that you receive from Oracle in binary form
443-
which is licensed under an open source license that gives you the right
444-
to receive the source code for that binary, you can obtain a copy of
445-
the applicable source code by visiting
423+
For any software that you receive from Oracle in binary form which is
424+
licensed under an open source license that gives you the right to
425+
receive the source code for that binary, you can obtain a copy of the
426+
applicable source code by visiting
446427
http://www.oracle.com/goto/opensourcecode. If the source code for the
447428
binary was not provided to you with the binary, you can also receive a
448429
copy of the source code on physical media by submitting a written
449430
request to the address listed below or by sending an email to Oracle
450431
using the following link:
451-
452-
http://www.oracle.com/goto/opensourcecode/request
453-
Oracle America, Inc.
454-
Attn: Senior Vice President
455-
Development and Engineering Legal
456-
500 Oracle Parkway, 10th Floor
457-
Redwood Shores, CA 94065
432+
http://www.oracle.com/goto/opensourcecode/request.
433+
Oracle America, Inc.
434+
Attn: Senior Vice President
435+
Development and Engineering Legal
436+
500 Oracle Parkway, 10th Floor
437+
Redwood Shores, CA 94065
458438

459439
Your request should include:
460440

@@ -477,7 +457,7 @@ Written Offer for Source Code
477457
processing.
478458

479459
Your request must be sent
480-
a. within three (3) years of the date you received the Oracleproduct
460+
a. within three (3) years of the date you received the Oracle product
481461
that included the binary that is the subject of your request, or
482462
b. in the case of code licensed under the GPL v3 for as long as Oracle
483463
offers spare parts or customer support for that product model.
@@ -489,7 +469,7 @@ Licenses for Third-Party Components
489469
used to test MySQL Connector/Python. We are thankful to all individuals
490470
that have created these.
491471

492-
Django 1.5.1 License
472+
Django 1.5.1
493473

494474
The following software may be included in this product:
495475
Copyright (c) Django Software Foundation and individual contributors.
@@ -526,10 +506,9 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
526506
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
527507
POSSIBILITY OF SUCH DAMAGE.
528508

529-
Google Protocol Buffers License
530-
531-
The following software may be included in this product:
509+
Google Protocol Buffers
532510

511+
The following software may be included in this product:
533512
Protocol Buffers (aka Google protobuf)
534513

535514
Google Protocol Buffers - protobuf

‎README.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ MySQL Connector/Python 8.0
33
==========================
44

55
MySQL Connector/Python
6-
Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
77

88
License information can be found in the LICENSE.txt file.
99

@@ -29,7 +29,7 @@ They can be found in the examples/ directory.
2929
License
3030
=======
3131

32-
Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
32+
Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
3333

3434
This is a release of MySQL Connector/Python, Oracle's Python driver for MySQL.
3535

‎cpyint

0 commit comments

Comments
 (0)