Skip to content

reference: add document for new collation#2606

Merged
sre-bot merged 37 commits into
pingcap:masterfrom
wjhuang2016:collation
Apr 17, 2020
Merged

reference: add document for new collation#2606
sre-bot merged 37 commits into
pingcap:masterfrom
wjhuang2016:collation

Conversation

@wjhuang2016
Copy link
Copy Markdown
Member

@wjhuang2016 wjhuang2016 commented Apr 1, 2020

What is changed, added or deleted? (Required)

Which TiDB version(s) do your changes apply to? (Required)

  • master (the latest development version, including v4.0 changes for now)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

If you select two or more versions from above, to trigger the bot to cherry-pick this PR to your desired release version branch(es), you must add corresponding labels such as needs-cherry-pick-3.1, needs-cherry-pick-3.0, and needs-cherry-pick-2.1.

What is the related PR or file link(s)?

  • This PR is translated from:
  • Other reference link(s):

@wjhuang2016 wjhuang2016 added the status/WIP This PR is still working in progress. label Apr 1, 2020
@TomShawn TomShawn added translation/doing This PR’s assignee is translating this PR. v4.0 This PR/issue applies to TiDB v4.0. labels Apr 1, 2020
@TomShawn TomShawn self-requested a review April 1, 2020 11:52
@TomShawn TomShawn self-assigned this Apr 1, 2020
@TomShawn
Copy link
Copy Markdown
Contributor

TomShawn commented Apr 1, 2020

@wjhuang2016 Please fix the CI failure and involve a technical review.

@wjhuang2016
Copy link
Copy Markdown
Member Author

@bb7133 PTAL

Comment thread reference/configuration/tidb-server/configuration-file.md Outdated
Comment thread reference/sql/character-set.md Outdated
Comment thread reference/sql/characterset-and-collation.md Outdated
Comment thread reference/sql/characterset-and-collation.md Outdated
Comment thread reference/sql/characterset-and-collation.md Outdated
Comment thread reference/sql/characterset-and-collation.md Outdated
Comment thread reference/sql/characterset-and-collation.md Outdated
Comment thread reference/sql/characterset-and-collation.md Outdated
Comment thread reference/sql/characterset-and-collation.md Outdated
Comment thread reference/sql/characterset-and-collation.md Outdated
Comment thread reference/sql/characterset-and-collation.md Outdated
Comment thread reference/sql/characterset-and-collation.md Outdated
Comment thread reference/sql/characterset-and-collation.md Outdated
Comment thread reference/sql/characterset-and-collation.md Outdated
Comment thread reference/sql/characterset-and-collation.md Outdated
Comment thread reference/sql/characterset-and-collation.md Outdated
wjhuang2016 and others added 7 commits April 8, 2020 17:32
Co-Authored-By: bb7133 <bb7133@gmail.com>
Co-Authored-By: bb7133 <bb7133@gmail.com>
Co-Authored-By: bb7133 <bb7133@gmail.com>
Co-Authored-By: bb7133 <bb7133@gmail.com>
Co-Authored-By: bb7133 <bb7133@gmail.com>
Co-Authored-By: bb7133 <bb7133@gmail.com>
Co-Authored-By: bb7133 <bb7133@gmail.com>
wjhuang2016 and others added 11 commits April 17, 2020 00:28
Co-Authored-By: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-Authored-By: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-Authored-By: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-Authored-By: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-Authored-By: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-Authored-By: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-Authored-By: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-Authored-By: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-Authored-By: TomShawn <41534398+TomShawn@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

@TomShawn TomShawn left a comment

Choose a reason for hiding this comment

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

LGTM

@TomShawn TomShawn added the status/can-merge Indicates a PR has been approved by a committer. label Apr 17, 2020
@sre-bot
Copy link
Copy Markdown
Contributor

sre-bot commented Apr 17, 2020

/run-all-tests

@sre-bot sre-bot merged commit 5642082 into pingcap:master Apr 17, 2020
sre-bot pushed a commit to sre-bot/docs-cn that referenced this pull request Apr 17, 2020
@sre-bot
Copy link
Copy Markdown
Contributor

sre-bot commented Apr 17, 2020

cherry pick to release-4.0 in PR #2806

@TomShawn TomShawn added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR’s assignee is translating this PR. labels Apr 22, 2020
Comment thread reference/sql/characterset-and-collation.md
Comment thread reference/sql/characterset-and-collation.md
Comment thread reference/sql/characterset-and-collation.md
Comment thread reference/sql/characterset-and-collation.md
> **注意:**
>
> 目前为止 TiDB 只支持部分以上提到的 Collation。
每一个字符集,都有一个默认的 Collation,例如 `utf8mb4` 的默认 Collation 为 `utf8mb4_bin`。
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

这句话和前面那个 note 重复了,建议只在一个地方保留吧

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

ok

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. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. v4.0 This PR/issue applies to TiDB v4.0.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants