ddl: fix pre-split region timeout constraint not w ... (#17459) #17617
Conversation
This file contains 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
Signed-off-by: sre-bot <[email protected]>
|
/run-all-tests |
sre-bot
added
sig/sql-infra
zimulala
reviewed
Jun 3, 2020
ddl/ddl_api.go
Outdated
| @@ -1467,7 +1467,40 @@ func (d *ddl) CreateTable(ctx sessionctx.Context, s *ast.CreateTableStmt) (err e | |||
| return errors.Trace(err) | |||
| } | |||
|
|
|||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
@crazycs520
Please fix the conflict.
Signed-off-by: crazycs520 <[email protected]>
Signed-off-by: crazycs520 <[email protected]>
|
LGTM |
zimulala
added
the
status/can-merge
|
Sorry @zimulala, you don't have permission to trigger auto merge event on this branch. |
|
/run-unit-test |
|
/run-all-tests |
|
/run-all-tests |
zz-jason
changed the title
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.
cherry-pick #17459 to release-3.0
What problem does this PR solve?
close #17458
As the title said.
What is changed and how it works?
Use
context.WithTimeout.Related changes
Check List
Tests
Side effects
Release note