From eeb9a5f4fb4162a654d1a7a925d6043840270e33 Mon Sep 17 00:00:00 2001 From: ireneontheway <48651140+ireneontheway@users.noreply.github.com> Date: Mon, 27 Jul 2020 12:04:13 +0800 Subject: [PATCH 1/3] cherry pick #4054 to release-4.0 Signed-off-by: ti-srebot --- query-execution-plan.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/query-execution-plan.md b/query-execution-plan.md index 4f2e0b0495ce..42e29727d69b 100644 --- a/query-execution-plan.md +++ b/query-execution-plan.md @@ -1,6 +1,10 @@ --- title: 理解 TiDB 执行计划 +<<<<<<< HEAD aliases: ['/docs-cn/stable/reference/performance/understanding-the-query-execution-plan/'] +======= +aliases: ['/docs-cn/dev/reference/performance/understanding-the-query-execution-plan/','/docs-cn/dev/index-merge/','/docs-cn/dev/reference/performance/index-merge/'] +>>>>>>> 5c5236b... Add index-merge.md aliases to query-execution-plan.md (#4054) --- # 理解 TiDB 执行计划 From 60fac33915c8b8de288c9b293e71030d6c6a675a Mon Sep 17 00:00:00 2001 From: ireneontheway <48651140+ireneontheway@users.noreply.github.com> Date: Mon, 27 Jul 2020 12:06:12 +0800 Subject: [PATCH 2/3] Update query-execution-plan.md --- query-execution-plan.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/query-execution-plan.md b/query-execution-plan.md index 42e29727d69b..0e6b087cc425 100644 --- a/query-execution-plan.md +++ b/query-execution-plan.md @@ -1,10 +1,6 @@ --- title: 理解 TiDB 执行计划 -<<<<<<< HEAD -aliases: ['/docs-cn/stable/reference/performance/understanding-the-query-execution-plan/'] -======= aliases: ['/docs-cn/dev/reference/performance/understanding-the-query-execution-plan/','/docs-cn/dev/index-merge/','/docs-cn/dev/reference/performance/index-merge/'] ->>>>>>> 5c5236b... Add index-merge.md aliases to query-execution-plan.md (#4054) --- # 理解 TiDB 执行计划 From c8cfc43140a3c5dda011ebf1b8a0919baa697763 Mon Sep 17 00:00:00 2001 From: Keke Yi <40977455+yikeke@users.noreply.github.com> Date: Mon, 27 Jul 2020 12:19:58 +0800 Subject: [PATCH 3/3] Update query-execution-plan.md --- query-execution-plan.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/query-execution-plan.md b/query-execution-plan.md index 0e6b087cc425..a3d0b2099ae3 100644 --- a/query-execution-plan.md +++ b/query-execution-plan.md @@ -1,6 +1,6 @@ --- title: 理解 TiDB 执行计划 -aliases: ['/docs-cn/dev/reference/performance/understanding-the-query-execution-plan/','/docs-cn/dev/index-merge/','/docs-cn/dev/reference/performance/index-merge/'] +aliases: ['/docs-cn/stable/reference/performance/understanding-the-query-execution-plan/','/docs-cn/stable/index-merge/','/docs-cn/stable/reference/performance/index-merge/'] --- # 理解 TiDB 执行计划