Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -254,7 +254,7 @@ namespace System.Data.SqlClient
set { statisticsEnabled = value; }
}
protected internal override DbProviderFactory DbProviderFactory {
protected override DbProviderFactory DbProviderFactory {
get {
return SqlClientFactory.Instance;
}
@@ -419,7 +419,10 @@ namespace System.Data.SqlClient
private SqlInfoMessageEventArgs CreateSqlInfoMessageEvent (TdsInternalErrorCollection errors)
{
return new SqlInfoMessageEventArgs (errors);
foreach (TdsInternalError e in errors)
return new SqlInfoMessageEventArgs (new SqlException (e.Class, e.LineNumber, e.Message, e.Number, e.Procedure, e.Server, "Mono SqlClient Data Provider", e.State));
return null;
}
private StateChangeEventArgs CreateStateChangeEvent (ConnectionState originalState, ConnectionState currentState)