SpamExperts
diff --git a/‎MySQLdb/connections.py
Copy file name to clipboardExpand all lines: MySQLdb/connections.py
+2Lines changed: 2 additions & 0 deletions b/‎MySQLdb/connections.py
Copy file name to clipboardExpand all lines: MySQLdb/connections.py
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎MySQLdb/cursors.py
Copy file name to clipboardExpand all lines: MySQLdb/cursors.py
+2-4Lines changed: 2 additions & 4 deletions b/‎MySQLdb/cursors.py
Copy file name to clipboardExpand all lines: MySQLdb/cursors.py
+2-4Lines changed: 2 additions & 4 deletions
diff --git a/‎tests/test_MySQLdb_capabilities.py
Copy file name to clipboardExpand all lines: tests/test_MySQLdb_capabilities.py
+10-1Lines changed: 10 additions & 1 deletion b/‎tests/test_MySQLdb_capabilities.py
Copy file name to clipboardExpand all lines: tests/test_MySQLdb_capabilities.py
+10-1Lines changed: 10 additions & 1 deletion
@@ -34,6 +34,8 @@ def defaulterrorhandler(connection, cursor, errorclass, errorvalue):
         connection.messages.append(error)
     del cursor
     del connection
+    if isinstance(errorvalue, BaseException):
+        raise errorvalue
     if errorclass is not None:    
         raise errorclass(errorvalue)
     else:
 
@@ -214,8 +214,7 @@ def execute(self, query, args=None):
         except (SystemExit, KeyboardInterrupt):
             raise
         except:
-            exc, value, tb = sys.exc_info()
-            del tb
+            exc, value = sys.exc_info()[:2]
             self.messages.append((exc, value))
             self.errorhandler(self, exc, value)
         self._executed = query
@@ -273,8 +272,7 @@ def executemany(self, query, args):
         except (SystemExit, KeyboardInterrupt):
             raise
         except:
-            exc, value, tb = sys.exc_info()
-            del tb
+            exc, value = sys.exc_info()[:2]
             self.errorhandler(self, exc, value)
         qs = '\n'.join([query[:p], ',\n'.join(q), query[e:]])
         if not PY2:
 
@@ -92,7 +92,16 @@ def test_bug_3514287(self):
 
     def test_ping(self):
         self.connection.ping()
-        
+
+    def test_reraise_exception(self):
+        c = self.cursor
+        try:
+            c.execute("SELECT x FROM not_existing_table")
+        except MySQLdb.ProgrammingError as e:
+            self.assertEqual(e.args[0], 1146)
+            return
+        self.fail("Should raise ProgrammingError")
+
 
 if __name__ == '__main__':
     if test_MySQLdb.leak_test: