p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

magic-removal: Merged to [1878] 

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-01-09 01:57:26 +00:00
parent 8b1662a185
commit e9a13940d3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -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/>

7
django/db/backends/mysql/base.py
View File

@ -64,9 +64,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 util.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()