summaryrefslogtreecommitdiff
path: root/django/db/backends/mysql/features.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/db/backends/mysql/features.py')
-rw-r--r--django/db/backends/mysql/features.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/db/backends/mysql/features.py b/django/db/backends/mysql/features.py
index f33ed0086b..6e628e80d1 100644
--- a/django/db/backends/mysql/features.py
+++ b/django/db/backends/mysql/features.py
@@ -185,7 +185,9 @@ class DatabaseFeatures(BaseDatabaseFeatures):
@cached_property
def has_select_for_update_skip_locked(self):
- return not self.connection.mysql_is_mariadb and self.connection.mysql_version >= (8, 0, 1)
+ if self.connection.mysql_is_mariadb:
+ return self.connection.mysql_version >= (10, 6)
+ return self.connection.mysql_version >= (8, 0, 1)
@cached_property
def has_select_for_update_nowait(self):