summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2025-02-09 12:57:40 +0100
committerGitHub <noreply@github.com>2025-02-09 12:57:40 +0100
commit17160819f3d98a6355bfd608fe756a43cba33343 (patch)
treef16f563e416fe137b562fe1f2469b6df295b2132 /docs
parent0bac41fc7e4a842e8d20319cba31cc645501c245 (diff)
Fixed #36105 -- Dropped support for MariaDB 10.5.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/databases.txt4
-rw-r--r--docs/ref/migration-operations.txt5
-rw-r--r--docs/releases/6.0.txt6
3 files changed, 10 insertions, 5 deletions
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 541f6e6b71..77f0ac93ff 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -417,7 +417,7 @@ non-durable <https://www.postgresql.org/docs/current/non-durability.html>`_.
MariaDB notes
=============
-Django supports MariaDB 10.5 and higher.
+Django supports MariaDB 10.6 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.
@@ -774,7 +774,7 @@ a :exc:`~django.db.NotSupportedError` is raised.
=============== ========= =====
Option MariaDB MySQL
=============== ========= =====
-``SKIP LOCKED`` X (≥10.6) X
+``SKIP LOCKED`` X X
``NOWAIT`` X X
``OF`` X
``NO KEY``
diff --git a/docs/ref/migration-operations.txt b/docs/ref/migration-operations.txt
index f4d4ae96dd..8379221df5 100644
--- a/docs/ref/migration-operations.txt
+++ b/docs/ref/migration-operations.txt
@@ -259,9 +259,8 @@ Exactly one of ``old_name`` and ``old_fields`` can be provided. ``old_fields``
is an iterable of the strings, often corresponding to fields of
``index_together`` (pre-Django 5.1 option).
-On databases that don't support an index renaming statement (SQLite and MariaDB
-< 10.5.2), the operation will drop and recreate the index, which can be
-expensive.
+On databases that don't support an index renaming statement (SQLite), the
+operation will drop and recreate the index, which can be expensive.
``AddConstraint``
-----------------
diff --git a/docs/releases/6.0.txt b/docs/releases/6.0.txt
index 9dd7100c74..4e5f3c1f02 100644
--- a/docs/releases/6.0.txt
+++ b/docs/releases/6.0.txt
@@ -237,6 +237,12 @@ backends.
* ...
+Dropped support for MariaDB 10.5
+--------------------------------
+
+Upstream support for MariaDB 10.5 ends in June 2025. Django 6.0 supports
+MariaDB 10.6 and higher.
+
Dropped support for Python < 3.12
---------------------------------