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

Merged
merged 4 commits into from
Apr 8, 2020
Merged

Conversation

wshwsh12
Copy link
Contributor

@wshwsh12 wshwsh12 commented Apr 3, 2020

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.

@wshwsh12 wshwsh12 requested a review from a team as a code owner April 3, 2020 16:18
@ghost ghost requested review from SunRunAway and removed request for a team April 3, 2020 16:18
@wshwsh12 wshwsh12 added sig/execution SIG execution type/bugfix This PR fixes a bug. needs-cherry-pick-2.1 labels Apr 3, 2020
Copy link
Contributor

@SunRunAway SunRunAway 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
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

@codecov
Copy link

codecov bot commented Apr 7, 2020

Codecov Report

Merging #16073 into master will not change coverage by %.
The diff coverage is n/a.

@@             Coverage Diff             @@
##             master     #16073   +/-   ##
===========================================
  Coverage   80.4895%   80.4895%           
===========================================
  Files           505        505           
  Lines        135312     135312           
===========================================
  Hits         108912     108912           
  Misses        17913      17913           
  Partials       8487       8487           

@wshwsh12 wshwsh12 requested review from jackysp and removed request for XuHuaiyu, qw4990 and fzhedu April 7, 2020 16:39
@jackysp
Copy link
Member

jackysp commented Apr 8, 2020

/merge

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

sre-bot commented Apr 8, 2020

/run-all-tests

@sre-bot sre-bot merged commit 96d96ce into pingcap:master Apr 8, 2020
sre-bot pushed a commit to sre-bot/tidb that referenced this pull request Apr 8, 2020
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor

sre-bot commented Apr 8, 2020

cherry pick to release-2.1 in PR #16136

sre-bot pushed a commit to sre-bot/tidb that referenced this pull request Apr 8, 2020
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor

sre-bot commented Apr 8, 2020

cherry pick to release-3.0 in PR #16137

sre-bot pushed a commit to sre-bot/tidb that referenced this pull request Apr 8, 2020
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor

sre-bot commented Apr 8, 2020

cherry pick to release-3.1 in PR #16138

@sre-bot
Copy link
Contributor

sre-bot commented Apr 8, 2020

cherry pick to release-4.0 in PR #16139

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. type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unexpected "Data truncation: %s value is out of range in '%s'" error in UNION query
5 participants