-
Notifications
You must be signed in to change notification settings - Fork 678
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
Update use-tiflash.md from Special Week changes (#2972) #3045
Merged
ti-srebot
merged 3 commits into
pingcap:release-4.0
from
ti-srebot:release-4.0-8cadd0501a0f
Jun 28, 2020
Merged
Update use-tiflash.md from Special Week changes (#2972) #3045
ti-srebot
merged 3 commits into
pingcap:release-4.0
from
ti-srebot:release-4.0-8cadd0501a0f
Jun 28, 2020
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: ti-srebot <ti-srebot@pingcap.com>
5 tasks
ti-srebot
added
status/PTAL
This PR is ready for reviewing.
type/cherry-pick-for-release-4.0
This PR is cherry-picked to release-4.0 from a source PR.
labels
Jun 28, 2020
TomShawn
reviewed
Jun 28, 2020
tiflash/use-tiflash.md
Outdated
> The feature that enables TiFlash to support the new framework for collations in TiDB is in development. Currently, if you enable the [new framework for collations](/character-set-and-collation.md#new-framework-for-collations) in TiDB, none of the expressions can be pushed down. | ||
======= | ||
> Before v4.0.2, TiDB does not support the new framework for collations, so in those previous versions, if you enable the [new framework for collations](/character-set-and-collation.md#new-framework-for-collations), none of the expressions can be pushed down. This restriction is removed in v4.0.2 and later versions. | ||
>>>>>>> 8cadd05... Update use-tiflash.md from Special Week changes (#2972) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@yikeke Please resolve the conflict.
yikeke
reviewed
Jun 28, 2020
yikeke
approved these changes
Jun 28, 2020
/merge |
ti-srebot
added
the
status/can-merge
Indicates a PR has been approved by a committer.
label
Jun 28, 2020
/run-all-tests |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
status/can-merge
Indicates a PR has been approved by a committer.
status/PTAL
This PR is ready for reviewing.
type/cherry-pick-for-release-4.0
This PR is cherry-picked to release-4.0 from a source PR.
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 #2972 to release-4.0
What is changed, added or deleted? (Required)
Which TiDB version(s) do your changes apply to? (Required)
What is the related PR or file link(s)?
pingcap/docs-cn#3351
pingcap/docs-cn#3396
pingcap/docs-cn#3687