diff options
| author | Tim Graham <timograham@gmail.com> | 2016-09-30 08:58:59 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-09-30 09:15:49 -0400 |
| commit | c37e170f7a2ccf2938aefd77350c30beffef43e5 (patch) | |
| tree | a8394afeb7cc9fea08cee9350ab194adf75f1a6a /django | |
| parent | ec38aa818cb145c84211fee3076ccb5eb2073848 (diff) | |
[1.10.x] Updated links to the current version of MySQL docs.
Backport of 98196766769c2ed8816772b60a2e8b79028963a2 from master
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/gis/db/backends/mysql/operations.py | 2 | ||||
| -rw-r--r-- | django/db/backends/mysql/base.py | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/django/contrib/gis/db/backends/mysql/operations.py b/django/contrib/gis/db/backends/mysql/operations.py index b59060b221..ce91428d53 100644 --- a/django/contrib/gis/db/backends/mysql/operations.py +++ b/django/contrib/gis/db/backends/mysql/operations.py @@ -116,7 +116,7 @@ class MySQLOperations(BaseSpatialOperations, DatabaseOperations): converters.append(self.convert_invalid_empty_geometry_collection) return converters - # https://dev.mysql.com/doc/refman/5.7/en/spatial-function-argument-handling.html + # https://dev.mysql.com/doc/refman/en/spatial-function-argument-handling.html # MySQL 5.7.5 adds support for the empty geometry collections, but they are represented with invalid WKT. def convert_invalid_empty_geometry_collection(self, value, expression, connection, context): if value == b'GEOMETRYCOLLECTION()': diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index 435529e815..880508221e 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -80,9 +80,7 @@ django_conversions.update({ }) # This should match the numerical portion of the version numbers (we can treat -# versions like 5.0.24 and 5.0.24a as the same). Based on the list of version -# at http://dev.mysql.com/doc/refman/4.1/en/news.html and -# http://dev.mysql.com/doc/refman/5.0/en/news.html . +# versions like 5.0.24 and 5.0.24a as the same). server_version_re = re.compile(r'(\d{1,2})\.(\d{1,2})\.(\d{1,2})') |
