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, infoschema: fix display of on update CURRENT_TIMESTAMP with decimal (#11480) #12462

Merged
merged 2 commits into from
Nov 6, 2019

Conversation

tangenta
Copy link
Contributor

Cherry-pick #11480. Blocked by pingcap/parser#565.

@tangenta tangenta added type/bugfix This PR fixes a bug. sig/execution SIG execution type/2.1 cherry-pick labels Sep 28, 2019
Copy link
Contributor

@winkyao winkyao left a comment

Choose a reason for hiding this comment

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

LGTM

bb7133
bb7133 previously approved these changes Oct 2, 2019
Copy link
Member

@bb7133 bb7133 left a comment

Choose a reason for hiding this comment

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

LGTM

@bb7133
Copy link
Member

bb7133 commented Oct 2, 2019

please fiix the CI

@tangenta
Copy link
Contributor Author

tangenta commented Oct 8, 2019

@bb7133 PTAL at pingcap/parser#565.

@zz-jason
Copy link
Member

@tangenta please resolve conflicts

@tangenta
Copy link
Contributor Author

@zz-jason PTAL at pingcap/parser#565.

@zz-jason
Copy link
Member

zz-jason commented Nov 5, 2019

@tangenta the PR on parser has been merged. Please update this PR so we can merge it as well.

@tangenta tangenta force-pushed the release2.1-fix-curts-display branch from 13043f8 to 6a41408 Compare November 5, 2019 09:20
@tangenta tangenta force-pushed the release2.1-fix-curts-display branch from 6a41408 to f5f79fa Compare November 6, 2019 03:03
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 status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. labels Nov 6, 2019
@sre-bot
Copy link
Contributor

sre-bot commented Nov 6, 2019

Your auto merge job has been accepted, waiting for 13141, 13143

@sre-bot
Copy link
Contributor

sre-bot commented Nov 6, 2019

/run-all-tests

@sre-bot sre-bot merged commit fc9b61b into pingcap:release-2.1 Nov 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants