Connector/NET commit: r351 - in trunk: . TestSuite mysqlclient

[rburnett]

Modified:
   trunk/CHANGES
   trunk/TestSuite/CommandTests.cs
   trunk/mysqlclient/Connection.cs
Log:
Bug #7248  There is already an open DataReader associated with this Connection which must closed first.
This bug was already fixed but we are adding a test case for it.

Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2006-09-19 19:33:49 UTC (rev 350)
+++ trunk/CHANGES	2006-09-19 21:42:59 UTC (rev 351)
@@ -71,6 +71,7 @@
     Bug #17736 Selecting a row with with empty date '0000-00-00' results in Read() hanging. [fixed]
 	Bug #20581 Null Reference Exception when closing reader after stored procedure. 
 	Bug #16884 Invalid DateTime Values from DataReader     
+	Bug #7248  There is already an open DataReader associated with this Connection which must 
     
 Version 1.0.7
 

Modified: trunk/TestSuite/CommandTests.cs
===================================================================
--- trunk/TestSuite/CommandTests.cs	2006-09-19 19:33:49 UTC (rev 350)
+++ trunk/TestSuite/CommandTests.cs	2006-09-19 21:42:59 UTC (rev 351)
@@ -462,6 +462,23 @@
             }
         }
 
+        /// <summary>
+        /// Bug #7248 There is already an open DataReader associated with this Connection which must 
+        /// </summary>
+        [Test]
+        public void GenWarnings()
+        {
+            execSQL("DROP TABLE IF EXISTS test");
+            execSQL("CREATE TABLE test (id INT, dt DATETIME)");
+            execSQL("INSERT INTO test VALUES (1, NOW())");
+            execSQL("INSERT INTO test VALUES (2, NOW())");
+            execSQL("INSERT INTO test VALUES (3, NOW())");
+
+            MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test WHERE dt = '" +
+                DateTime.Now + "'", conn);
+            DataSet ds = new DataSet();
+            da.Fill(ds);
+        }
 	}
 
 

Modified: trunk/mysqlclient/Connection.cs
===================================================================
--- trunk/mysqlclient/Connection.cs	2006-09-19 19:33:49 UTC (rev 350)
+++ trunk/mysqlclient/Connection.cs	2006-09-19 21:42:59 UTC (rev 351)
@@ -60,8 +60,6 @@
 		/// <include file='docs/MySqlConnection.xml' path='docs/DefaultCtor/*'/>
 		public MySqlConnection()
 		{
-            System.Diagnostics.Trace.Listeners.Add(
-                new TextWriterTraceListener("c:\\output.log"));
 			//TODO: add event data to StateChange docs
 			settings = new MySqlConnectionStringBuilder();
 			advisor = new UsageAdvisor(this);