From 1eb8ff5fa33a869da7cb72cdad5e58a80d3e7f39 Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Thu, 19 Mar 2015 22:17:27 +0800 Subject: [PATCH] Add MONO_PARTIAL_DATA_IMPORT. It is to make it possible to import everything but SqlClient and co. --- .../System.Data/System/Data/Common/AdapterUtil.cs | 2 +- .../System/Data/ProviderBase/DbConnectionInternal.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs b/mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs index bdd182d7442..d234cf5af79 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs @@ -1888,7 +1888,7 @@ namespace System.Data.Common { } static internal bool NeedManualEnlistment() { -#if !MOBILE +#if !MOBILE && !MONO_PARTIAL_DATA_IMPORT // We need to force a manual enlistment of transactions for ODBC and // OLEDB whenever the current SysTx transaction != the SysTx transaction // on the EnterpriseServices ContextUtil, or when ES.ContextUtil is diff --git a/mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionInternal.cs b/mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionInternal.cs index 96a6729dd25..b55df0aecd2 100644 --- a/mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionInternal.cs +++ b/mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionInternal.cs @@ -467,6 +467,9 @@ namespace System.Data.ProviderBase { SetInStasis(); } else { +#if MONO_PARTIAL_DATA_IMPORT + Dispose(); +#else #if !MOBILE PerformanceCounters.NumberOfNonPooledConnections.Decrement(); #endif @@ -474,6 +477,7 @@ namespace System.Data.ProviderBase { { Dispose(); } +#endif } } } -- 2.25.1