summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/gis/install/index.txt2
-rw-r--r--docs/ref/databases.txt17
-rw-r--r--docs/releases/3.2.txt6
3 files changed, 15 insertions, 10 deletions
diff --git a/docs/ref/contrib/gis/install/index.txt b/docs/ref/contrib/gis/install/index.txt
index 5242425aaa..5d99cfc009 100644
--- a/docs/ref/contrib/gis/install/index.txt
+++ b/docs/ref/contrib/gis/install/index.txt
@@ -59,7 +59,7 @@ supported versions, and any notes for each of the supported database backends:
Database Library Requirements Supported Versions Notes
================== ============================== ================== =========================================
PostgreSQL GEOS, GDAL, PROJ, PostGIS 9.6+ Requires PostGIS.
-MySQL GEOS, GDAL 5.6.1+ :ref:`Limited functionality <mysql-spatial-limitations>`.
+MySQL GEOS, GDAL 5.7+ :ref:`Limited functionality <mysql-spatial-limitations>`.
Oracle GEOS, GDAL 12.2+ XE not supported.
SQLite GEOS, GDAL, PROJ, SpatiaLite 3.8.3+ Requires SpatiaLite 4.3+
================== ============================== ================== =========================================
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index d788f2f677..d129a19536 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -300,7 +300,7 @@ MySQL notes
Version support
---------------
-Django supports MySQL 5.6 and higher.
+Django supports MySQL 5.7 and higher.
Django's ``inspectdb`` feature uses the ``information_schema`` database, which
contains detailed data on all database schemas.
@@ -479,11 +479,11 @@ Several other `MySQLdb connection options`_ may be useful, such as ``ssl``,
Setting ``sql_mode``
~~~~~~~~~~~~~~~~~~~~
-From MySQL 5.7 onwards and on fresh installs of MySQL 5.6, the default value of
-the ``sql_mode`` option contains ``STRICT_TRANS_TABLES``. That option escalates
-warnings into errors when data are truncated upon insertion, so Django highly
-recommends activating a `strict mode`_ for MySQL to prevent data loss (either
-``STRICT_TRANS_TABLES`` or ``STRICT_ALL_TABLES``).
+From MySQL 5.7 onwards, the default value of the ``sql_mode`` option contains
+``STRICT_TRANS_TABLES``. That option escalates warnings into errors when data
+are truncated upon insertion, so Django highly recommends activating a
+`strict mode`_ for MySQL to prevent data loss (either ``STRICT_TRANS_TABLES``
+or ``STRICT_ALL_TABLES``).
.. _strict mode: https://dev.mysql.com/doc/refman/en/sql-mode.html#sql-mode-strict
@@ -605,9 +605,8 @@ specification without a key length".
Fractional seconds support for Time and DateTime fields
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-MySQL 5.6.4 and later can store fractional seconds, provided that the
-column definition includes a fractional indication (e.g. ``DATETIME(6)``).
-Earlier versions do not support them at all.
+MySQL can store fractional seconds, provided that the column definition
+includes a fractional indication (e.g. ``DATETIME(6)``).
Django will not upgrade existing columns to include fractional seconds if the
database server supports it. If you want to enable them on an existing database,
diff --git a/docs/releases/3.2.txt b/docs/releases/3.2.txt
index 1603f8f1b3..54ffbbfd27 100644
--- a/docs/releases/3.2.txt
+++ b/docs/releases/3.2.txt
@@ -243,6 +243,12 @@ Dropped support for PostgreSQL 9.5
Upstream support for PostgreSQL 9.5 ends in February 2021. Django 3.2 supports
PostgreSQL 9.6 and higher.
+Dropped support for MySQL 5.6
+-----------------------------
+
+The end of upstream support for MySQL 5.6 is April 2021. Django 3.2 supports
+MySQL 5.7 and higher.
+
Miscellaneous
-------------