magic-removal: Merged to [1878]

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1879 bcc190cf-cafb-0310-a4f2-bffc1f526a37

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

django/db/backends/mysql/base.py

@@ -64,9 +64,12 @@ class DatabaseWrapper:
             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 util.CursorDebugWrapper(MysqlDebugWrapper(self.connection.cursor()), self)
-        return self.connection.cursor()
+            return base.CursorDebugWrapper(MysqlDebugWrapper(cursor), self)
+        return cursor
 
     def commit(self):
         self.connection.commit()