summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/models/querysets.txt3
-rw-r--r--docs/releases/3.2.1.txt4
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 7b6709ae8c..c840b6cd89 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -2645,7 +2645,8 @@ unique field in the order that is specified without conflicts. For example::
.. note::
- If the ``order_by()`` clause contains annotations, it will be ignored.
+ ``order_by()`` clause will be ignored if it contains annotations, inherited
+ fields, or lookups spanning relations.
``delete()``
~~~~~~~~~~~~
diff --git a/docs/releases/3.2.1.txt b/docs/releases/3.2.1.txt
index df8d192327..3de4b385c9 100644
--- a/docs/releases/3.2.1.txt
+++ b/docs/releases/3.2.1.txt
@@ -36,3 +36,7 @@ Bugfixes
* Fixed a regression in Django 3.2 that caused a crash when combining ``Q()``
objects which contains boolean expressions (:ticket:`32548`).
+
+* Fixed a regression in Django 3.2 that caused a crash of ``QuerySet.update()``
+ on a queryset ordered by inherited or joined fields on MySQL and MariaDB
+ (:ticket:`32645`).