Ticket #1528: mysql_base_encoding.diff

django/conf/global_settings.py

@@ -83 +83 @@
 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_CHARSET = 'utf8'      # Used with MySQL 4.1.x and higher
 
 # Host for sending e-mail.
 EMAIL_HOST = 'localhost'

django/core/db/backends/mysql.py

@@ -53 +53 @@
         self.queries = []
 
     def cursor(self):
-        from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PORT, DATABASE_PASSWORD, DEBUG
+        from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PORT, DATABASE_PASSWORD, DATABASE_CHARSET, DEBUG
         if self.connection is None:
             kwargs = {
                 'user': DATABASE_USER,
@@ -67 +67 @@
             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" % DATABASE_CHARSET)
         if DEBUG:
             return base.CursorDebugWrapper(MysqlDebugWrapper(cursor), self)
         return cursor