From 187a64608d2a207dfc12fdd6816526e9550069b7 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Wed, 16 Oct 2019 12:58:05 +0200 Subject: [PATCH] Fixed #30885 -- Dropped support for MariaDB 10.1. --- django/db/backends/mysql/features.py | 2 +- docs/ref/databases.txt | 2 +- docs/releases/3.1.txt | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/django/db/backends/mysql/features.py b/django/db/backends/mysql/features.py index 505ac0d12f..7c4f6612b0 100644 --- a/django/db/backends/mysql/features.py +++ b/django/db/backends/mysql/features.py @@ -85,7 +85,7 @@ class DatabaseFeatures(BaseDatabaseFeatures): @cached_property def supports_over_clause(self): if self.connection.mysql_is_mariadb: - return self.connection.mysql_version >= (10, 2) + return True return self.connection.mysql_version >= (8, 0, 2) supports_frame_range_fixed_distance = property(operator.attrgetter('supports_over_clause')) diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 3b23a9dd51..1667e911e2 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -286,7 +286,7 @@ MariaDB notes .. versionadded:: 3.0 -Django supports MariaDB 10.1 and higher. +Django supports MariaDB 10.2 and higher. To use MariaDB, use the MySQL backend, which is shared between the two. See the :ref:`MySQL notes ` for more details. diff --git a/docs/releases/3.1.txt b/docs/releases/3.1.txt index a92c18fc78..1077fcb921 100644 --- a/docs/releases/3.1.txt +++ b/docs/releases/3.1.txt @@ -224,6 +224,12 @@ backends. * ``DatabaseOperations.fetch_returned_insert_columns()`` now requires an additional ``returning_params`` argument. +Dropped support for MariaDB 10.1 +-------------------------------- + +Upstream support for MariaDB 10.1 ends in October 2020. Django 3.1 supports +MariaDB 10.2 and higher. + Miscellaneous -------------