Fixed #33129 -- Dropped support for MariaDB 10.2.

6 files changed, 13 insertions, 8 deletions

diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt
index 7b40058fe0..4cc9ceafd2 100644
--- a/docs/ref/contrib/gis/db-api.txt
+++ b/docs/ref/contrib/gis/db-api.txt
@@ -348,7 +348,7 @@ functions are available on each spatial backend.
 Function                              PostGIS  Oracle         MariaDB      MySQL       SpatiaLite
 ====================================  =======  ============== ============ =========== =================
 :class:`Area`                         X        X              X            X           X
-:class:`AsGeoJSON`                    X        X              X (≥ 10.2.4) X (≥ 5.7.5) X
+:class:`AsGeoJSON`                    X        X              X            X (≥ 5.7.5) X
 :class:`AsGML`                        X        X                                       X
 :class:`AsKML`                        X                                                X
 :class:`AsSVG`                        X                                                X
diff --git a/docs/ref/contrib/gis/functions.txt b/docs/ref/contrib/gis/functions.txt
index 82aaf1196d..ad1c02a588 100644
--- a/docs/ref/contrib/gis/functions.txt
+++ b/docs/ref/contrib/gis/functions.txt
@@ -52,7 +52,7 @@ geographic SRSes.
 
 .. class:: AsGeoJSON(expression, bbox=False, crs=False, precision=8, **extra)
 
-*Availability*: MariaDB (≥ 10.2.4), `MySQL
+*Availability*: MariaDB, `MySQL
 <https://dev.mysql.com/doc/refman/en/spatial-geojson-functions.html#function_st-asgeojson>`__ (≥ 5.7.5),
 Oracle, `PostGIS <https://postgis.net/docs/ST_AsGeoJSON.html>`__, SpatiaLite
 
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index d78d2c97d3..acfed4866a 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -328,7 +328,7 @@ non-durable <https://www.postgresql.org/docs/current/non-durability.html>`_.
 MariaDB notes
 =============
 
-Django supports MariaDB 10.2 and higher.
+Django supports MariaDB 10.3 and higher.
 
 To use MariaDB, use the MySQL backend, which is shared between the two. See the
 :ref:`MySQL notes <mysql-notes>` for more details.
@@ -683,7 +683,7 @@ a :exc:`~django.db.NotSupportedError` is raised.
 Option          MariaDB   MySQL
 =============== ========= ==========
 ``SKIP LOCKED`` X (≥10.6) X (≥8.0.1)
-``NOWAIT``      X (≥10.3) X (≥8.0.1)
+``NOWAIT``      X         X (≥8.0.1)
 ``OF``                    X (≥8.0.1)
 ``NO KEY``
 =============== ========= ==========
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index 3b20e9a595..73c0560374 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -1196,9 +1196,8 @@ A field for storing JSON encoded data. In Python the data is represented in its
 Python native format: dictionaries, lists, strings, numbers, booleans and
 ``None``.
 
-``JSONField`` is supported on MariaDB 10.2.7+, MySQL 5.7.8+, Oracle,
-PostgreSQL, and SQLite (with the :ref:`JSON1 extension enabled
-<sqlite-json1>`).
+``JSONField`` is supported on MariaDB, MySQL 5.7.8+, Oracle, PostgreSQL, and
+SQLite (with the :ref:`JSON1 extension enabled <sqlite-json1>`).
 
 .. attribute:: JSONField.encoder
 
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 3a90eee179..f5bc3b8cb6 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -1793,7 +1793,7 @@ them::
     <QuerySet [<Person: ...)>, ...]>
 
 The ``postgresql``, ``oracle``, and ``mysql`` database backends support
-``select_for_update()``. However, MariaDB 10.3+ only supports the ``nowait``
+``select_for_update()``. However, MariaDB only supports the ``nowait``
 argument, MariaDB 10.6+ also supports the ``skip_locked`` argument, and MySQL
 8.0.1+ supports the ``nowait``, ``skip_locked``, and ``of`` arguments. The
 ``no_key`` argument is only supported on PostgreSQL.
diff --git a/docs/releases/4.1.txt b/docs/releases/4.1.txt
index ee0a773f5d..28dd574af5 100644
--- a/docs/releases/4.1.txt
+++ b/docs/releases/4.1.txt
@@ -223,6 +223,12 @@ backends.
 
 * ...
 
+Dropped support for MariaDB 10.2
+--------------------------------
+
+Upstream support for MariaDB 10.2 ends in May 2022. Django 4.1 supports MariaDB
+10.3 and higher.
+
 Miscellaneous
 -------------