Skip to content

ddl: fix canceling model.ActionRebaseAutoID and model.ActionShardRowID ddl jobs (#9226)#9506

Merged
winkyao merged 2 commits intopingcap:release-2.1from
winkyao:cherry-pick-2.1
Mar 1, 2019
Merged

ddl: fix canceling model.ActionRebaseAutoID and model.ActionShardRowID ddl jobs (#9226)#9506
winkyao merged 2 commits intopingcap:release-2.1from
winkyao:cherry-pick-2.1

Conversation

@winkyao
Copy link
Copy Markdown
Contributor

@winkyao winkyao commented Feb 28, 2019

Cherry-pick from #9226

@jackysp
Copy link
Copy Markdown
Contributor

jackysp commented Mar 1, 2019

Please resolve the conflicts.

Copy link
Copy Markdown
Contributor

@zimulala zimulala left a comment

Choose a reason for hiding this comment

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

LGTM

@winkyao
Copy link
Copy Markdown
Contributor Author

winkyao commented Mar 1, 2019

/rebuild

Copy link
Copy Markdown
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
Copy link
Copy Markdown
Contributor

/run-all-tests tidb-test=release-2.1 tidb-private-test=release-2.1 tikv=release-2.1

@winkyao winkyao merged commit e811eb7 into pingcap:release-2.1 Mar 1, 2019
@winkyao winkyao deleted the cherry-pick-2.1 branch March 1, 2019 09:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants