Ticket #473: mysql.diff

in djangoe/core/db/backends/mysql.py:
@@ -21,6 +21,34 @@
     FIELD_TYPE.TIME: typecasts.typecast_time,
 })
 
+#TODO(lambert): merge with latest django code when it comes out
+class MysqlDebugWrapper:
+    def __init__(self, cursor):
+        self.cursor = cursor
+
+    def execute(self, sql, params=[]):
+        try:
+            result = self.cursor.execute(sql, params)
+        except Database.Warning, w:
+            self.cursor.execute("show warnings")
+            raise Database.Warning, "%s: %s" % (w,self.cursor.fetchall())
+        return result
+
+    def executemany(self, sql, param_list):
+        try:
+            result = self.cursor.executemany(sql, param_list)
+        except Database.Warning:
+            self.cursor.execute("show warnings")
+            raise Database.Warning, "%s: %s" % (w,self.cursor.fetchall())
+        return result
+
+    def __getattr__(self, attr):
+        if self.__dict__.has_key(attr):
+            return self.__dict__[attr]
+        else:
+            return getattr(self.cursor, attr)
+
+
 class DatabaseWrapper:
     def __init__(self):
         self.connection = None
@@ -32,7 +60,8 @@
             self.connection = Database.connect(user=DATABASE_USER, db=DATABASE_NAME,
                 passwd=DATABASE_PASSWORD, host=DATABASE_HOST, conv=django_conversions)
         if DEBUG:
-            return base.CursorDebugWrapper(self.connection.cursor(), self)
+            #TODO(lambert): merge with latest django code when it comes out
+            return base.CursorDebugWrapper(MysqlDebugWrapper(self.connection.cursor()), self)
         return self.connection.cursor()
 
     def commit(self):