Skip to content

Fix some issues: add alias; fix wrong content (#4076)#4077

Merged
ti-srebot merged 2 commits into
pingcap:release-4.0from
ti-srebot:release-4.0-32a586e35434
Jul 28, 2020
Merged

Fix some issues: add alias; fix wrong content (#4076)#4077
ti-srebot merged 2 commits into
pingcap:release-4.0from
ti-srebot:release-4.0-32a586e35434

Conversation

@ti-srebot
Copy link
Copy Markdown
Contributor

cherry-pick #4076 to release-4.0


What is changed, added or deleted? (Required)

Fixes https://github.com/pingcap/docs-cn/pull/3503/files#diff-345ad3d131a6268bda0656454cd78346R910, https://github.com/pingcap/docs-cn/pull/3981/files#diff-8074a2a28071d696bf7725dbeba1c742R5

Which TiDB version(s) do your changes apply to? (Required)

  • master (the latest development version)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

What is the related PR or file link(s)?

  • This PR is translated from:
  • Other reference link(s):

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot added type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR. requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. labels Jul 28, 2020
@ti-srebot ti-srebot requested a review from TomShawn July 28, 2020 09:04
Comment thread system-tables/system-table-sql-diagnostics.md Outdated
@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 28, 2020
@yikeke
Copy link
Copy Markdown
Contributor

yikeke commented Jul 28, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 28, 2020
@ti-srebot
Copy link
Copy Markdown
Contributor Author

/run-all-tests

@ti-srebot ti-srebot merged commit a394130 into pingcap:release-4.0 Jul 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants