Skip to content

Fix sql-statement: use, update, truncate, trace#2889

Merged
yikeke merged 7 commits into
pingcap:masterfrom
tangenta:fix_use
Jun 16, 2020
Merged

Fix sql-statement: use, update, truncate, trace#2889
yikeke merged 7 commits into
pingcap:masterfrom
tangenta:fix_use

Conversation

@tangenta
Copy link
Copy Markdown
Contributor

@tangenta tangenta commented Jun 16, 2020

What is changed, added or deleted? (Required)

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

@yikeke
Copy link
Copy Markdown
Contributor

yikeke commented Jun 16, 2020

Please also align pingcap/docs-cn#3492 in this PR. @tangenta sql-statement-trace.md has been modified since SW.

@yikeke yikeke self-requested a review June 16, 2020 05:20
@yikeke yikeke added needs-cherry-pick-4.0 translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. labels Jun 16, 2020
Copy link
Copy Markdown
Contributor

@yikeke yikeke left a comment

Choose a reason for hiding this comment

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

LGTM

@yikeke
Copy link
Copy Markdown
Contributor

yikeke commented Jun 16, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 16, 2020
@ti-srebot
Copy link
Copy Markdown
Contributor

Your auto merge job has been accepted, waiting for:

  • 2813
  • 2790

@ti-srebot
Copy link
Copy Markdown
Contributor

/run-all-tests

@ti-srebot
Copy link
Copy Markdown
Contributor

@tangenta merge failed.

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

cherry pick to release-4.0 in PR #2907

ti-srebot added a commit that referenced this pull request Jun 16, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
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. 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.

3 participants