Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -179,6 +179,10 @@ namespace System.Data.SqlClient {
"exec sp_tablecollations_90 '" +
DestinationTableName + "'",
connection);
if (externalTransaction != null)
cmd.Transaction = externalTransaction;
SqlDataReader reader = cmd.ExecuteReader ();
int i = 0; // Skipping 1st result
do {
@@ -187,7 +191,7 @@ namespace System.Data.SqlClient {
} else if (i == 2) {
SqlDataAdapter adapter = new SqlDataAdapter ();
adapter.MissingSchemaAction = MissingSchemaAction.AddWithKey;
columnMetaDataTables [i - 1] = new DataTable ();
columnMetaDataTables [i - 1] = new DataTable (DestinationTableName);
adapter.FillInternal (columnMetaDataTables [i - 1], reader);
}
i++;