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

log: let Write Conflict error message respect redact setting (#43486) #43489

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #43486

What problem does this PR solve?

Issue Number: close #43485

Problem Summary:

What is changed and how it works?

Inherit redact positions from original error types.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

Signed-off-by: ekexium <eke@fastmail.com>
@ti-chi-bot
Copy link

ti-chi-bot bot commented Apr 28, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • cfzjywxk
  • zyguan

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 28, 2023
@ti-chi-bot ti-chi-bot added the type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. label Apr 28, 2023
@ekexium ekexium requested review from cfzjywxk and MyonKeminta April 28, 2023 07:10
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 29, 2023
@ekexium
Copy link
Contributor

ekexium commented May 4, 2023

/retest

@ekexium ekexium requested a review from zyguan May 5, 2023 10:35
@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 6, 2023
@cfzjywxk
Copy link
Contributor

cfzjywxk commented May 6, 2023

/merge

@ti-chi-bot
Copy link

ti-chi-bot bot commented May 6, 2023

This pull request has been accepted and is ready to merge.

Commit hash: ee8219e

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label May 6, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels May 6, 2023
@ti-chi-bot ti-chi-bot bot merged commit 3fa4fb9 into pingcap:release-6.5 May 6, 2023
@ti-chi-bot ti-chi-bot removed the cherry-pick-approved Cherry pick PR approved by release team. label Jun 14, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jun 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants