summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorNick Pope <nick.pope@flightdataservices.com>2019-10-21 17:34:19 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-10-24 15:13:26 +0200
commit55df1750be3c88db89444335f77dca10681dcbe3 (patch)
tree71c8547cd87b78ba47659ad34aff957352172251 /docs
parent742961332e1e2221e6fb9506c7254164e0c2cb5a (diff)
Refs #30897 -- Added support for ANALYZE option to Queryset.explain() on MariaDB and MySQL 8.0.18+.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/models/querysets.txt9
-rw-r--r--docs/releases/3.1.txt5
2 files changed, 9 insertions, 5 deletions
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 136674be2a..766a379a13 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -2587,13 +2587,14 @@ Pass these flags as keyword arguments. For example, when using PostgreSQL::
Execution time: 0.058 ms
On some databases, flags may cause the query to be executed which could have
-adverse effects on your database. For example, PostgreSQL's ``ANALYZE`` flag
-could result in changes to data if there are triggers or if a function is
-called, even for a ``SELECT`` query.
+adverse effects on your database. For example, the ``ANALYZE`` flag supported
+by MariaDB, MySQL 8.0.18+, and PostgreSQL could result in changes to data if
+there are triggers or if a function is called, even for a ``SELECT`` query.
.. versionchanged:: 3.1
- Support for the ``'TREE'`` format on MySQL 8.0.16+ was added.
+ Support for the ``'TREE'`` format on MySQL 8.0.16+ and ``analyze`` option
+ on MariaDB and MySQL 8.0.18+ were added.
.. _field-lookups:
diff --git a/docs/releases/3.1.txt b/docs/releases/3.1.txt
index cf77bb15db..70297b5311 100644
--- a/docs/releases/3.1.txt
+++ b/docs/releases/3.1.txt
@@ -169,7 +169,10 @@ Models
:class:`~django.db.models.DateTimeField`, and the new :lookup:`iso_week_day`
lookup allows querying by an ISO-8601 day of week.
-* :meth:`.QuerySet.explain` now supports ``TREE`` format on MySQL 8.0.16+.
+* :meth:`.QuerySet.explain` now supports:
+
+ * ``TREE`` format on MySQL 8.0.16+,
+ * ``analyze`` option on MySQL 8.0.18+ and MariaDB.
Pagination
~~~~~~~~~~