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.

Sign up for GitHub

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

Jump to bottom

comment-syntax: add TiDB-specific comment syntax #3238

Merged
merged 26 commits into from
Jul 13, 2020
Merged

comment-syntax: add TiDB-specific comment syntax #3238

merged 26 commits into from
Jul 13, 2020

Conversation

ireneontheway
Copy link
Contributor

@ireneontheway ireneontheway commented Jul 10, 2020 •
edited by yikeke
Loading

  • 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 and others added 19 commits July 9, 2020 20:06
@ireneontheway
Update tidb-specific-system-variables.md
f40c5c1
@ireneontheway
Update tidb-specific-system-variables.md
ffac826 
adjust the format of markdown
@ireneontheway
Update tidb-specific-system-variables.md
165ea3d
@ireneontheway
Update tidb-specific-system-variables.md
945074c
@ireneontheway
Update tidb-specific-system-variables.md
d6eb450
fix indent
b79d661
@ireneontheway
Merge remote-tracking branch 'upstream/master'
c7e6542
@ireneontheway
Merge branch 'master' of https://github.com/ireneontheway/docs
a16adb3
@ireneontheway @yikeke
Apply suggestions from code review
9eb5992 
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
@ireneontheway
Update tidb-specific-system-variables.md
0ace8d8 
add space
add a space
d1c7d99
@ireneontheway
Update comment-syntax.md
6c68818
@ireneontheway
Merge remote-tracking branch 'upstream/master'
2ed9a91
@ireneontheway
Merge branch 'master' of https://github.com/ireneontheway/docs
fec657e
@ireneontheway
Revert "Update comment-syntax.md"
22612e1 
This reverts commit 6c68818.
Temporarily add back SHARD_ROW_ID_BITS
1bb1b63 
Allow CI to pass.
Merge branch 'master' into master
781a455
@ireneontheway
Merge remote-tracking branch 'upstream/master'
7cabbb3
@ireneontheway
comment-syntax: add TiDB-specific comment syntax
f451f61
@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?

ghost
ghost reviewed Jul 10, 2020
View reviewed changes
@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.

@ireneontheway
Apply suggestions from code review
3128e88 
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
yikeke
yikeke reviewed Jul 13, 2020
View reviewed changes
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
@ireneontheway @yikeke
Update comment-syntax.md
283705c 
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
@ireneontheway @yikeke
Update comment-syntax.md
f0b8d50 
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
@ireneontheway @yikeke
Apply suggestions from code review
c0916e4 
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
@ireneontheway
Copy link
Contributor Author

LGTM @yikeke

yikeke
yikeke approved these changes Jul 13, 2020
View reviewed changes
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
@ireneontheway @ti-srebot
cherry pick pingcap#3238 to release-3.0
0dc998c 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jul 13, 2020
Merged
5 tasks
@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
@ireneontheway @ti-srebot
cherry pick pingcap#3238 to release-3.1
e9bd409 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jul 13, 2020
Merged
5 tasks
@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
@ireneontheway @ti-srebot
cherry pick pingcap#3238 to release-4.0
608a6c1 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jul 13, 2020
Merged
5 tasks
@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
@ti-srebot
comment-syntax: add TiDB-specific comment syntax (#3238) (#3251)
d9ca027 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot added a commit that referenced this pull request Jul 13, 2020
@ti-srebot
comment-syntax: add TiDB-specific comment syntax (#3238) (#3250)
be2c4e7 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
yikeke added a commit that referenced this pull request Jul 15, 2020
@ti-srebot @ireneontheway @yikeke
comment-syntax: add TiDB-specific comment syntax (#3238) (#3249)
070a904 
* 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
Reviewers

@yikeke yikeke yikeke approved these changes

@ti-srebot ti-srebot ti-srebot approved these changes

Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ireneontheway @ti-srebot @yikeke