From 9268a463dda159ae8851b63fb615fbb8fabd953d Mon Sep 17 00:00:00 2001
From: JoyinQin <56883733+Joyinqin@users.noreply.github.com>
Date: Tue, 13 Oct 2020 08:22:41 +0800
Subject: [PATCH 1/4] Update tidb-configuration-file.md
---
tidb-configuration-file.md | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/tidb-configuration-file.md b/tidb-configuration-file.md
index 15c35742ba28f..b78d6c7b73a95 100644
--- a/tidb-configuration-file.md
+++ b/tidb-configuration-file.md
@@ -548,10 +548,4 @@ Configurations related to the `events_statement_summary_by_digest` table.
## experimental
-The `experimental` section describes configurations related to the experimental features of TiDB. This section is introduced since v3.1.0.
-
-### `allow-auto-random` New in v3.1.0
-
-- Determines whether to allow using `AUTO_RANDOM`.
-- Default value: `false`
-- By default, TiDB does not support using `AUTO_RANDOM`. When the value is `true`, you cannot set `alter-primary-key` to `true` at the same time.
+The `experimental` section describes configurations related to the experimental features of TiDB. This section is introduced since v3.1.0.
\ No newline at end of file
From 36fcbe96ff1bfe3ff57b5f614ed7dfc7d610da15 Mon Sep 17 00:00:00 2001
From: Joyinqin
Date: Fri, 26 Mar 2021 14:46:04 +0800
Subject: [PATCH 2/4] Update tidb-binlog-overview.md
---
tidb-binlog/tidb-binlog-overview.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tidb-binlog/tidb-binlog-overview.md b/tidb-binlog/tidb-binlog-overview.md
index edf2fbf2943ee..af53f6d3594e8 100644
--- a/tidb-binlog/tidb-binlog-overview.md
+++ b/tidb-binlog/tidb-binlog-overview.md
@@ -50,7 +50,9 @@ The TiDB Binlog cluster is composed of Pump and Drainer.
## Notes
-* You need to use TiDB v2.0.8-binlog, v2.1.0-rc.5 or a later version. Older versions of TiDB cluster are not compatible with the cluster version of TiDB Binlog.
+* TiDB Binlog is incompatible with the following feature introduced in TiDB v4.0.7 and cannot be used together:
+
+ - TiDB system variable [tidb_enable_amend_pessimistic_txn](/system-variables.md#tidb_enable_amend_pessimistic_txn-new-in-v407): The two features have compatibility issues. Using them together will cause correctness issues with inconsistent replication data of TiDB Binlog.
* Drainer supports replicating binlogs to MySQL, TiDB, Kafka or local files. If you need to replicate binlogs to other Drainer unsuppored destinations, you can set Drainer to replicate the binlog to Kafka and read the data in Kafka for customized processing according to binlog consumer protocol. See [Binlog Consumer Client User Guide](/tidb-binlog/binlog-consumer-client.md).
From 441ecf005290820bdec88767cf75ccb40665566d Mon Sep 17 00:00:00 2001
From: Joyinqin
Date: Fri, 26 Mar 2021 14:53:13 +0800
Subject: [PATCH 3/4] Update tidb-binlog-overview.md
---
tidb-binlog/tidb-binlog-overview.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tidb-binlog/tidb-binlog-overview.md b/tidb-binlog/tidb-binlog-overview.md
index af53f6d3594e8..697926f64ebf2 100644
--- a/tidb-binlog/tidb-binlog-overview.md
+++ b/tidb-binlog/tidb-binlog-overview.md
@@ -50,7 +50,7 @@ The TiDB Binlog cluster is composed of Pump and Drainer.
## Notes
-* TiDB Binlog is incompatible with the following feature introduced in TiDB v4.0.7 and cannot be used together:
+* TiDB Binlog is incompatible with the following feature introduced in TiDB v4.0.7 and they cannot be used together:
- TiDB system variable [tidb_enable_amend_pessimistic_txn](/system-variables.md#tidb_enable_amend_pessimistic_txn-new-in-v407): The two features have compatibility issues. Using them together will cause correctness issues with inconsistent replication data of TiDB Binlog.
From 475849f3bea7e5a2798351c60bc351568a5433a3 Mon Sep 17 00:00:00 2001
From: JoyinQ <56883733+Joyinqin@users.noreply.github.com>
Date: Fri, 26 Mar 2021 16:38:23 +0800
Subject: [PATCH 4/4] Apply suggestions from code review
Co-authored-by: Ran
---
tidb-binlog/tidb-binlog-overview.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tidb-binlog/tidb-binlog-overview.md b/tidb-binlog/tidb-binlog-overview.md
index 697926f64ebf2..b1adfef445099 100644
--- a/tidb-binlog/tidb-binlog-overview.md
+++ b/tidb-binlog/tidb-binlog-overview.md
@@ -52,7 +52,7 @@ The TiDB Binlog cluster is composed of Pump and Drainer.
* TiDB Binlog is incompatible with the following feature introduced in TiDB v4.0.7 and they cannot be used together:
- - TiDB system variable [tidb_enable_amend_pessimistic_txn](/system-variables.md#tidb_enable_amend_pessimistic_txn-new-in-v407): The two features have compatibility issues. Using them together will cause correctness issues with inconsistent replication data of TiDB Binlog.
+ - TiDB system variable [tidb_enable_amend_pessimistic_txn](/system-variables.md#tidb_enable_amend_pessimistic_txn-new-in-v407): The two features have compatibility issues. Using them together might cause the issue that TiDB Binlog replicates data inconsistently.
* Drainer supports replicating binlogs to MySQL, TiDB, Kafka or local files. If you need to replicate binlogs to other Drainer unsuppored destinations, you can set Drainer to replicate the binlog to Kafka and read the data in Kafka for customized processing according to binlog consumer protocol. See [Binlog Consumer Client User Guide](/tidb-binlog/binlog-consumer-client.md).