Apply version specific changes

pingcap · Aug 26, 2024 · 3ec7339 · 3ec7339
1 parent df9d77c
commit 3ec7339
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 4,130 deletions.
diff --git a/releases/release-7.2.0.md b/releases/release-7.2.0.md
diff --git a/releases/release-7.4.0.md b/releases/release-7.4.0.md
diff --git a/releases/release-7.5.0.md b/releases/release-7.5.0.md
diff --git a/releases/release-7.5.1.md b/releases/release-7.5.1.md
diff --git a/releases/release-7.5.2.md b/releases/release-7.5.2.md
diff --git a/releases/release-7.5.3.md b/releases/release-7.5.3.md
diff --git a/releases/release-7.6.0.md b/releases/release-7.6.0.md
diff --git a/releases/release-8.0.0.md b/releases/release-8.0.0.md
diff --git a/releases/release-8.1.0.md b/releases/release-8.1.0.md
diff --git a/releases/release-8.2.0.md b/releases/release-8.2.0.md
diff --git a/releases/release-8.3.0.md b/releases/release-8.3.0.md
diff --git a/system-variables.md b/system-variables.md
@@ -4954,35 +4954,6 @@ For details, see [Identify Slow Queries](/identify-slow-queries.md).
 
 </CustomContent>
 
-<<<<<<< HEAD
-=======
-### tidb_txn_entry_size_limit <span class="version-mark">New in v7.6.0</span>
-
-- Scope: SESSION | GLOBAL
-- Persists to cluster: Yes
-- Applies to hint [SET_VAR](/optimizer-hints.md#set_varvar_namevar_value): No
-- Type: Integer
-- Default value: `0`
-- Range: `[0, 125829120]`
-- Unit: Bytes
-
-<CustomContent platform="tidb">
-
-- This variable is used to dynamically modify the TiDB configuration item [`performance.txn-entry-size-limit`](/tidb-configuration-file.md#txn-entry-size-limit-new-in-v4010-and-v500). It limits the size of a single row of data in TiDB, which is equivalent to the configuration item. The default value of this variable is `0`, which means that TiDB uses the value of the configuration item `txn-entry-size-limit` by default. When this variable is set to a non-zero value, `txn-entry-size-limit` is also set to the same value.
-
-</CustomContent>
-
-<CustomContent platform="tidb-cloud">
-
-- This variable is used to dynamically modify the TiDB configuration item [`performance.txn-entry-size-limit`](https://docs.pingcap.com/tidb/stable/tidb-configuration-file#txn-entry-size-limit-new-in-v4010-and-v500). It limits the size of a single row of data in TiDB, which is equivalent to the configuration item. The default value of this variable is `0`, which means that TiDB uses the value of the configuration item `txn-entry-size-limit` by default. When this variable is set to a non-zero value, `txn-entry-size-limit` is also set to the same value.
-
-</CustomContent>
-
-> **Note:**
->
-> Modifying this variable with the SESSION scope only affects the current user session, not the internal TiDB session. This might lead to transaction failure if the entry size of an internal TiDB transaction exceeds the limit of the configuration item. Therefore, to dynamically increase the limit, it is recommended that you modify the variable with the GLOBAL scope.
-
->>>>>>> e65145aa85 (Make the introduced version clear for "txn-entry-size-limit" (#18672))
 ### tidb_txn_mode
 
 > **Note:**