summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-11-19 14:31:48 -0500
committerTim Graham <timograham@gmail.com>2014-11-19 16:07:49 -0500
commit5bcd292098b4de7bb03ef778e24d9e2f433d0dae (patch)
treec188131bf15261eccc7375cfa344bbfafdf857f0
parent45db7f7db85ea490fa914fa57ac943d83a6c07f1 (diff)
Fixed #23871 -- Removed promotion of MySQL warnings to errors in DEBUG mode.
-rw-r--r--django/db/backends/mysql/base.py4
-rw-r--r--docs/releases/1.8.txt3
2 files changed, 3 insertions, 4 deletions
diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py
index b2d9b649be..5d1c023dcb 100644
--- a/django/db/backends/mysql/base.py
+++ b/django/db/backends/mysql/base.py
@@ -50,10 +50,6 @@ from django.utils.safestring import SafeBytes, SafeText
from django.utils import six
from django.utils import timezone
-# Raise exceptions for database warnings if DEBUG is on
-if settings.DEBUG:
- warnings.filterwarnings("error", category=Database.Warning)
-
DatabaseError = Database.DatabaseError
IntegrityError = Database.IntegrityError
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 77ab5eec80..cbd63495c5 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -774,6 +774,9 @@ Miscellaneous
in ``django.test.utils`` were removed. Override ``TEMPLATE_LOADERS`` with
``override_settings`` instead.
+* Warnings from the MySQL database backend are no longer converted to
+ exceptions when :setting:`DEBUG` is ``True``.
+
.. _deprecated-features-1.8:
Features deprecated in 1.8