summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-03-20 23:32:39 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-03-20 23:32:39 +0000
commit1f9711ffb02f89da445251366d3827f39b05da11 (patch)
tree36a87ddf30358b420825d2d6dd7f874e77b5ae3b
parent9fb40185fefd5e952c08177f4d3de53e6112b17e (diff)
Fixed #3754 -- Re-introduced utf-8 as default encoding for interaction with
MySQL backend (a side-effect of [4724]). Thanks Andy Dustman and Michael Radziej. git-svn-id: http://code.djangoproject.com/svn/django/trunk@4760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/backends/mysql/base.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py
index 081c1185a5..94718595cb 100644
--- a/django/db/backends/mysql/base.py
+++ b/django/db/backends/mysql/base.py
@@ -80,6 +80,8 @@ class DatabaseWrapper(local):
if not self._valid_connection():
kwargs = {
'conv': django_conversions,
+ 'charset': 'utf8',
+ 'use_unicode': False,
}
if settings.DATABASE_USER:
kwargs['user'] = settings.DATABASE_USER