Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sys_var: merge sys_vars with tidb specific sys_vars #4001

Merged
merged 4 commits into from
Jul 23, 2020

Conversation

ran-huang
Copy link
Contributor

Signed-off-by: Ran [email protected]

What is changed, added or deleted? (Required)

  • Merge tidb-specific-system-variables.md into system-variables.md.
  • Fix all the links to the deleted file.

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)?

@ran-huang ran-huang added size/large Changes of a large size. status/PTAL This PR is ready for reviewing. translation/from-docs This PR is translated from a PR in pingcap/docs. requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. labels Jul 20, 2020
@ran-huang ran-huang requested review from yikeke and kissmydb July 20, 2020 11:05
@yikeke yikeke requested a review from zz-jason July 21, 2020 07:09
@ti-srebot
Copy link
Contributor

@zz-jason, @kissmydb, @yikeke, PTAL.

Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 23, 2020
Copy link
Contributor

@yikeke yikeke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-srebot ti-srebot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 23, 2020
@yikeke
Copy link
Contributor

yikeke commented Jul 23, 2020

/merge

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

/run-all-tests

@ti-srebot ti-srebot merged commit eb30a69 into pingcap:master Jul 23, 2020
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Jul 23, 2020
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #4034

ran-huang added a commit that referenced this pull request Jul 23, 2020
* cherry pick #4001 to release-4.0

Signed-off-by: ti-srebot <[email protected]>

* resolve conflict

* delete tidb-specific-system-variables.md

Co-authored-by: Ran <[email protected]>
@@ -1,202 +1,909 @@
---
title: 系统变量
aliases: ['/docs-cn/dev/reference/configuration/tidb-server/mysql-variables/']
aliases: ['/docs-cn/dev/reference/configuration/tidb-server/mysql-variables/','/docs-cn/dev/tidb-specific-system-variables/','/docs-cn/dev/reference/configuration/tidb-server/tidb-specific-variables/','/tidb/dev/tidb-specific-system-variables/']
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'/tidb/dev/tidb-specific-system-variables/' -> '/zh/tidb/dev/tidb-specific-system-variables' @ran-huang

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in #4045

@ran-huang ran-huang deleted the merge_sys_vars branch July 24, 2020 10:01
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. size/large Changes of a large size. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. status/PTAL This PR is ready for reviewing. translation/from-docs This PR is translated from a PR in pingcap/docs.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants