Skip to content

Conversation

@ireneontheway
Copy link
Contributor

@ireneontheway ireneontheway commented Jul 10, 2020

  • Correct the description of MySQL-specific comments.
  • Explain TiDB-specific comments like /*T! xxx */.

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

@ireneontheway
Copy link
Contributor Author

/label needs-cherry-pick-3.1,needs-cherry-pick-4.0,size/small

@ti-srebot ti-srebot added needs-cherry-pick-3.1 size/small Changes of a small size. labels Jul 10, 2020
@ireneontheway
Copy link
Contributor Author

@yikeke Can you help review the file?

@yikeke yikeke self-requested a review July 10, 2020 15:26
@yikeke yikeke added status/PTAL This PR is ready for reviewing. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. labels Jul 10, 2020
@ti-srebot
Copy link
Contributor

@nullnotnil, @yikeke, PTAL.

Co-authored-by: Null not nil <67764674+nullnotnil@users.noreply.github.com>
@yikeke yikeke marked this pull request as ready for review July 13, 2020 05:29
@yikeke yikeke added needs-cherry-pick-3.0 requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. labels Jul 13, 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.

Rest LGTM

@yikeke yikeke added status/LGT1 Indicates that a PR has LGTM 1. status/require-change Needs the author to address comments. and removed status/PTAL This PR is ready for reviewing. labels Jul 13, 2020
ireneontheway and others added 3 commits July 13, 2020 17:29
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
@ireneontheway
Copy link
Contributor Author

LGTM @yikeke

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

@yikeke
Copy link
Contributor

yikeke commented Jul 13, 2020

/merge

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

/run-all-tests

@ti-srebot ti-srebot merged commit 0af9946 into pingcap:master Jul 13, 2020
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jul 13, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-3.0 in PR #3249

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jul 13, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-3.1 in PR #3250

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jul 13, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #3251

ti-srebot added a commit that referenced this pull request Jul 13, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot added a commit that referenced this pull request Jul 13, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
yikeke added a commit that referenced this pull request Jul 15, 2020
* cherry pick #3238 to release-3.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* Update comment-syntax.md

* Update comment-syntax.md

 remove changes from https://github.com/pingcap/docs-cn/pull/3477/files

Co-authored-by: ireneontheway <48651140+ireneontheway@users.noreply.github.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
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/small Changes of a small size. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. status/require-change Needs the author to address comments. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants