Django

Code

Changeset 1879

Show
Ignore:
Timestamp:
01/08/06 19:57:26 (3 years ago)
Author:
adrian
Message:

magic-removal: Merged to [1878]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/magic-removal/AUTHORS

    r1873 r1879  
    5353    Gustavo Picon 
    5454    Brant Harris 
     55    hipertracker@gmail.com 
    5556    Ian Holsman <http://feh.holsman.net/> 
    5657    Kieran Holland <http://www.kieranholland.com> 
  • django/branches/magic-removal/django/db/backends/mysql/base.py

    r1757 r1879  
    6565                kwargs['port'] = DATABASE_PORT 
    6666            self.connection = Database.connect(**kwargs) 
     67        cursor = self.connection.cursor() 
     68        if self.connection.get_server_info() >= '4.1': 
     69            cursor.execute("SET NAMES utf8") 
    6770        if DEBUG: 
    68             return util.CursorDebugWrapper(MysqlDebugWrapper(self.connection.cursor()), self) 
    69         return self.connection.cursor() 
     71            return base.CursorDebugWrapper(MysqlDebugWrapper(cursor), self) 
     72        return cursor 
    7073 
    7174    def commit(self):