From b14771c97fcf8e58c8181b181598f5d4aaf5ac13 Mon Sep 17 00:00:00 2001 From: Morgan Tocker Date: Thu, 27 May 2021 23:27:35 -0600 Subject: [PATCH] This is an automated cherry-pick of #5711 Signed-off-by: ti-chi-bot --- system-variables.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system-variables.md b/system-variables.md index c3e45d22fb79b..0f66bcfbee08a 100644 --- a/system-variables.md +++ b/system-variables.md @@ -368,7 +368,11 @@ Constraint checking is always performed in place for pessimistic transactions (d ### tidb_enable_1pc New in v5.0 - 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` for newly created clusters. If your cluster before upgrade was earlier than v5.0, the variable value defaults to `OFF` after the upgrade. +>>>>>>> c89a1f629 (system-variables: ensure alphabetical order (#5711)) - 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:**