Skip to content

reference: refine expressions in characterset-and-collation.md#3056

Merged
yikeke merged 7 commits into
masterfrom
yikeke-patch-5
May 13, 2020
Merged

reference: refine expressions in characterset-and-collation.md#3056
yikeke merged 7 commits into
masterfrom
yikeke-patch-5

Conversation

@yikeke
Copy link
Copy Markdown
Contributor

@yikeke yikeke commented May 13, 2020

What is changed, added or deleted? (Required)

refine expressions in characterset-and-collation.md

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

  • master (the latest development version)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

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

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

@yikeke yikeke marked this pull request as draft May 13, 2020 01:56
@yikeke yikeke marked this pull request as ready for review May 13, 2020 04:11
@yikeke yikeke added needs-cherry-pick-4.0 translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. labels May 13, 2020
@yikeke yikeke requested review from TomShawn and wjhuang2016 May 13, 2020 04:11
@yikeke yikeke added the status/PTAL This PR is ready for reviewing. label May 13, 2020
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


* 规则 1:如果指定了 `CHARACTER SET charset_name` 和 `COLLATE collation_name`,则直接使用 `CHARACTER SET charset_name` 和 `COLLATE collation_name`。
* 规则 2:如果指定了 `CHARACTER SET charset_name` 且未指定 `COLLATE collation_name`,则使用 `CHARACTER SET charset_name` 和 `charset_name` 对应的默认排序规则。
* 规则 1:如果指定了 `CHARACTER SET charset_name` 和 `COLLATE collation_name`,则直接使用 `charset_name` 和 `collation_name`。
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

则直接使用 charset_name 字符集和 collation_name排序规则。

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Updated. PTAL again. @wjhuang2016

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

yikeke commented May 13, 2020

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 13, 2020
@yikeke yikeke merged commit cce2a3e into master May 13, 2020
@yikeke yikeke deleted the yikeke-patch-5 branch May 13, 2020 08:56
sre-bot pushed a commit to sre-bot/docs-cn that referenced this pull request May 13, 2020
…ap#3056)

* Update characterset-and-collation.md

* Update characterset-and-collation.md

* fix indentation

* Update reference/sql/characterset-and-collation.md

* Update reference/sql/characterset-and-collation.md

* Apply suggestions from code review
@sre-bot
Copy link
Copy Markdown
Contributor

sre-bot commented May 13, 2020

cherry pick to release-4.0 in PR #3066

rleungx pushed a commit to rleungx/docs-cn that referenced this pull request May 22, 2020
…ap#3056)

* Update characterset-and-collation.md

* Update characterset-and-collation.md

* fix indentation

* Update reference/sql/characterset-and-collation.md

* Update reference/sql/characterset-and-collation.md

* Apply suggestions from code review
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. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants