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

expression: rewrite builtin function: FROM_UNIXTIME #4454

Merged
merged 13 commits into from Sep 8, 2017

Conversation

Projects
None yet
4 participants
@XuHuaiyu
Contributor

XuHuaiyu commented Sep 6, 2017

@zz-jason zz-jason referenced this pull request Sep 6, 2017

Closed

rewrite builtin functions #4080

150 of 150 tasks complete
@zz-jason

This comment has been minimized.

Show comment
Hide comment
@zz-jason

zz-jason Sep 6, 2017

Member

@XuHuaiyu ci failed.

Member

zz-jason commented Sep 6, 2017

@XuHuaiyu ci failed.

@XuHuaiyu

This comment has been minimized.

Show comment
Hide comment
@XuHuaiyu

XuHuaiyu Sep 7, 2017

Contributor

PTAL @zz-jason

Contributor

XuHuaiyu commented Sep 7, 2017

PTAL @zz-jason

@XuHuaiyu

This comment has been minimized.

Show comment
Hide comment
@XuHuaiyu

XuHuaiyu Sep 7, 2017

Contributor

/run-all-test

Contributor

XuHuaiyu commented Sep 7, 2017

/run-all-test

Show outdated Hide outdated expression/builtin_time.go
Show outdated Hide outdated expression/builtin_time.go
Show outdated Hide outdated expression/builtin_time.go
Show outdated Hide outdated expression/builtin_time.go
Show outdated Hide outdated expression/builtin_time.go

@zz-jason zz-jason changed the title from expression, plan: rewrite builtin func from_unixtime to expression: rewrite builtin function: FROM_UNIXTIME Sep 7, 2017

@zz-jason

This comment has been minimized.

Show comment
Hide comment
@zz-jason

zz-jason Sep 8, 2017

Member

@XuHuaiyu plz resolve conflicts

Member

zz-jason commented Sep 8, 2017

@XuHuaiyu plz resolve conflicts

XuHuaiyu and others added some commits Sep 8, 2017

Merge branch 'master' of https://github.com/pingcap/tidb into xhy/fro…
…munix

Conflicts:
	expression/builtin_time.go
	expression/integration_test.go
	plan/typeinfer_test.go

@zz-jason zz-jason added the status/LGT1 label Sep 8, 2017

@zz-jason

This comment has been minimized.

Show comment
Hide comment
@zz-jason
Member

zz-jason commented Sep 8, 2017

@jackysp

jackysp approved these changes Sep 8, 2017

LGTM

@hanfei1991 hanfei1991 merged commit 3cd019b into master Sep 8, 2017

4 checks passed

ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
jenkins-ci-tidb/build Jenkins job succeeded.
Details
license/cla Contributor License Agreement is signed.
Details

@hanfei1991 hanfei1991 deleted the xhy/fromunix branch Sep 8, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment