Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions
--- a/mcs/class/referencesource/System.Data/System/Data/SqlClient/TdsEnums.cs
+++ b/mcs/class/referencesource/System.Data/System/Data/SqlClient/TdsEnums.cs
@@ -544,6 +544,9 @@ namespace System.Data.SqlClient {
        public const int IMPERSONATION_FAILED = 1346;
        public const int P_TOKENTOOLONG = 103;

+        // SQL error that indicates retry for Always Encrypted
+        public const int TCE_CONVERSION_ERROR_CLIENT_RETRY = 33514;
+
        // SNI\Win32 error values
        // NOTE: these are simply windows system error codes, not SNI specific
        public const uint  SNI_UNINITIALIZED        = unchecked((uint)-1);