Connector/NET commit: r1157 - in branches/5.1: . Driver/Source

[rburnett]

Modified:
   branches/5.1/CHANGES
   branches/5.1/Driver/Source/Connection.cs
Log:
  - Fixed code to yeild better exception when using different connection strings in a single transaction (bug #34204)   

We will fix the code later to handle multiple connections inside a single transaction

Modified: branches/5.1/CHANGES
===================================================================
--- branches/5.1/CHANGES	2008-01-31 21:30:36 UTC (rev 1156)
+++ branches/5.1/CHANGES	2008-02-01 18:25:55 UTC (rev 1157)
@@ -7,6 +7,7 @@
     showing Open (bug #34082)   
   - Incorporated some connection string cache optimizations sent to us by Maxim Mass (bug #34000)
   - Fixed problem with opening a connection that was previously closed by sudden server disconnection (bug #33909)   
+  - Fixed code to yeild better exception when using different connection strings in a single transaction (bug #34204)   
    
 Version 5.1.4 - 11/12/2007
   - Fixed issue where column name metadata was not using the charset given on the connection string

Modified: branches/5.1/Driver/Source/Connection.cs
===================================================================
--- branches/5.1/Driver/Source/Connection.cs	2008-01-31 21:30:36 UTC (rev 1156)
+++ branches/5.1/Driver/Source/Connection.cs	2008-02-01 18:25:55 UTC (rev 1157)
@@ -440,7 +440,9 @@
                 if (settings.AutoEnlist && Transaction.Current != null)
                 {
                     driver = DriverTransactionManager.GetDriverInTransaction(Transaction.Current);
-                    if (driver != null && driver.IsInActiveUse)
+                    if (driver != null &&
+                        (driver.IsInActiveUse ||
+                        !driver.Settings.EquivalentTo(this.Settings)))
                         throw new NotSupportedException(Resources.MultipleConnectionsInTransactionNotSupported);
                 }
 #endif