-
Notifications
You must be signed in to change notification settings - Fork 701
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
system-variables: update from generated source (#5752) #5793
Conversation
Signed-off-by: ti-chi-bot <[email protected]>
@morgo Please resolve the conflicts in this PR. Thanks! |
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
[REVIEW NOTIFICATION] This pull request has been approved by:
To complete the pull request process, please ask the reviewers in the list to review by filling The full list of commands accepted by this bot can be found here. Reviewer can indicate their review by submitting an approval review. |
/merge |
This pull request has been accepted and is ready to merge. Commit hash: 899b950
|
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)
What is the related PR or file link(s)?
Do your changes match any of the following descriptions?