Merge remote-tracking branch 'origin/release/8.0.14'

nawazn · nawazn · commit bf46cbb92b9a · 2019-01-21T16:05:45.000+05:30
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -3,7 +3,7 @@ MySQL Connector/Python 8.0 - Release Notes & Changes
 ====================================================
 
 MySQL Connector/Python
-Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
 
 Full release notes:
  http://dev.mysql.com/doc/relnotes/connector-python/en/
@@ -12,8 +12,8 @@ v8.0.14
 =======
 
 - WL#12607: Handling of Default Schema
+- WL#12493: Standardize count method
 - WL#12492: Be prepared for initial notice on connection
-- WL#12412: Standardize count method
 - BUG#28646344: Remove expression parsing on values
 - BUG#28280321: Fix segmentation fault when using unicode characters in tables
 - BUG#27794178: Using use_pure=False should raise an error if cext is not available
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -10,7 +10,7 @@ Introduction
    third-party software which may be included in this distribution of
    MySQL Connector/Python 8.0.
 
-   Last updated: November 2018.
+   Last updated: January 2019.
 
 Licensing Information
 
@@ -33,7 +33,7 @@ Licensing Information
    a copy of which is reproduced below and can also be found along with
    its FAQ at http://oss.oracle.com/licenses/universal-foss-exception.
 
-   Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights
+   Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights
    reserved.
 
 Election of GPLv2
diff --git a/README.txt b/README.txt
@@ -3,7 +3,7 @@ MySQL Connector/Python 8.0
 ==========================
 
 MySQL Connector/Python
-Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
 
 License information can be found in the LICENSE.txt file.
 
@@ -29,7 +29,7 @@ They can be found in the examples/ directory.
 License
 =======
 
-Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 
 This is a release of MySQL Connector/Python, Oracle's Python driver for MySQL.
 
diff --git a/cpyint b/cpyint
@@ -1 +1 @@
-Subproject commit ce7248bd3d94a3d4a669356e80ce458e395915ad
+Subproject commit da875b83edae4e89f413d88c2731029f4bf57865
diff --git a/docs/mysqlx/conf.py b/docs/mysqlx/conf.py
@@ -65,7 +65,7 @@
 
 # General information about the project.
 project = u'MySQL Connector/Python X DevAPI Reference'
-copyright = u'2016, 2018, Oracle and/or its affiliates. All rights reserved'
+copyright = u'2016, 2019, Oracle and/or its affiliates. All rights reserved'
 author = u'Nuno Mariz'
 
 # The version info for the project you're documenting, acts as replacement for
diff --git a/docs/mysqlx/license.rst b/docs/mysqlx/license.rst
@@ -1,7 +1,7 @@
 License
 =======
 
-Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2016, 2019, 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
diff --git a/lib/cpy_distutils.py b/lib/cpy_distutils.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2019, 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
diff --git a/setupinfo.py b/setupinfo.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, 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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.`
	`1`	`+# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.`
`2`	`2`	`#`
`3`	`3`	`# This program is free software; you can redistribute it and/or modify`
`4`	`4`	`# it under the terms of the GNU General Public License, version 2.0, as`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.`
	`1`	`+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.`
`2`	`2`	`#`
`3`	`3`	`# This program is free software; you can redistribute it and/or modify`
`4`	`4`	`# it under the terms of the GNU General Public License, version 2.0, as`