Skip to content

Conversation

@Joyinqin
Copy link
Contributor

@Joyinqin Joyinqin commented Aug 12, 2020

What is changed, added or deleted? (Required)

  • Fix some small errors in the FAQ and sql-statements guide
  • The wording on sql-mode changing was a bit cryptic.
  • The SET sql statement now points out differences from MySQL.

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

#4111; pingcap/docs#3440

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

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Have version specific changes
  • Might cause conflicts

@Joyinqin
Copy link
Contributor Author

/label needs-cherry-pick-2.1 needs-cherry-pick-3.0, translation/no-need

@ti-srebot ti-srebot added the translation/no-need No need to translate this PR. label Aug 12, 2020
@ti-srebot
Copy link
Contributor

These labels are not found needs-cherry-pick-2.1 needs-cherry-pick-3.0.

@Joyinqin
Copy link
Contributor Author

/label needs-cherry-pick-2.1, needs-cherry-pick-3.0

@Joyinqin
Copy link
Contributor Author

/cc TomShawn

@ti-srebot ti-srebot requested a review from TomShawn August 12, 2020 02:04
Copy link
Contributor

@TomShawn TomShawn 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 Aug 12, 2020
@TomShawn TomShawn merged commit efff009 into pingcap:release-3.1 Aug 12, 2020
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Aug 12, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-2.1 in PR #4252

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

cherry pick to release-3.0 in PR #4253

TomShawn pushed a commit that referenced this pull request Aug 12, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: JoyinQ <56883733+Joyinqin@users.noreply.github.com>
@Joyinqin Joyinqin deleted the release-3.1 branch August 12, 2020 11:39
TomShawn added a commit that referenced this pull request Aug 17, 2020
* cherry pick #4248 to release-2.1

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

* Update tidb-faq.md

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: JoyinQ <56883733+Joyinqin@users.noreply.github.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@Joyinqin Joyinqin restored the release-3.1 branch August 27, 2020 10:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status/LGT1 Indicates that a PR has LGTM 1. translation/no-need No need to translate this PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants