Skip to content

Conversation

@ti-srebot
Copy link
Contributor

cherry-pick #3418 to release-3.1


What is changed, added or deleted? (Required)

This fixes some small errors in the FAQ and sql-statements guide:
-The FAQ implied optimistic locking was still the default, and said SELECT FOR UPDATE does not lock.

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

This will require backporting, but the following version specific changes apply:

  • default locking in 2.1 is optimistic, so the section SELECT FOR UPDATE will need rewording.
  • SQL Plan Management is a 4.0+ feature
  • coprocessor cache is a 4.0+ feature

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

  • 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 added type/cherry-pick-for-release-3.1 This PR is cherry-picked to release-3.1 from a source PR. requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. labels Jul 28, 2020
@ti-srebot ti-srebot requested review from TomShawn and zz-jason July 28, 2020 06:47
@ti-srebot ti-srebot assigned ghost Jul 28, 2020
@TomShawn
Copy link
Contributor

@nullnotnil Please apply v3.1-specific changes in this PR and delete /faq/sql-faq.md.

@ghost
Copy link

ghost commented Jul 28, 2020

@TomShawn Done

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

/run-all-tests

@ti-srebot ti-srebot merged commit 5bed0f6 into pingcap:release-3.1 Jul 29, 2020
mmyj pushed a commit to mmyj/docs that referenced this pull request Aug 20, 2020
* Add Dashboard Access, Overview and Profiling Page

* add empty documents to fix dead link

* add profiling document

* Update dashboard-access.md

* update category

* update 4 images

* image changes from pingcap#3440

* Apply suggestions from code review

Co-authored-by: Wenxuan <hi@breeswish.org>

* address comments from lilian

Co-authored-by: Lilian Lee <lilin@pingcap.com>

Co-authored-by: Wenxuan <hi@breeswish.org>
Co-authored-by: Lilian Lee <lilin@pingcap.com>
Co-authored-by: pingcap-github-bot <sre-bot@pingcap.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. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/cherry-pick-for-release-3.1 This PR is cherry-picked to release-3.1 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants