Skip to content

Conversation

@ti-srebot
Copy link
Contributor

cherry-pick #4248 to release-2.1


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

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 12, 2020
9 tasks
@ti-srebot ti-srebot added the type/cherry-pick-for-release-2.1 This PR is cherry-picked to release-2.1 from a source PR. label Aug 12, 2020
@ti-srebot ti-srebot requested a review from TomShawn August 12, 2020 04:27
@TomShawn
Copy link
Contributor

@Joyinqin Please apply v2.1-specific changes in this PR according to pingcap/docs#3438.

@Joyinqin
Copy link
Contributor

/label status/PTAL

@ti-srebot ti-srebot added the status/PTAL This PR is ready for reviewing. label Aug 12, 2020
@ti-srebot
Copy link
Contributor Author

@TomShawn, PTAL.

1 similar comment
@ti-srebot
Copy link
Contributor Author

@TomShawn, PTAL.

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 17, 2020
@TomShawn TomShawn added the status/can-merge Indicates a PR has been approved by a committer. label Aug 17, 2020
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@TomShawn TomShawn merged commit ff923ca into pingcap:release-2.1 Aug 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. status/PTAL This PR is ready for reviewing. type/cherry-pick-for-release-2.1 This PR is cherry-picked to release-2.1 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants