Kaydet (Commit) 11bcc796 authored tarafından Adrian Holovaty's avatar Adrian Holovaty

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

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
üst 9f0deae2
...@@ -52,6 +52,7 @@ answer newbie questions, and generally made Django that much better: ...@@ -52,6 +52,7 @@ answer newbie questions, and generally made Django that much better:
Espen Grindhaug <http://grindhaug.org/> Espen Grindhaug <http://grindhaug.org/>
Gustavo Picon Gustavo Picon
Brant Harris Brant Harris
hipertracker@gmail.com
Ian Holsman <http://feh.holsman.net/> Ian Holsman <http://feh.holsman.net/>
Kieran Holland <http://www.kieranholland.com> Kieran Holland <http://www.kieranholland.com>
Robert Rock Howard <http://djangomojo.com/> Robert Rock Howard <http://djangomojo.com/>
......
...@@ -65,9 +65,12 @@ class DatabaseWrapper: ...@@ -65,9 +65,12 @@ class DatabaseWrapper:
if DATABASE_PORT: if DATABASE_PORT:
kwargs['port'] = DATABASE_PORT kwargs['port'] = DATABASE_PORT
self.connection = Database.connect(**kwargs) self.connection = Database.connect(**kwargs)
cursor = self.connection.cursor()
if self.connection.get_server_info() >= '4.1':
cursor.execute("SET NAMES utf8")
if DEBUG: if DEBUG:
return base.CursorDebugWrapper(MysqlDebugWrapper(self.connection.cursor()), self) return base.CursorDebugWrapper(MysqlDebugWrapper(cursor), self)
return self.connection.cursor() return cursor
def commit(self): def commit(self):
self.connection.commit() self.connection.commit()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment