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: set the DDL query string instead of execute (#17407) #17415

Merged
merged 3 commits into from
May 29, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented May 26, 2020

cherry-pick #17407 to release-3.0


What problem does this PR solve?

Issue Number: close #17401

Problem Summary:
We didn't set the DDL query string properly. In an EXECUTE statement, we need to use the DDL query string we executing, not the execute query string.

What is changed and how it works?

Proposal: xxx

If the executor is an ExecuteExec, we set the query string to the real query string.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Side effects

Release note

  • Fix a bug that records the wrong query for the DDL statement within the EXECUTE statement.

@sre-bot
Copy link
Contributor Author

sre-bot commented May 26, 2020

/run-all-tests

@sre-bot sre-bot added sig/execution SIG execution priority/release-blocker This issue blocks a release. Please solve it ASAP. type/3.0-cherry-pick type/bugfix This PR fixes a bug. labels May 26, 2020
@sre-bot sre-bot added this to the v3.0.15 milestone May 26, 2020
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.

pls resolve the conflicts

@@ -637,6 +637,11 @@ func (a *ExecStmt) buildExecutor() (Executor, error) {
if err != nil {
return nil, err
}
<<<<<<< HEAD
=======
Copy link
Contributor

Choose a reason for hiding this comment

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

@wjhuang2016
Please fix the conflict.

Copy link
Contributor

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

@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

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

sre-bot commented May 28, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented May 28, 2020

@sre-bot merge failed.

@wshwsh12 wshwsh12 removed request for bb7133 and wshwsh12 May 28, 2020 04:25
@bb7133 bb7133 merged commit 30209e3 into pingcap:release-3.0 May 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority/release-blocker This issue blocks a release. Please solve it ASAP. sig/execution SIG execution status/can-merge Indicates a PR has been approved by a committer. type/bugfix This PR fixes a bug. type/3.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants