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

executor: fix unexpected error in union stmt. (#16073) #16137

Merged
merged 5 commits into from
Apr 9, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Apr 8, 2020

cherry-pick #16073 to release-3.0


What problem does this PR solve?

Issue Number: close #15790

Problem Summary: Union stmt will make some warning as error unexpected.

What is changed and how it works?

What's Changed: Set the StatementContext in Union stmt the same as Select stmt.

How it Works:

Related changes

  • Need to cherry-pick to the release branch 2.1,3.0,3.1,4.0

Check List

Tests

  • Unit test
  • Integration test

Release note

Make the union statement behavior is same as select statement.

Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 8, 2020

/run-all-tests

Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

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

LGTM

@zz-jason zz-jason added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 9, 2020
Copy link
Member

@jackysp jackysp left a comment

Choose a reason for hiding this comment

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

Please resolve the conflicts.

Copy link
Contributor

@AilinKid AilinKid left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@jackysp jackysp left a comment

Choose a reason for hiding this comment

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

LGTM

@jackysp
Copy link
Member

jackysp commented Apr 9, 2020

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 9, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 9, 2020

Your auto merge job has been accepted, waiting for 16138, 16003, 16141, 16146, 16142, 16139

@zz-jason zz-jason added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Apr 9, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 9, 2020

/run-all-tests

@sre-bot sre-bot merged commit d82cf4c into pingcap:release-3.0 Apr 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/expression sig/execution SIG execution status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/3.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants