Connector/NET commit: r152 - branches/1.0/mysqlclient

[rburnett]

Modified:
   branches/1.0/mysqlclient/datareader.cs
Log:


Modified: branches/1.0/mysqlclient/datareader.cs
===================================================================
--- branches/1.0/mysqlclient/datareader.cs	2005-08-19 20:56:48 UTC (rev 151)
+++ branches/1.0/mysqlclient/datareader.cs	2005-08-19 21:20:03 UTC (rev 152)
@@ -683,12 +683,12 @@
 				fields = currentResult.Fields;
 				return true;
 			}
-			catch (MySqlException ex) 
+			catch (Exception ex) 
 			{
-				if (ex.IsFatal) 
+				if (ex is MySqlException && !(ex as MySqlException).IsFatal)
+					connection.SetState( ConnectionState.Open );
+				else
 					connection.Terminate();
-				else
-					connection.SetState( ConnectionState.Open );
 				throw;
 			}
 			finally