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

*: update pingcap/errors version (#51854) #53526

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #51854

What problem does this PR solve?

Issue Number: close #53517

Problem Summary:

What changed and how does it work?

update version to add this fix HasStack return true on empty stack to allow upper layer add stack again

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    only changed pkg/util/misc.go, existing cases should be enough to cover it

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: ti-chi-bot <ti-community-prow-bot@tidb.io>
Copy link
Contributor

@D3Hunter D3Hunter left a comment

Choose a reason for hiding this comment

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

rest lgtm

@@ -2087,7 +2087,7 @@ var defaultSysVars = []*SysVar{
}},
{Scope: ScopeGlobal | ScopeSession, Name: TiDBRedactLog, Value: BoolToOnOff(DefTiDBRedactLog), Type: TypeBool, SetSession: func(s *SessionVars, val string) error {
s.EnableRedactLog = TiDBOptOn(val)
errors.RedactLogEnabled.Store(s.EnableRedactLog)
errors.RedactLogEnabled.Store(val)
Copy link
Contributor

Choose a reason for hiding this comment

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

current master don't call TiDBOptOn, which doesn't support MARKER, see

s.EnableRedactLog = val
errors.RedactLogEnabled.Store(val)

Copy link
Contributor

Choose a reason for hiding this comment

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

This PR is not cherry-pick back to the release-7.5 branch, so still use TIDBOptOn

Copy link

ti-chi-bot bot commented May 24, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-05-24 06:46:45.062718945 +0000 UTC m=+2413358.819854519: ☑️ agreed by D3Hunter.
  • 2024-05-24 06:50:46.817624344 +0000 UTC m=+2413600.574759918: ☑️ agreed by xhebox.

Copy link

@yudongusa yudongusa left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

ti-chi-bot bot commented May 24, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: D3Hunter, xhebox, yudongusa, YuJuncen

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the approved label May 24, 2024
Copy link

codecov bot commented May 24, 2024

Codecov Report

Attention: Patch coverage is 92.30769% with 1 lines in your changes are missing coverage. Please review.

Please upload report for BASE (release-7.5@b11eb48). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-7.5     #53526   +/-   ##
================================================
  Coverage               ?   72.0442%           
================================================
  Files                  ?       1411           
  Lines                  ?     410274           
  Branches               ?          0           
================================================
  Hits                   ?     295579           
  Misses                 ?      94861           
  Partials               ?      19834           
Flag Coverage Δ
unit 72.0442% <92.3076%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 53.9913% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 53.3990% <0.0000%> (?)

@ti-chi-bot ti-chi-bot bot merged commit 3841026 into pingcap:release-7.5 May 24, 2024
29 of 30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm ok-to-test release-note-none size/M Denotes a PR that changes 30-99 lines, ignoring generated files. skip-issue-check type/cherry-pick-for-release-7.5
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants