Skip to content

*: add warnings for user variables (#3771)#3772

Merged
yikeke merged 2 commits into
pingcap:release-2.1from
ti-srebot:release-2.1-ad970b26c465
Jun 22, 2020
Merged

*: add warnings for user variables (#3771)#3772
yikeke merged 2 commits into
pingcap:release-2.1from
ti-srebot:release-2.1-ad970b26c465

Conversation

@ti-srebot
Copy link
Copy Markdown
Contributor

cherry-pick #3771 to release-2.1


Signed-off-by: Shuaipeng Yu jackysp@gmail.com

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

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

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@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 Jun 22, 2020
@ti-srebot ti-srebot requested review from kissmydb and yikeke June 22, 2020 10:50
Comment thread user-defined-variables.md Outdated

# 用户自定义变量

<<<<<<< HEAD
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Please resolve conflicts. @jackysp

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

done

Signed-off-by: Shuaipeng Yu <jackysp@gmail.com>
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 yikeke merged commit 1a57380 into pingcap:release-2.1 Jun 22, 2020
@yikeke yikeke deleted the release-2.1-ad970b26c465 branch June 22, 2020 11:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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