Repository navigation
test: stabilize flaky TestCancelVariousJobs and TestExchangePartitionMultiTable (release-6.5-20260928-v6.5.4) - #71664
Merged
ti-chi-bot[bot] merged 2 commits intoSep 29, 2026
Conversation
close pingcap#71398 (cherry picked from commit 883ce9a) Conflicts resolved for this release branch: - This branch predates the pkg/ source layout; the changes were applied to the equivalent files planner/core/planbuilder.go and planner/core/preprocess.go (not pkg/planner/core/...). - planner/core uses the package-local ErrTableaccessDenied (no plannererrors alias here); the test file uses core.ErrTableaccessDenied and errno.ErrTableaccessDenied. Behaviour and tests are preserved. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> (cherry picked from commit d289d6f)
close pingcap#71400 (cherry picked from commit 90ecf49) Conflicts resolved for this release branch: - This branch predates the pkg/ source layout; changes were applied to the equivalent files ddl/ddl_api.go and planner/core/planbuilder.go (not pkg/ddl/... or pkg/planner/core/...). - pkg/ddl/executor.go does not exist here; ExchangeTablePartition lives in ddl/ddl_api.go, so the system-table guard was applied there instead. - The upstream guard used metadef.IsReservedID(id) with dbterror.ErrForbiddenDDL, neither of which exists here; substituted util.IsMemOrSysDB and dbterror.ErrGeneralUnsupportedDDL, preserving the error message. - The getLowerDB helper is absent; its equivalent (the lowercased new-table schema, falling back to the current database) is inlined at the call site. - planner/core uses the package-local ErrTableaccessDenied (no plannererrors alias here); the test file uses core.ErrTableaccessDenied. Session().Auth here takes three arguments, matching this branch's signature. Behaviour and tests are preserved (mysql.tidb_ddl_job is in a system DB). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> (cherry picked from commit ccd89b3)
ti-chi-bot
Bot
added
release-note-none
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
ti-chi-bot
Bot
added
needs-1-more-lgtm
D3Hunter
approved these changes
Sep 29, 2026
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: D3Hunter, wjhuang2016 The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
ti-chi-bot
Bot
added
lgtm
and removed
needs-1-more-lgtm
[LGTM Timeline notifier]Timeline:
|
Member
Author
|
/retest |
1 similar comment
Member
Author
|
/retest |
ti-chi-bot
Bot
merged commit Sep 29, 2026
e2aeceb
into
pingcap:release-6.5-20260928-v6.5.4
9 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Issue Number: close #71547
Problem Summary:
Backport #71399 and #71402 to
release-6.5-20260928-v6.5.4.What changed and how does it work?
Two cherry-picks, applied in the order they merged to master.
Check List
Tests
Side effects
Documentation
Release note