Connector/NET commit: r731 - trunk/Driver/Source

[rburnett]

Modified:
   trunk/Driver/Source/Connection.cs
Log:
Connection.cs - only do a rollback on close if the connection is pooled


Modified: trunk/Driver/Source/Connection.cs
===================================================================
--- trunk/Driver/Source/Connection.cs	2007-05-22 12:20:57 UTC (rev 730)
+++ trunk/Driver/Source/Connection.cs	2007-05-23 15:19:42 UTC (rev 731)
@@ -509,14 +509,17 @@
             if (dataReader != null)
                 dataReader.Close();
 
-            if ((driver.ServerStatus & ServerStatusFlags.InTransaction) != 0)
+            if (settings.Pooling)
             {
-                MySqlTransaction t = new MySqlTransaction(this, IsolationLevel.Unspecified);
-                t.Rollback();
-            }
+                // if we are in a transaction, roll it back
+                if ((driver.ServerStatus & ServerStatusFlags.InTransaction) != 0)
+                {
+                    MySqlTransaction t = new MySqlTransaction(this, IsolationLevel.Unspecified);
+                    t.Rollback();
+                }
 
-            if (settings.Pooling)
                 MySqlPoolManager.ReleaseConnection(driver);
+            }
             else
                 driver.Close();