summaryrefslogtreecommitdiff
path: root/django/db/backends/mysql/operations.py
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2020-05-19 10:56:39 +0200
committerGitHub <noreply@github.com>2020-05-19 10:56:39 +0200
commit20a8a443f012907843450c0b6f6a34a9fc8138f3 (patch)
treea064a8d5ee3cb59bac871c7dec70c16673cd1c89 /django/db/backends/mysql/operations.py
parent9756c334294ad573d887b449e2fe1cc87387af40 (diff)
downloaddjango-20a8a443f012907843450c0b6f6a34a9fc8138f3.tar.gz
Fixed #31578 -- Dropped support for MySQL 5.6.
Diffstat (limited to 'django/db/backends/mysql/operations.py')
-rw-r--r--django/db/backends/mysql/operations.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/django/db/backends/mysql/operations.py b/django/db/backends/mysql/operations.py
index bc04739f0d..af8cfd86b5 100644
--- a/django/db/backends/mysql/operations.py
+++ b/django/db/backends/mysql/operations.py
@@ -350,14 +350,11 @@ class DatabaseOperations(BaseDatabaseOperations):
if format and not (analyze and not self.connection.mysql_is_mariadb):
# Only MariaDB supports the analyze option with formats.
prefix += ' FORMAT=%s' % format
- if self.connection.features.needs_explain_extended and not analyze and format is None:
- # ANALYZE, EXTENDED, and FORMAT are mutually exclusive options.
- prefix += ' EXTENDED'
return prefix
def regex_lookup(self, lookup_type):
# REGEXP BINARY doesn't work correctly in MySQL 8+ and REGEXP_LIKE
- # doesn't exist in MySQL 5.6 or in MariaDB.
+ # doesn't exist in MySQL 5.x or in MariaDB.
if self.connection.mysql_version < (8, 0, 0) or self.connection.mysql_is_mariadb:
if lookup_type == 'regex':
return '%s REGEXP BINARY %s'