Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b

mcs/class/referencesource/System.Data/System/Data/CodeGen/datacache.cs

@@ -682,7 +682,7 @@ namespace System.Data {
                     //\\ this.Prefix = "<Prefix>";
                     tableInitClass.Statements.Add(Assign(Property(This(), "Prefix"), Str(table.Prefix)));
                 }
-                if (table.tableNamespace != null) {
+                if (table._tableNamespace != null) {
                     //\\ this.Namespace = <Namespace>;
                     tableInitClass.Statements.Add(Assign(Property(This(), "Namespace"), Str(table.Namespace)));
                 }
@@ -691,7 +691,7 @@ namespace System.Data {
                     //\\ this.MinimumCapacity = <MinimumCapacity>;
                     tableInitClass.Statements.Add(Assign(Property(This(), "MinimumCapacity"), Primitive(table.MinimumCapacity)));
                 }
-                if (table.displayExpression != null) {
+                if (table._displayExpression != null) {
                     //\\ this.DisplayExpression = "<DisplayExpression>";
                     tableInitClass.Statements.Add(Assign(Property(This(), "DisplayExpression"), Str(table.DisplayExpressionInternal)));
                 }

mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs.REMOVED.git-id

@@ -1 +1 @@
-662c1c9130d8b675f4109598e703ac7e2a22bf93
+1e5ea43e2710b9e2f6698d8b679b66e4c28040a4

mcs/class/referencesource/System.Data/System/Data/Common/DBDataPermissionAttribute.cs

@@ -90,14 +90,4 @@ namespace System.Data.Common {
             return (null != _restrictions);
         }
     }
-}
-
-namespace System.Data { // MDAC 83087
-
-[Serializable] 
-    
-    public enum KeyRestrictionBehavior { // V1.0.5000
-        AllowOnly    = 0,
-        PreventUsage = 1,
-    }
-}
+}

mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SqlXmlStorage.cs

@@ -45,7 +45,7 @@ namespace System.Data.Common {
             catch (OverflowException) {
                 throw ExprException.Overflow(typeof(SqlXml));
             }
-            throw ExceptionBuilder.AggregateException(kind, DataType);
+            throw ExceptionBuilder.AggregateException(kind, _dataType);
         }
 
         override public int Compare(int recordNo1, int recordNo2) {

mcs/class/referencesource/System.Data/System/Data/DataColumn.cs

@@ -669,7 +669,7 @@ namespace System.Data {
                 Debug.Assert(defaultValue != null, "It should not have been set to null.");
                 if (defaultValue == DBNull.Value && this.implementsINullable) { // for perf I dont access property
                     if (_storage != null)
-                        defaultValue = _storage.NullValue;
+                        defaultValue = _storage._nullValue;
                     else if (this.isSqlType)
                             defaultValue = SqlConvert.ChangeTypeForDefaultValue(defaultValue, this.dataType, FormatProvider);
                     else if (this.implementsINullable) {
@@ -885,21 +885,21 @@ namespace System.Data {
         internal bool IsCloneable {
             get {
                 Debug.Assert(null != _storage, "no storage");
-                return _storage.IsCloneable;
+                return _storage._isCloneable;
             }
         }
 
         internal bool IsStringType {
             get {
                 Debug.Assert(null != _storage, "no storage");
-                return _storage.IsStringType;
+                return _storage._isStringType;
             }
         }
 
         internal bool IsValueType {
             get {
                 Debug.Assert(null != _storage, "no storage");
-                return _storage.IsValueType;
+                return _storage._isValueType;
             }
         }
 
@@ -1204,7 +1204,7 @@ namespace System.Data {
 
         internal void FreeRecord(int record) {
             Debug.Assert(null != _storage, "no storage");
-            _storage.Set(record, _storage.NullValue);
+            _storage.Set(record, _storage._nullValue);
         }
 
         /// <devdoc>
@@ -1395,7 +1395,7 @@ namespace System.Data {
                 return;
 
             if (sortIndex != null) {
-                if (sortIndex.IsKeyInIndex(_storage.NullValue)) {// here we do use strong typed NULL for Sql types
+                if (sortIndex.IsKeyInIndex(_storage._nullValue)) {// here we do use strong typed NULL for Sql types
                     throw ExceptionBuilder.NullKeyValues(ColumnName);
                 }
             }
@@ -1573,7 +1573,7 @@ namespace System.Data {
         internal bool IsCustomType {
             get {
                 if (null != _storage)
-                    return _storage.IsCustomDefinedType;
+                    return _storage._isCustomDefinedType;
                 return DataStorage.IsTypeCustomType(DataType);
             }
         }

mcs/class/referencesource/System.Data/System/Data/DataSet.cs.REMOVED.git-id

@@ -1 +1 @@
-44d81f07e1ef51520c0677f750ff35d1e6774efc
+d3f0497f22ebc3cc6a5a3e29b03c2f3166eb4b4b

mcs/class/referencesource/System.Data/System/Data/Sql/SqlDataSourceEnumerator.cs

@@ -40,6 +40,7 @@ namespace System.Data.Sql {
 
         override public DataTable GetDataSources() {
 #if MONO
+            timeoutTime = 0;
             throw new NotImplementedException ();
 #else
             (new NamedPermissionSet("FullTrust")).Demand(); // SQLBUDT 244304

mcs/class/referencesource/System.Data/System/Data/XMLSchema.cs.REMOVED.git-id

@@ -1 +1 @@
-6020f65eabe156245bed7a79e0b8470ba59bb710
+ae76cafbcecdede54096168ae86fe4c0cfa0f4d2