Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

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

View File

@@ -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,
}
}
}

View File

@@ -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) {