From d02176890b872838238b25c80bdc61f011b4ca2e Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Sun, 20 Sep 2026 10:22:32 +0800 Subject: [PATCH 1/2] This is an automated cherry-pick of #23903 Signed-off-by: ti-chi-bot --- migration-tools.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/migration-tools.md b/migration-tools.md index 2bc08cfd5f0a0..4a8b9b2ced3e4 100644 --- a/migration-tools.md +++ b/migration-tools.md @@ -81,7 +81,11 @@ This document introduces the user scenarios, supported upstreams and downstreams - **Upstream**: TiDB, MySQL - **Downstream**: TiDB, MySQL - **Advantages**: Can be used to repair data in the scenario where a small amount of data is inconsistent +<<<<<<< HEAD - **Limitation**: sync-diff-inspector has some restrictions on online checks for data migration between MySQL and TiDB, comparisons of certain data types, and checking and repairing tables without a primary key or unique index. For more information, see [Restrictions of sync-diff-inspector](/sync-diff-inspector/sync-diff-inspector-overview.md#restrictions-of-sync-diff-inspector). +======= +- **Limitation**: sync-diff-inspector does not support online checks for data migration between MySQL and TiDB. It also has limitations when comparing certain data types and repairing inconsistent data in tables without a primary key or unique index. For more information, see [Restrictions of sync-diff-inspector](/sync-diff-inspector/sync-diff-inspector-overview.md#restrictions-of-sync-diff-inspector). +>>>>>>> 564eda06a8 (docs: fix sync-diff-inspector limitations in migration tools (#23887) (#23903)) ## Install tools using TiUP From 742c71cef11817822ad309a462923c0e63b98992 Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Sun, 20 Sep 2026 15:41:39 +0800 Subject: [PATCH 2/2] Update migration-tools.md --- migration-tools.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/migration-tools.md b/migration-tools.md index 4a8b9b2ced3e4..19c709cd34eb3 100644 --- a/migration-tools.md +++ b/migration-tools.md @@ -81,11 +81,7 @@ This document introduces the user scenarios, supported upstreams and downstreams - **Upstream**: TiDB, MySQL - **Downstream**: TiDB, MySQL - **Advantages**: Can be used to repair data in the scenario where a small amount of data is inconsistent -<<<<<<< HEAD -- **Limitation**: sync-diff-inspector has some restrictions on online checks for data migration between MySQL and TiDB, comparisons of certain data types, and checking and repairing tables without a primary key or unique index. For more information, see [Restrictions of sync-diff-inspector](/sync-diff-inspector/sync-diff-inspector-overview.md#restrictions-of-sync-diff-inspector). -======= - **Limitation**: sync-diff-inspector does not support online checks for data migration between MySQL and TiDB. It also has limitations when comparing certain data types and repairing inconsistent data in tables without a primary key or unique index. For more information, see [Restrictions of sync-diff-inspector](/sync-diff-inspector/sync-diff-inspector-overview.md#restrictions-of-sync-diff-inspector). ->>>>>>> 564eda06a8 (docs: fix sync-diff-inspector limitations in migration tools (#23887) (#23903)) ## Install tools using TiUP