Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed issue not checking for DONE token errors properly so exceptions are ignored (backport of 1857, 1943, 1989 to 10.2.2) #1990

Merged
merged 4 commits into from
Dec 7, 2022

Conversation

lilgreenbird
Copy link
Contributor

backport of #1857 #1943 and #1989

@lilgreenbird lilgreenbird added this to the 10.2.2 milestone Dec 6, 2022
@lilgreenbird lilgreenbird changed the title Fixed issue not checking for DONE token errors when (backport of 1857, 1943, 1989 to 10.2.2) Fixed issue not checking for DONE token errors properly so exceptions are ignored (backport of 1857, 1943, 1989 to 10.2.2) Dec 6, 2022
@tkyc
Copy link
Member

tkyc commented Dec 6, 2022

Just double checking, the descriptions says "backporting #1989", that's a typo right? I don't think we need to backport 1989 since the ICR issue it fixes isn't in 10.2.1 (plus I didn't notice any code changes in this PR from 1989).

@@ -502,6 +502,7 @@ protected Object[][] getContents() {
{"R_crClientSSLStateNotRecoverable", "The server did not preserve SSL encryption during a recovery attempt, connection recovery is not possible."},
{"R_crCommandCannotTimeOut", "Request failed to time out and SQLServerConnection does not exist"},
{"R_UnableLoadAuthDll", "Unable to load authentication DLL {0}"},
};
{"R_serverError", "An error occurred during the current command (Done status {0}). {1}"},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reminder to copy over localizations from main to the servicing branch in the VSO repo.

@lilgreenbird lilgreenbird merged commit 0fb2f32 into v10.2-servicing Dec 7, 2022
@lilgreenbird lilgreenbird deleted the 10.2.2-1857 branch December 21, 2022 22:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants