Skip to content

Conversation

@ti-srebot
Copy link
Contributor

cherry-pick #3238 to release-3.0


  • Correct the description of MySQL-specific comments.
  • Explain TiDB-specific comments like /*T! xxx */.

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

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot added size/small Changes of a small size. type/cherry-pick-for-release-3.0 This PR is cherry-picked to release-3.0 from a source PR. requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. labels Jul 13, 2020
SELECT STRAIGHT_JOIN col1 FROM table1,table2 WHERE ...
```

<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

Please fix the conflicts. @ireneontheway

Comment on lines 140 to 141
* `/*T! Specific code */`: This syntax can only be parsed and executed by TiDB, and be ignored in other databases.
* `/*T![feature_id] Specific code */`: This syntax is used to ensure compatibility between different versions of TiDB. TiDB can parse the SQL fragment in this comment only if it implements the corresponding feature of `feature_id` in the current version. For example, as the `AUTO_RANDOM` feature is introduced in v3.1.1, this version of TiDB can parse `/*T![auto_rand] auto_random */` into `auto_random`. Because the `AUTO_RANDOM` feature is not implemented in v3.0.0, the SQL statement fragment above is ignored.
Copy link
Contributor

Choose a reason for hiding this comment

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

@ireneontheway
Copy link
Contributor

LGTM @yikeke

Copy link
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

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 15, 2020
@yikeke yikeke merged commit 070a904 into pingcap:release-3.0 Jul 15, 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. size/small Changes of a small size. status/LGT1 Indicates that a PR has LGTM 1. type/cherry-pick-for-release-3.0 This PR is cherry-picked to release-3.0 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants