Skip to content

Conversation

@KASSADAR
Copy link
Contributor

@KASSADAR KASSADAR commented Jul 8, 2020

What is changed, added or deleted? (Required)

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

For views.md:

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

For constraints.md:

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

So when this PR is cherry-picked to 3.1/3.0 branches, the changes to constraints.md should be deleted. Please be aware. @ran-huang

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

@ti-srebot ti-srebot added the contribution This PR is from a community contributor. label Jul 8, 2020
@CLAassistant
Copy link

CLAassistant commented Jul 8, 2020

CLA assistant check
All committers have signed the CLA.

@yikeke yikeke requested a review from zz-jason July 8, 2020 03:15
@ghost ghost requested review from a user and removed request for zz-jason July 8, 2020 03:15
@yikeke yikeke requested review from XuHuaiyu, jackysp, ran-huang and zz-jason and removed request for a user July 8, 2020 03:15
@ti-srebot
Copy link
Contributor

Copy link
Member

@jackysp jackysp 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 15, 2020
constraints.md Outdated
---

# Constraints
# Constraint
Copy link

Choose a reason for hiding this comment

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

I think this should be plural, since there is more than one type of constraint.

Copy link
Contributor

Choose a reason for hiding this comment

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

Updated.

COMMIT;
```

* TiDB does not display foreign key information in the result of executing the `SHOW CREATE TABLE` statement.
Copy link

Choose a reason for hiding this comment

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

This may be fixed in pingcap/tidb#18360 before your PR merges. It will still be relevant to TiDB 4.0 and earlier, but not master.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think this PR can be merged within today. We can update the related content later when #18360 is merged.😄

@ti-srebot
Copy link
Contributor

@KASSADAR, please update your pull request.

@ti-srebot
Copy link
Contributor

No updates for a long time, close PR.

Copy link
Contributor

@ran-huang ran-huang left a comment

Choose a reason for hiding this comment

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

LGTM.
@nullnotnil @zz-jason PTAL. Thanks!

@ti-srebot ti-srebot removed the status/LGT1 Indicates that a PR has LGTM 1. label Jul 16, 2020
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Jul 16, 2020
@ran-huang ran-huang added the requires-followup This PR requires a follow-up task after being merged. label Jul 17, 2020
@ran-huang ran-huang merged commit becbadd into pingcap:master Jul 17, 2020
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jul 17, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-3.0 in PR #3313

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

cherry pick to release-3.1 in PR #3314

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

cherry pick to release-4.0 in PR #3315

ran-huang pushed a commit that referenced this pull request Jul 17, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: KASSADAR <KASSADAR@ALIYUN.COM>
ran-huang added a commit that referenced this pull request Jul 17, 2020
* cherry pick #3199 to release-3.1

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

* rm updates in constraints.md

Signed-off-by: Ran <huangran@pingcap.com>

* resolve conflict

Signed-off-by: Ran <huangran@pingcap.com>

Co-authored-by: KASSADAR <KASSADAR@ALIYUN.COM>
Co-authored-by: Ran <huangran@pingcap.com>
ran-huang added a commit that referenced this pull request Jul 17, 2020
* cherry pick #3199 to release-3.0

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

* apply version specific changes

Signed-off-by: Ran <huangran@pingcap.com>

Co-authored-by: KASSADAR <KASSADAR@ALIYUN.COM>
Co-authored-by: Ran <huangran@pingcap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

contribution This PR is from a community contributor. requires-followup This PR requires a follow-up task after being merged. status/LGT2 Indicates that a PR has LGTM 2. 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.

8 participants