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

*: rewrite builtin function: CURRENT_TIME #4360

Merged
merged 20 commits into from Sep 5, 2017

Conversation

Projects
None yet
6 participants
@XuHuaiyu
Contributor

XuHuaiyu commented Aug 29, 2017

// See https://dev.mysql.com/doc/refman/5.7/en/date-and-time-functions.html#function_curtime
func (b *builtinCurrentTimeSig) eval(row []types.Datum) (d types.Datum, err error) {
args, err := b.evalArgs(row)
func (b *builtinCurrentTime0ArgSig) evalDuration(row []types.Datum) (types.Duration, bool, error) {

This comment has been minimized.

@zz-jason

zz-jason Aug 29, 2017

Member

move the comment back

@zz-jason

zz-jason Aug 29, 2017

Member

move the comment back

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

XuHuaiyu added some commits Aug 29, 2017

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

Conflicts:
	plan/typeinfer_test.go
@jackysp

This comment has been minimized.

Show comment
Hide comment
@jackysp

jackysp Aug 29, 2017

Member

LGTM

Member

jackysp commented Aug 29, 2017

LGTM

@breeswish

This comment has been minimized.

Show comment
Hide comment
@breeswish

breeswish Aug 30, 2017

Member

Please resolve conflicts

Member

breeswish commented Aug 30, 2017

Please resolve conflicts

@zz-jason zz-jason referenced this pull request Aug 30, 2017

Closed

rewrite builtin functions #4080

150 of 150 tasks complete

XuHuaiyu and others added some commits Aug 30, 2017

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

Conflicts:
	parser/parser.y
	plan/typeinfer_test.go

@zz-jason zz-jason changed the title from *: rewrite builtin function current_time to *: rewrite builtin function: CURRENT_TIME Aug 31, 2017

@XuHuaiyu

This comment has been minimized.

Show comment
Hide comment
@XuHuaiyu
Contributor

XuHuaiyu commented Sep 1, 2017

@zz-jason

This comment has been minimized.

Show comment
Hide comment
@zz-jason

zz-jason Sep 1, 2017

Member

LGTM
@breeswish PTAL

Member

zz-jason commented Sep 1, 2017

LGTM
@breeswish PTAL

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

@zz-jason

This comment has been minimized.

Show comment
Hide comment
@zz-jason

zz-jason Sep 2, 2017

Member

@XuHuaiyu plz resolve conflicts

Member

zz-jason commented Sep 2, 2017

@XuHuaiyu plz resolve conflicts

XuHuaiyu added some commits Sep 5, 2017

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

Conflicts:
	expression/builtin_time.go
	expression/builtin_time_test.go
Merge branch 'master' of https://github.com/pingcap/tidb into xhy/cur…
…time

Conflicts:
	plan/typeinfer_test.go
@shenli

This comment has been minimized.

Show comment
Hide comment
@shenli

shenli Sep 5, 2017

Member

LGTM

Member

shenli commented Sep 5, 2017

LGTM

@shenli

shenli approved these changes Sep 5, 2017

@shenli

This comment has been minimized.

Show comment
Hide comment
@shenli

shenli Sep 5, 2017

Member

/run-all-test

Member

shenli commented Sep 5, 2017

/run-all-test

@shenli shenli merged commit 6ad9d35 into master Sep 5, 2017

10 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
jenkins-ci-tidb/common-test Jenkins job succeeded.
Details
jenkins-ci-tidb/integration-common-test Jenkins job succeeded.
Details
jenkins-ci-tidb/integration-ddl-test Jenkins job succeeded.
Details
jenkins-ci-tidb/mybatis-test Jenkins job succeeded.
Details
jenkins-ci-tidb/sqllogic-test Jenkins job succeeded.
Details
jenkins-ci-tidb/unit-test Jenkins job succeeded.
Details
license/cla Contributor License Agreement is signed.
Details

@shenli shenli deleted the xhy/curtime branch Sep 5, 2017

mccxj added a commit to mccxj/tidb that referenced this pull request Sep 7, 2017

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