Skip to content

update several sql statement docs#2836

Merged
yikeke merged 2 commits into
pingcap:masterfrom
bb7133:bb7133/sync_3294
Jun 19, 2020
Merged

update several sql statement docs#2836
yikeke merged 2 commits into
pingcap:masterfrom
bb7133:bb7133/sync_3294

Conversation

@bb7133
Copy link
Copy Markdown
Member

@bb7133 bb7133 commented Jun 12, 2020

Update:

  • sql-statements/sql-statement-drop-sequence.md
  • sql-statements/sql-statement-show-character-set.md
  • sql-statements/sql-statement-show-collation.md

What is changed, added or deleted? (Required)

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)

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-4.0, 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)?

@bb7133 bb7133 added the translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. label Jun 12, 2020
@yikeke yikeke requested review from djshow832, yikeke and zimulala June 12, 2020 11:53
@yikeke yikeke added needs-cherry-pick-4.0 status/PTAL This PR is ready for reviewing. labels Jun 12, 2020
@sre-bot
Copy link
Copy Markdown
Contributor

sre-bot commented Jun 14, 2020

@zimulala, @djshow832, @yikeke, PTAL.

@yikeke yikeke changed the title sync with 'docs-cn/#3294' update several sql statement docs Jun 15, 2020
Copy link
Copy Markdown
Contributor

@yikeke yikeke left a comment

Choose a reason for hiding this comment

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

Great job! Rest LGTM

Comment thread sql-statements/sql-statement-drop-sequence.md
Comment on lines -22 to -24
**CharsetKw:**

![CharsetKw](/media/sqlgram/CharsetKw.png)
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.

These three lines should not be deleted according to https://github.com/pingcap/docs-cn/pull/3294/files.

> **Note:** TiDB currently only supports binary collations.
> **Note:**
>
> Results of `SHOW COLLATION` changes with the fact whether the "new collation framework" is enabled, detailed information of "new collation framework" can be found in [Character Set and Collation](/character-set-and-collation.md))
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.

Suggested change
> Results of `SHOW COLLATION` changes with the fact whether the "new collation framework" is enabled, detailed information of "new collation framework" can be found in [Character Set and Collation](/character-set-and-collation.md))
> Results of `SHOW COLLATION` vary when the "new collation framework" is enabled. For new collation framework details, refer to [Character Set and Collation](/character-set-and-collation.md).

## MySQL compatibility

This statement is understood to be fully compatible with MySQL. Any compatibility differences should be [reported via an issue](/report-issue.md) on GitHub.
The usage of this statement is understood to be fully compatible with MySQL. However, charsets in TiDB may have different default collations compared with MySQL, the details can be found in [Compatibility with MySQL](/mysql-compatibility.md). Any other compatibility differences should be [reported via an issue](/report-issue.md) on GitHub.
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.

Suggested change
The usage of this statement is understood to be fully compatible with MySQL. However, charsets in TiDB may have different default collations compared with MySQL, the details can be found in [Compatibility with MySQL](/mysql-compatibility.md). Any other compatibility differences should be [reported via an issue](/report-issue.md) on GitHub.
The usage of this statement is understood to be fully compatible with MySQL. However, charsets in TiDB may have different default collations compared with MySQL. For details, refer to [Compatibility with MySQL](/mysql-compatibility.md). Any other compatibility differences should be [reported via an issue](/report-issue.md) on GitHub.

## MySQL compatibility

TiDB does not support collations other than binary. This statement is only provided to ensure compatibility with MySQL.
The usage of this statement is understood to be fully compatible with MySQL. However, charsets in TiDB may have different default collations compared with MySQL, the details can be found in [Compatibility with MySQL](/mysql-compatibility.md). Any other compatibility differences should be [reported via an issue](/report-issue.md) on GitHub.
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.

Suggested change
The usage of this statement is understood to be fully compatible with MySQL. However, charsets in TiDB may have different default collations compared with MySQL, the details can be found in [Compatibility with MySQL](/mysql-compatibility.md). Any other compatibility differences should be [reported via an issue](/report-issue.md) on GitHub.
The usage of this statement is understood to be fully compatible with MySQL. However, charsets in TiDB may have different default collations compared with MySQL. For details, refer to [Compatibility with MySQL](/mysql-compatibility.md). Any other compatibility differences should be [reported via an issue](/report-issue.md) on GitHub.

@yikeke yikeke added the status/require-change Needs the author to address comments. label Jun 15, 2020
@ti-srebot
Copy link
Copy Markdown
Contributor

@yikeke, @zimulala, @djshow832, PTAL.

@ti-srebot
Copy link
Copy Markdown
Contributor

@bb7133, please update your pull request.

@yikeke yikeke removed the status/PTAL This PR is ready for reviewing. label Jun 18, 2020
bb7133 added 2 commits June 19, 2020 10:57
- sql-statements/sql-statement-drop-sequence.md
- sql-statements/sql-statement-show-character-set.md
- sql-statements/sql-statement-show-collation.md
@bb7133 bb7133 force-pushed the bb7133/sync_3294 branch from 1d92e4d to d4dccd4 Compare June 19, 2020 03:00
Copy link
Copy Markdown
Contributor

@yikeke yikeke left a comment

Choose a reason for hiding this comment

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

LGTM

@yikeke yikeke merged commit 30007c7 into pingcap:master Jun 19, 2020
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jun 19, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Copy Markdown
Contributor

cherry pick to release-4.0 in PR #2964

yikeke pushed a commit that referenced this pull request Jun 19, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: bb7133 <bb7133@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status/require-change Needs the author to address comments. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants