Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #1121 -- Changed MySQL backend to use correct character set in …

…MySQL 4.1x/5.x on Win32. Thanks, hipertracker@gmail.com

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1878 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 11bcc7969d43db596cbbad51db220d1f264fbac3 1 parent 9f0deae
@adrianholovaty adrianholovaty authored
Showing with 6 additions and 2 deletions.
  1. +1 −0  AUTHORS
  2. +5 −2 django/core/db/backends/mysql.py
View
1  AUTHORS
@@ -52,6 +52,7 @@ answer newbie questions, and generally made Django that much better:
Espen Grindhaug <http://grindhaug.org/>
Gustavo Picon
Brant Harris
+ hipertracker@gmail.com
Ian Holsman <http://feh.holsman.net/>
Kieran Holland <http://www.kieranholland.com>
Robert Rock Howard <http://djangomojo.com/>
View
7 django/core/db/backends/mysql.py
@@ -65,9 +65,12 @@ def cursor(self):
if DATABASE_PORT:
kwargs['port'] = DATABASE_PORT
self.connection = Database.connect(**kwargs)
+ cursor = self.connection.cursor()
+ if self.connection.get_server_info() >= '4.1':
+ cursor.execute("SET NAMES utf8")
if DEBUG:
- return base.CursorDebugWrapper(MysqlDebugWrapper(self.connection.cursor()), self)
- return self.connection.cursor()
+ return base.CursorDebugWrapper(MysqlDebugWrapper(cursor), self)
+ return cursor
def commit(self):
self.connection.commit()
Please sign in to comment.
Something went wrong with that request. Please try again.