mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 01:25:32 +00:00
Code Issues 32 Releases Wiki Activity

[1.10.x] Fixed #26991 -- Fixed a crash in MySQL where SELECT @@SQL_AUTO_IS_NULL doesn't return a result.

Browse Source 
Backport of 431cbd115b from master
This commit is contained in:
Tim Graham
2016-08-02 08:34:15 -04:00
parent d5dbf2e166
commit 11c5c3b801
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/backends/mysql/features.py
View File

@@ -75,4 +75,5 @@ class DatabaseFeatures(BaseDatabaseFeatures):
def is_sql_auto_is_null_enabled(self): def is_sql_auto_is_null_enabled(self):
with self.connection.cursor() as cursor: with self.connection.cursor() as cursor:
cursor.execute('SELECT @@SQL_AUTO_IS_NULL') cursor.execute('SELECT @@SQL_AUTO_IS_NULL')
return cursor.fetchone()[0] == 1 result = cursor.fetchone()
return result and result[0] == 1

3
docs/releases/1.10.1.txt
View File

@@ -9,4 +9,5 @@ Django 1.10.1 fixes several bugs in 1.10.
Bugfixes Bugfixes
======== ========
* ... * Fixed a crash in MySQL connections where ``SELECT @@SQL_AUTO_IS_NULL``
doesn't return a result (:ticket:`26991`).