Connector/NET commit: r1059 - in branches/1.0: . mysqlclient

[rburnett]

Modified:
   branches/1.0/CHANGES
   branches/1.0/mysqlclient/datareader.cs
Log:
Removed code that set the Fetching state so that running a query from the state change handler would work in the case that the new state is open  

Modified: branches/1.0/CHANGES
===================================================================
--- branches/1.0/CHANGES	2007-11-02 22:24:38 UTC (rev 1058)
+++ branches/1.0/CHANGES	2007-11-05 14:59:02 UTC (rev 1059)
@@ -6,6 +6,8 @@
     (Bug #31090)
   - Fixed problem that prevented commands from being executed from the state change
     handler.  Not sure why you would want to do this but...  (bug #30964)
+  - Removed code that set the Fetching state so that running a query from the state
+    change handler would work in the case that the new state is open        
         
 Version 1.0.10
     Bugs

Modified: branches/1.0/mysqlclient/datareader.cs
===================================================================
--- branches/1.0/mysqlclient/datareader.cs	2007-11-02 22:24:38 UTC (rev 1058)
+++ branches/1.0/mysqlclient/datareader.cs	2007-11-05 14:59:02 UTC (rev 1059)
@@ -674,11 +674,6 @@
 
 				schemaTable = null;
 
-				// When executing query statements, the result byte that is returned
-				// from MySql is the column count.  That is why we reference the LastResult
-				// property here to dimension our field array
-				connection.SetState(ConnectionState.Fetching, true);
-
 				// load in our field defs and set our internal variables so we know
 				// what we can do (canRead, hasRows)
 				canRead = hasRows = currentResult.Load();
@@ -712,8 +707,6 @@
 			if (!canRead) return false;
 			readCount++;
 
-			connection.SetState(ConnectionState.Fetching, true);
-
 			try
 			{
 				try
@@ -741,10 +734,6 @@
 				System.Diagnostics.Trace.WriteLine("MySql error: " + ex.Message);
 				throw;
 			}
-			finally
-			{
-				connection.SetState(ConnectionState.Open, true);
-			}
 			return true;
 		}