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

ddl: rollingback add index meets panic leads json unmarshal object error-2 master (#23913) #24077

Closed

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Apr 16, 2021

cherry-pick #23913 to release-5.0
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/24077

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/24077:release-5.0-552503442ef4

What problem does this PR solve?

Issue Number: close #23321

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Release note

  • No release note

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has not been approved.

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added sig/sql-infra SIG: SQL Infra size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/5.0-cherry-pick labels Apr 16, 2021
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 16, 2021
@ti-srebot ti-srebot added this to the v5.0.0 ga milestone Apr 16, 2021
@ti-srebot
Copy link
Contributor Author

@xiongjiwei you're already a collaborator in bot's repo.

@@ -6590,3 +6590,37 @@ func (s *testSerialDBSuite) TestIssue22819(c *C) {
_, err := tk1.Exec("commit")
c.Assert(err, ErrorMatches, ".*8028.*Information schema is changed during the execution of the statement.*")
}
<<<<<<< HEAD
=======
Copy link
Contributor

Choose a reason for hiding this comment

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

@AilinKid
Help fix the conflict.

@xiongjiwei xiongjiwei assigned AilinKid and unassigned xiongjiwei Apr 26, 2021
@bb7133
Copy link
Member

bb7133 commented Apr 30, 2021

Hi @Howie59 , could you please fix the conflict?

@xiongjiwei xiongjiwei removed their request for review June 9, 2021 02:39
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 13, 2021
@ti-chi-bot
Copy link
Member

@ti-srebot: PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 30, 2021
@djshow832
Copy link
Contributor

Duplicate with #24441

@djshow832 djshow832 closed this Sep 2, 2021
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. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. sig/sql-infra SIG: SQL Infra size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants