Conflict merge between trunk/local tree

svn path=/trunk/mcs/; revision=139072

diff --git a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
index 102c680008ab5b47a5da3e898e9710673e165911..a6154c1a2430a9e0dcda3db217342691de4f592d 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
+++ b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
@@ -23,6 +23,11 @@
        * SqlParameter.cs (get/set_SqlValue, GetSqlValue): Return the appropriately 
        SQL-typed param value.  Fixes failing provider tests.
        
+2009-07-28  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * SqlCommand.cs: Ensure connection is closed if CloseConnection
+       behavior is set, and reader could not be created.
+       
 2009-07-26  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * SqlParameter.cs: Improved support for SqlValue and SqlTypes.