Skip to content

system-variables: update from generated source (#5752) #5793

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

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #5752

What is changed, added or deleted? (Required)

This updates the system variables, generated against the tidb source code. i.e. this PR is derived from #5720 , but the generator source code will be submitted separately.

This allows this PR to potentially be cherry picked and handled like a regular contribution.

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)

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

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

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@ti-chi-bot ti-chi-bot added require-LGT1 Indicates that the PR requires an LGTM. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/cherry-pick-for-release-5.0 This PR is cherry-picked to release-5.0 from a source PR. type/enhancement The issue or PR belongs to an enhancement. labels Jun 16, 2021
@ti-chi-bot ti-chi-bot requested a review from TomShawn June 16, 2021 02:53
@TomShawn
Copy link
Contributor

TomShawn commented Jun 16, 2021

@morgo Please resolve the conflicts in this PR. Thanks!

@TomShawn TomShawn added the status/require-change Needs the author to address comments. label Jun 28, 2021
@dveeden
Copy link
Contributor

dveeden commented Jul 1, 2021

I can't seem to push directly, but something like this should fix the conflicts:

commit ed3670f8b7334cb42326ea1728c1d52dc90acdd7
Author: Daniël van Eeden <[email protected]>
Date:   Thu Jul 1 13:58:55 2021 +0200

    fix merge conflict

diff --git a/system-variables.md b/system-variables.md
index cebc22af6..0be6965e6 100644
--- a/system-variables.md
+++ b/system-variables.md
@@ -389,11 +389,7 @@ Constraint checking is always performed in place for pessimistic transactions (d
 ### tidb_enable_1pc <span class="version-mark">New in v5.0</span>
 
 - Scope: SESSION | GLOBAL
-<<<<<<< HEAD
 - Default value: For newly created clusters, the default value of v5.0 RC is `OFF` and the default value of v5.0 GA or later is `ON`. If your cluster was upgraded to v5.0 GA from v5.0 RC, the variable value stays unchanged. If your cluster is upgraded to v5.0 GA from v4.0 or earlier, the variable value defaults to `OFF` after the upgrade.
-=======
-- Default value: `ON`
->>>>>>> e1d5394e6 (system-variables: update from generated source (#5752))
 - This variable is used to specify whether to enable the one-phase commit feature for transactions that only affect one Region. Compared with the often-used two-phase commit, one-phase commit can greatly reduce the latency of transaction commit and increase the throughput.
 
 > **Note:**
@@ -419,11 +415,7 @@ Constraint checking is always performed in place for pessimistic transactions (d
 ### tidb_enable_async_commit <span class="version-mark">New in v5.0</span>
 
 - Scope: SESSION | GLOBAL
-<<<<<<< HEAD
 - Default value: For newly created clusters, the default value of v5.0 RC is `OFF` and the default value of v5.0 GA or later is `ON`. If your cluster was upgraded to v5.0 GA from v5.0 RC, the variable value stays unchanged. If your cluster is upgraded to v5.0 GA from v4.0 or earlier, the variable value defaults to `OFF` after the upgrade.
-=======
-- Default value: `ON`
->>>>>>> e1d5394e6 (system-variables: update from generated source (#5752))
 - This variable controls whether to enable the async commit feature for the second phase of the two-phase transaction commit to perform asynchronously in the background. Enabling this feature can reduce the latency of transaction commit.
 
 > **Note:**
@@ -460,8 +452,6 @@ Constraint checking is always performed in place for pessimistic transactions (d
 - Default value: `ON`
 - This variable controls whether to record the execution information of each operator in the slow query log.
 
-<<<<<<< HEAD
-=======
 ### tidb_enable_enhanced_security
 
 - Scope: NONE
@@ -473,7 +463,6 @@ Constraint checking is always performed in place for pessimistic transactions (d
     - `RESTRICTED_VARIABLES_ADMIN`: The ability to see and set sensitive variables in `SHOW [GLOBAL] VARIABLES` and `SET`.
     - `RESTRICTED_USER_ADMIN`: The ability to prevent other users from making changes or dropping a user account.
 
->>>>>>> e1d5394e6 (system-variables: update from generated source (#5752))
 ### tidb_enable_fast_analyze
 
 - Scope: SESSION | GLOBAL

@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 5, 2021
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 5, 2021
@morgo morgo removed the status/require-change Needs the author to address comments. label Jul 5, 2021
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 6, 2021
@TomShawn
Copy link
Contributor

TomShawn commented Jul 6, 2021

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 899b950

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 6, 2021
@ti-chi-bot ti-chi-bot merged commit cda8d36 into pingcap:release-5.0 Jul 6, 2021
@TomShawn TomShawn mentioned this pull request Jul 6, 2021
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
require-LGT1 Indicates that the PR requires an LGTM. size/XL Denotes a PR that changes 500-999 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. type/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants