[REVIEW NOTIFICATION]

This pull request has not been approved.

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment. After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

<details>

Reviewer can indicate their review by submitting an approval review. Reviewer can cancel approval by submitting a request changes review. </details>

<!--Review Notification Identifier-->

Signed-off-by: JmPotato [email protected]

What problem does this PR solve?

Make @@tidb_enable_local_txn sync between TiDB instances globally.

What is changed and how it works?

Add TiDBEnableLocalTxn variable to the checkEnableServerGlobalVar function.

Check List <!--REMOVE the items that are not applicable-->

Tests <!-- At least one of them must be included. -->

• Unit test
• Integration test
• Manual test (add detailed scripts or steps below)

On TiDB-0:

Then on TiDB-1:

Release note <!-- bugfixes or new feature need a release note -->

• No release note.

This pull request has been accepted and is ready to merge. <details>Commit hash: bc498bc13a2e2b5c53d103ff6b9abde40b2faf51</details>

/merge

/run-all-tests

Why wait double the grace period? I think it is more predictable to wait exactly the graceTime.

	logutil.BgLogger().Info("Killing process as grace period is over", zap.Int("pid", p.Pid), zap.Init("graceTime", graceTime))

<!-- Thank you for contributing to TiDB!

PR Title Format:

1. pkg [, pkg2, pkg3]: what's changed
2. *: what's changed

-->

What problem does this PR solve?

Issue Number: close #xxx <!-- REMOVE this line if no issue to close -->

Problem Summary: if enforced MPP, we push down projection to tiflash.

What is changed and how it works?

Proposal: xxx <!-- REMOVE this line if not applicable -->

What's Changed:

How it Works:

Related changes

• Need to cherry-pick to the release branch

Check List <!--REMOVE the items that are not applicable-->

Tests <!-- At least one of them must be included. -->

• Integration test

Release note <!-- bugfixes or new feature need a release note -->

• No release note<!-- Please write a release note here to describe the change you made when it is released to the users of TiDB. If your PR doesn't involve any change to TiDB(like test enhancements, RFC proposals...), you can write No release note. -->

@fzhedu: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

<details>

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository. </details>

Please edit this comment or add a new comment to complete the following information

Not a bug

1. Remove the 'type/bug' label
2. Add notes to indicate why it is not a bug

Duplicate bug

1. Add the 'type/duplicate' label
2. Add the link to the original bug

Bug

Note: Make Sure that 'component', and 'severity' labels are added Example for how to fill out the template: https://github.com/pingcap/tidb/issues/20100

1. Root Cause Analysis (RCA) (optional)

<!-- Write down the reason why this bug occurs -->

2. Symptom (optional)

<!-- What will the user see when this bug occurs. The error message may be in the terminal, log or monitoring -->

3. All Trigger Conditions (optional)

<!-- All the user scenarios that may trigger this bug -->

4. Workaround (optional)

5. Affected versions

<!-- In the format of [start_version:end_version], multiple version ranges are accepted. If the bug only affects the unreleased version, please input: "unreleased". For example:

Notes:

1. Do not use any white spaces in '[]'.
2. The range in '[]' is a closed interval
3. The version format is v$Major.$Minor.$Patch, the $Majoy and $Minor number in a version range should be the same. [v3.0.1:v3.1.2] is invalid because the $Minor number of the version range is different.

Example 1: [v3.0.1:v3.0.5], [v4.0.1:v4.0.5] Example 2: unreleased -->

6. Fixed versions

<!-- The first released version that contains this fix in each minor version. If the bug's affected version has been released, the fixed version should be a detailed version number; If the bug doesn't affect any released version, the fixed version can be "master";

Example 1: v3.0.13, v4.0.5 Example 2: master -->

Signed-off-by: Weizhen Wang [email protected]

<!-- Thank you for contributing to TiDB!

PR Title Format:

1. pkg [, pkg2, pkg3]: what's changed
2. *: what's changed

-->

What problem does this PR solve?

Issue Number: close #25658

Problem Summary:

What is changed and how it works?

if finding the subquery in the UPDATE's assignment list, the point_get return null.

What's Changed:

How it Works:

it change plan. the plan is shown below.

Check List <!--REMOVE the items that are not applicable-->

Tests <!-- At least one of them must be included. -->

• Manual test

CREATE TABLE `users` (
  `id` bigint(20) unsigned NOT NULL,
  `name` longtext DEFAULT NULL,
  `age` bigint(20) unsigned DEFAULT NULL,
  `company_id` bigint(20) DEFAULT NULL,
  `manager_id` bigint(20) unsigned DEFAULT NULL,
  `active` tinyint(1) DEFAULT NULL,
  `created_at` datetime(3) DEFAULT NULL,
  `updated_at` datetime(3) DEFAULT NULL,
  `deleted_at` datetime(3) DEFAULT NULL,
  PRIMARY KEY (`id`),
  KEY `idx_users_deleted_at` (`deleted_at`)
);
insert into users(id, company_id, name, updated_at) values(239, 15, 'Company 2 id 15', '2021-03-01 12:12:12.987');
create table companies(id bigint primary key, name longtext default null);
insert into companies values(14, 'Company 1 id 14');
insert into companies values(15, 'Company 2 id 15');
UPDATE `users` SET `company_id`=14,`name`=(SELECT `name` FROM `companies` WHERE companies.id = users.company_id),`updated_at`='2021-04-27 10:28:31.459' WHERE `id` = 239;

Release note

• No release note

Bug Report

Please answer these questions before submitting your issue. Thanks!

1. Minimal reproduce step (Required)

CREATE TABLE `users` (
  `id` bigint(20) unsigned NOT NULL,
  `name` longtext DEFAULT NULL,
  `age` bigint(20) unsigned DEFAULT NULL,
  `company_id` bigint(20) DEFAULT NULL,
  `manager_id` bigint(20) unsigned DEFAULT NULL,
  `active` tinyint(1) DEFAULT NULL,
  `created_at` datetime(3) DEFAULT NULL,
  `updated_at` datetime(3) DEFAULT NULL,
  `deleted_at` datetime(3) DEFAULT NULL,
  PRIMARY KEY (`id`),
  KEY `idx_users_deleted_at` (`deleted_at`)
);
insert into users(id, company_id, name, updated_at) values(239, 15, 'Company 2 id 15', '2021-03-01 12:12:12.987');
create table companies(id bigint primary key, name longtext default null);
insert into companies values(14, 'Company 1 id 14');
insert into companies values(15, 'Company 2 id 15');
UPDATE `users` SET `company_id`=14,`name`=(SELECT `name` FROM `companies` WHERE companies.id = users.company_id),`updated_at`='2021-04-27 10:28:31.459' WHERE `id` = 239;

2. What did you expect to see? (Required)

select * from users;

name is not null

3. What did you see instead (Required)

but it is null

4. What is your TiDB version? (Required)

master branch <!-- Paste the output of SELECT tidb_version() -->

@hawkingrei Please try to check if #25658 can be reproduced in v4.0, v5.0 & v5.1, so that we will decide how many branches that backports would be needed.

OK

@hawkingrei Please try to check if #25658 can be reproduced in v4.0, v5.0 & v5.1, so that we will decide how many branches that backports would be needed.

@xhebox: /merge is only allowed for the committers, you can assign this pull request to the committer in list by filling /assign @committer in the comment to help merge this pull request.

<details>

In response to this:

/merge

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository. </details>

/merge

@xhebox: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

<details>

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository. </details>

@hawkingrei: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

<details>

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository. </details>

This pull request has been accepted and is ready to merge. <details>Commit hash: 74bca01a7ad23d1fe2b8e757f302dc6b59ccb1c4</details>

/merge

[REVIEW NOTIFICATION]

This pull request has been approved by:

• bb7133
• xhebox

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment. After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

<details>

Reviewer can indicate their review by submitting an approval review. Reviewer can cancel approval by submitting a request changes review. </details>

<!--Review Notification Identifier-->

[REVIEW NOTIFICATION]

This pull request has been approved by:

• AilinKid
• bb7133

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment. After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

<details>

Reviewer can indicate their review by submitting an approval review. Reviewer can cancel approval by submitting a request changes review. </details>

<!--Review Notification Identifier-->

[REVIEW NOTIFICATION]

This pull request has been approved by:

• dveeden

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment. After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

<details>

Reviewer can indicate their review by submitting an approval review. Reviewer can cancel approval by submitting a request changes review. </details>

<!--Review Notification Identifier-->

+1, @dveeden Could you update this?

/cc @pingcap/sql-infra-reviewers

[REVIEW NOTIFICATION]

This pull request has been approved by:

• bb7133

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment. After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

<details>

Reviewer can indicate their review by submitting an approval review. Reviewer can cancel approval by submitting a request changes review. </details>

<!--Review Notification Identifier-->

/uncc bb7133

I'm not a reviewer, PTAL @TomShawn