Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not merge until v6.5.6: sysvar: add system variable tidb_opt_enable_hash_join (#15105) (#15265) #15586

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #15265

This is an automated cherry-pick of #15105

What is changed, added or deleted? (Required)

As tittle

Which TiDB version(s) do your changes apply to? (Required)

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions (in Chinese).

  • master (the latest development version)
  • v7.4 (TiDB 7.4 versions)
  • v7.3 (TiDB 7.3 versions)
  • v7.2 (TiDB 7.2 versions)
  • v7.1 (TiDB 7.1 versions)
  • v7.0 (TiDB 7.0 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)

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

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added the lgtm label Dec 1, 2023
@ti-chi-bot ti-chi-bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR. type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes. v7.4 This PR/issue applies to TiDB v7.4. labels Dec 1, 2023
@ti-chi-bot ti-chi-bot self-assigned this Dec 1, 2023
@hfxsd hfxsd self-assigned this Dec 1, 2023
@qiancai qiancai changed the title sysvar: add system variable tidb_opt_enable_hash_join (#15105) (#15265) Do not merge until v6.5.6: sysvar: add system variable tidb_opt_enable_hash_join (#15105) (#15265) Dec 1, 2023
@qiancai qiancai changed the title Do not merge until v6.5.6: sysvar: add system variable tidb_opt_enable_hash_join (#15105) (#15265) sysvar: add system variable tidb_opt_enable_hash_join (#15105) (#15265) Dec 1, 2023
@ti-chi-bot ti-chi-bot bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 1, 2023
@hfxsd hfxsd removed the type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. label Dec 1, 2023
@qiancai qiancai changed the title sysvar: add system variable tidb_opt_enable_hash_join (#15105) (#15265) Do not merge until v6.5.6: sysvar: add system variable tidb_opt_enable_hash_join (#15105) (#15265) Dec 1, 2023
@qiancai
Copy link
Collaborator

qiancai commented Dec 7, 2023

/approve

Copy link

ti-chi-bot bot commented Dec 7, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: qiancai

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the approved label Dec 7, 2023
@ti-chi-bot ti-chi-bot bot merged commit 2dff627 into pingcap:release-6.5 Dec 7, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm needs-1-more-lgtm Indicates a PR needs 1 more LGTM. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR. type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes. v7.4 This PR/issue applies to TiDB v7.4.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants