merge -r60979:60980

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

diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/ChangeLog b/mcs/class/System.Data/System.Data.OleDb.jvm/ChangeLog
index a719d80f25bda958358120b0b9238fd5216f5238..c624a90ee7a41203509ed8133d767927db522a61 100644 (file)
--- a/mcs/class/System.Data/System.Data.OleDb.jvm/ChangeLog
+++ b/mcs/class/System.Data/System.Data.OleDb.jvm/ChangeLog
@@ -1,3 +1,6 @@
+2006-05-23 Boris Kirzner <borisk@mainsoft.com>
+       * OleDbConnection.cs: add MonoTODO to GetOleDbSchemaTable.
+
 2006-05-09  Konstantin Triger <kostat@mainsoft.com>
 
        * OleDbConnection.cs: fix GetOleDbSchemaTable for OleDbSchemaGuid.Tables.

diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs
index 48f764306fbf863fcbbc169fc0154389fcac0e7b..757b3bd417cf985537d93f60debaea1c79057355 100644 (file)
--- a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs
+++ b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs
@@ -142,6 +142,7 @@ namespace System.Data.OleDb
                        return new OleDbException(message, null, this); \r
                }\r
 \r
+               [MonoTODO]\r
                public DataTable GetOleDbSchemaTable (Guid schema, object[] restrictions)\r
                {\r
                        if (State != ConnectionState.Open)\r