summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-12-04 09:11:30 -0500
committerTim Graham <timograham@gmail.com>2014-12-04 10:57:10 -0500
commit765fa36d57d08d0568438f6fd74521e7a56abb61 (patch)
tree704c6b07f0b74dc50d535b80bfbec5fea9e14bff /django
parent018d110ef547acb71b0526d0ff934e1e476244e4 (diff)
Fixed #23920 -- Fixed MySQL crash when adding blank=True to TextField.
Thanks wkornewald for the report and Markus Holtermann for review.
Diffstat (limited to 'django')
-rw-r--r--django/db/backends/schema.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/backends/schema.py b/django/db/backends/schema.py
index 594a360c97..1b4fdbcd4d 100644
--- a/django/db/backends/schema.py
+++ b/django/db/backends/schema.py
@@ -552,7 +552,7 @@ class BaseDatabaseSchemaEditor(object):
# Default change?
old_default = self.effective_default(old_field)
new_default = self.effective_default(new_field)
- if old_default != new_default:
+ if old_default != new_default and not self.skip_default(new_field):
if new_default is None:
actions.append((
self.sql_alter_column_no_default % {