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

planner, util: new unfixed mutrow for TypeNull (#17893) #17934

Merged
merged 5 commits into from
Sep 2, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Jun 11, 2020

cherry-pick #17893 to release-2.1


What problem does this PR solve?

Issue Number: close #16027 #6252

Problem Summary:
TypeNull should be handled as unfixedLen field type. refer MySQL: https://github.com/mysql/mysql-server/blob/8.0/sql/field.h#L151

What is changed and how it works?

What's Changed:
makeMutRowBytesColumn for nil

How it Works:
The reason is mentioned in #15512 (comment).

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Integration test

Side effects

N/A

Release note

  • Fix panic when the child of HashJoin returns TypeNull column.

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 11, 2020

/run-all-tests

@@ -252,3 +252,267 @@ func (s *testIntegrationSuite) TestIssue15813(c *C) {
tk.MustExec("CREATE INDEX i0 ON t1(c0)")
tk.MustQuery("select /*+ MERGE_JOIN(t0, t1) */ * from t0, t1 where t0.c0 = t1.c0").Check(testkit.Rows())
}
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

@XuHuaiyu
Please fix the conflict.

Copy link
Contributor

@zimulala zimulala left a comment

Choose a reason for hiding this comment

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

LGTM

lysu
lysu previously approved these changes Jun 11, 2020
Copy link
Contributor

@lysu lysu left a comment

Choose a reason for hiding this comment

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

LGTM

@qw4990
Copy link
Contributor

qw4990 commented Jun 28, 2020

/run-all-tests

@qw4990 qw4990 removed their request for review June 28, 2020 02:57
@zz-jason zz-jason added status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. labels Jun 28, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@sre-bot merge failed.

@zz-jason
Copy link
Member

/merge

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@sre-bot merge failed.

@zz-jason
Copy link
Member

/merge

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@sre-bot merge failed.

@zz-jason
Copy link
Member

/merge

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@sre-bot merge failed.

@zz-jason
Copy link
Member

/merge

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@sre-bot merge failed.

@zz-jason
Copy link
Member

/build

@zz-jason
Copy link
Member

/run-all-tests

@zz-jason
Copy link
Member

/merge

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@sre-bot merge failed.

@zz-jason
Copy link
Member

/merge

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@sre-bot merge failed.

@XuHuaiyu
Copy link
Contributor

XuHuaiyu commented Sep 2, 2020

release-2.1 does not support create view, thus I removed the test case

@ti-srebot ti-srebot added status/LGT1 Indicates that a PR has LGTM 1. and removed status/LGT2 Indicates that a PR has LGTM 2. labels Sep 2, 2020
@XuHuaiyu
Copy link
Contributor

XuHuaiyu commented Sep 2, 2020

/merge

@XuHuaiyu XuHuaiyu added status/LGT2 Indicates that a PR has LGTM 2. and removed status/require-change status/LGT1 Indicates that a PR has LGTM 1. labels Sep 2, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

@XuHuaiyu XuHuaiyu merged commit e950cd2 into pingcap:release-2.1 Sep 2, 2020
@XuHuaiyu XuHuaiyu deleted the release-2.1-a689df0416c4 branch September 2, 2020 06:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/executor 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/2.1-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants