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: add a binlog when dropping column (#13536) (#13613) #13974

Merged
merged 4 commits into from
Dec 20, 2019

Conversation

zimulala
Copy link
Contributor

@zimulala zimulala commented Dec 9, 2019

Cherry pick #13536 to v2.1
conflicts:
go.mod
go.sum

related to pingcap/tipb#158

Release note

  • We add this binlog to enable Drainer to handle DML correctly in "Delete only" and "Delete reorg".

@zimulala
Copy link
Contributor Author

PTAL @crazycs520 @suzaku

Copy link
Contributor

@suzaku suzaku left a comment

Choose a reason for hiding this comment

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

LGTM

@zimulala
Copy link
Contributor Author

PTAL @crazycs520

crazycs520
crazycs520 previously approved these changes Dec 19, 2019
Copy link
Contributor

@crazycs520 crazycs520 left a comment

Choose a reason for hiding this comment

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

LGTM

@crazycs520 crazycs520 added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Dec 19, 2019
@zimulala zimulala added the status/can-merge Indicates a PR has been approved by a committer. label Dec 19, 2019
@sre-bot
Copy link
Contributor

sre-bot commented Dec 19, 2019

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Dec 19, 2019

@zimulala merge failed.

@suzaku
Copy link
Contributor

suzaku commented Dec 20, 2019

/run-all-tests

@zimulala zimulala added the priority/release-blocker This issue blocks a release. Please solve it ASAP. label Dec 20, 2019
@@ -122,7 +122,7 @@ func (s *testStatisticsSuite) TestCMSketchCoding(c *C) {
}
bytes, err := encodeCMSketch(lSketch)
c.Assert(err, IsNil)
c.Assert(len(bytes), Equals, 61455)
c.Assert(len(bytes), Equals, 61457)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Update it because tipb is newer.
PTAL @lamxTyler

@zimulala
Copy link
Contributor Author

/run-all-tests

@zimulala zimulala merged commit 98a0ce6 into pingcap:release-2.1 Dec 20, 2019
@zimulala zimulala deleted the drop-col branch December 20, 2019 05:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority/release-blocker This issue blocks a release. Please solve it ASAP. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants