Ticket #2810: mysql-encoding.diff

django/conf/global_settings.py

@@ -99 +99 @@
 DATABASE_PASSWORD = ''         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
 DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
+DATABASE_ENCODING = 'utf8'     # for MySQL >= 4.1
 
 # Host for sending e-mail.
 EMAIL_HOST = 'localhost'

django/db/backends/mysql/base.py

@@ -61 +61 @@
     def __init__(self):
         self.connection = None
         self.queries = []
+        from django.conf import settings
+        self.encoding = settings.DATABASE_ENCODING    
 
     def _valid_connection(self):
         if self.connection is not None:
@@ -90 +92 @@
             self.connection = Database.connect(**kwargs)
         cursor = self.connection.cursor()
         if self.connection.get_server_info() >= '4.1':
-            cursor.execute("SET NAMES 'utf8'")
+            cursor.execute("SET NAMES '%s'" % self.encoding)
         if settings.DEBUG:
             return util.CursorDebugWrapper(MysqlDebugWrapper(cursor), self)
         return cursor