Ticket #463: mysql_trunk_rev2360.diff

django/core/db/backends/mysql.py

@@ -10 +10 @@
 from MySQLdb.converters import conversions
 from MySQLdb.constants import FIELD_TYPE
 import types
+import threading
 
 DatabaseError = Database.DatabaseError
 
@@ -49 +50 @@
 
 class DatabaseWrapper:
     def __init__(self):
-        self.connection = None
+        self.threadlocal = threading.local()
         self.queries = []
 
     def cursor(self):
         from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PORT, DATABASE_PASSWORD, DEBUG
-        if self.connection is None:
+        conn = getattr(self.threadlocal, 'connection', None)
+        if conn is None:
             kwargs = {
                 'user': DATABASE_USER,
                 'db': DATABASE_NAME,
@@ -64 +66 @@
             }
             if DATABASE_PORT:
                 kwargs['port'] = DATABASE_PORT
-            self.connection = Database.connect(**kwargs)
-        cursor = self.connection.cursor()
-        if self.connection.get_server_info() >= '4.1':
+            conn = self.threadlocal.connection = Database.connect(**kwargs)
+        else:
+            conn.ping()
+        cursor = conn.cursor()
+        if conn.get_server_info() >= '4.1':
             cursor.execute("SET NAMES utf8")
         if DEBUG:
             return base.CursorDebugWrapper(MysqlDebugWrapper(cursor), self)
         return cursor
 
     def commit(self):
-        self.connection.commit()
+        conn = getattr(self.threadlocal, 'connection', None)
+        if conn is not None:
+            conn.commit()
 
     def rollback(self):
-        if self.connection:
+        conn = getattr(self.threadlocal, 'connection', None)
+        if conn is not None:
             try:
-                self.connection.rollback()
+                conn.rollback()
             except Database.NotSupportedError:
                 pass
 
     def close(self):
-        if self.connection is not None:
-            self.connection.close()
-            self.connection = None
+        conn = getattr(self.threadlocal, 'connection', None)
+        if conn is not None:
+            conn.close()
+            self.threadlocal.connection = None
 
     def quote_name(self, name):
         if name.startswith("`") and name.endswith("`"):