Skip to content

Conversation

@ghost
Copy link

@ghost ghost commented Jul 26, 2020

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

@ghost ghost added requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. needs-cherry-pick-2.1 labels Jul 26, 2020
Co-authored-by: Zhang Jian <zjsariel@gmail.com>
@yikeke yikeke requested a review from TomShawn July 27, 2020 05:02
@yikeke yikeke added the translation/doing This PR's assignee is translating this PR. label Jul 27, 2020
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.

Rest LGTM

Null not nil and others added 5 commits July 27, 2020 06:18
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@TomShawn
Copy link
Contributor

TomShawn commented Jul 28, 2020

@zz-jason PTAL again

Copy link
Member

@zz-jason zz-jason 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 28, 2020
@ti-srebot ti-srebot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 28, 2020
@TomShawn TomShawn added the status/can-merge Indicates a PR has been approved by a committer. label Jul 28, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

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

cherry pick to release-2.1 in PR #3438

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

cherry pick to release-3.0 in PR #3439

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

cherry pick to release-3.1 in PR #3440

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

cherry pick to release-4.0 in PR #3441

ti-srebot added a commit that referenced this pull request Jul 28, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot added a commit that referenced this pull request Jul 29, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot added a commit that referenced this pull request Jul 29, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot added a commit that referenced this pull request Jul 29, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@Joyinqin
Copy link
Contributor

/label translation/done

@ti-srebot ti-srebot added the translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. label Jul 29, 2020
@Joyinqin
Copy link
Contributor

/unlabel translation/doing

@ti-srebot ti-srebot removed the translation/doing This PR's assignee is translating this PR. label Jul 29, 2020
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/LGT2 Indicates that a PR has LGTM 2. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants