Skip to content
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.

Sign up for GitHub

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

Jump to bottom

system-variables: Add charset documentation (#5867) #5908

Merged
merged 2 commits into from
Jul 2, 2021
Merged

system-variables: Add charset documentation (#5867) #5908

merged 2 commits into from
Jul 2, 2021

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #5867

What is changed, added or deleted? (Required)

Add documentation for these:

5.7.25-TiDB-v5.2.0-alpha-164-g8434069c5 127.0.0.1:4000  test  SQL show global variables like 'char%';
+--------------------------+--------------------------------------------------------+
| Variable_name            | Value                                                  |
+--------------------------+--------------------------------------------------------+
| character_set_client     | utf8mb4                                                |
| character_set_connection | utf8mb4                                                |
| character_set_database   | utf8mb4                                                |
| character_set_filesystem | binary                                                 |
| character_set_results    | utf8mb4                                                |
| character_set_server     | utf8mb4                                                |
| character_set_system     | utf8                                                   |
| character_sets_dir       | /usr/local/mysql-5.6.25-osx10.8-x86_64/share/charsets/ |
+--------------------------+--------------------------------------------------------+
8 rows in set (0.0042 sec)

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

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

Related to #3155

@dveeden @ti-chi-bot
This is an automated cherry-pick of pingcap#5867
30bad9d 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Jul 1, 2021
Merged
7 tasks
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-5.0 This PR is cherry-picked to release-5.0 from a source PR. labels Jul 1, 2021
@ti-chi-bot ti-chi-bot requested a review from TomShawn July 1, 2021 11:34
TomShawn
TomShawn reviewed Jul 1, 2021
View reviewed changes
system-variables.md Outdated
@@ -79,6 +79,45 @@ mysql> SELECT * FROM t1;
- Default value: ON
- Controls whether statements should automatically commit when not in an explicit transaction. See [Transaction Overview](/transaction-overview.md#autocommit) for more information.

<<<<<<< HEAD
Copy link
Contributor

@TomShawn TomShawn Jul 1, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

@dveeden Could you help resolve the conflicts in the release branch?
@morgo Could you please resolve the conflicts in #5793? Otherwise, there can be more conflicts every time any changes made in system-variables.md are cherry-picked from master to release-5.0. Thanks!

Copy link
Contributor

Choose a reason for hiding this comment

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

Trying to do that now

TomShawn
TomShawn approved these changes Jul 2, 2021
View reviewed changes
Copy link
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

@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • TomShawn

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 2, 2021
@TomShawn
Copy link
Contributor

TomShawn commented Jul 2, 2021

/merge

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: bbad9d8

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 2, 2021
@ti-chi-bot ti-chi-bot merged commit aff2a73 into pingcap:release-5.0 Jul 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dveeden dveeden dveeden left review comments

@TomShawn TomShawn TomShawn approved these changes

@wjhuang2016 wjhuang2016 Awaiting requested review from wjhuang2016

Assignees

@dveeden dveeden

Labels
size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/cherry-pick-for-release-5.0 This PR is cherry-picked to release-5.0 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ti-chi-bot @TomShawn @dveeden