diff options
| author | Tim Graham <timograham@gmail.com> | 2017-11-20 10:08:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-20 10:08:34 -0500 |
| commit | e3c852cbd609484b272f563f3c21066fb12ef7f8 (patch) | |
| tree | 6e0a19932dd818e9941102b2b1baee2bb1071982 /django | |
| parent | 244cc401559e924355cf943b6b8e66ccf2f6da3a (diff) | |
Fixed #28804 -- Fixed "Unknown system variable 'transaction_isolation'" on MariaDB.
Regression in 967450a3bf940c43db891fe1e2ef3bcf73456ff8.
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/backends/mysql/base.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index 3b1cc84f82..abf8f55736 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -221,9 +221,6 @@ class DatabaseWrapper(BaseDatabaseWrapper): isolation_level, ', '.join("'%s'" % s for s in sorted(self.isolation_levels)) )) - # The variable assignment form of setting transaction isolation - # levels will be used, e.g. "set transaction_isolation='repeatable-read'". - isolation_level = isolation_level.replace(' ', '-') self.isolation_level = isolation_level kwargs.update(options) return kwargs @@ -231,10 +228,6 @@ class DatabaseWrapper(BaseDatabaseWrapper): def get_new_connection(self, conn_params): return Database.connect(**conn_params) - @cached_property - def transaction_isolation_variable(self): - return 'tx_isolation' if self.mysql_version < (5, 7, 20) else 'transaction_isolation' - def init_connection_state(self): assignments = [] if self.features.is_sql_auto_is_null_enabled: @@ -242,14 +235,14 @@ class DatabaseWrapper(BaseDatabaseWrapper): # a recently inserted row will return when the field is tested # for NULL. Disabling this brings this aspect of MySQL in line # with SQL standards. - assignments.append('SQL_AUTO_IS_NULL = 0') + assignments.append('SET SQL_AUTO_IS_NULL = 0') if self.isolation_level: - assignments.append("%s = '%s'" % (self.transaction_isolation_variable, self.isolation_level)) + assignments.append('SET SESSION TRANSACTION ISOLATION LEVEL %s' % self.isolation_level.upper()) if assignments: with self.cursor() as cursor: - cursor.execute('SET ' + ', '.join(assignments)) + cursor.execute('; '.join(assignments)) def create_cursor(self, name=None): cursor = self.connection.cursor() |
