Skip to content

executor: fix the returned field count of the prepare statement (#30981)#30996

Closed
ti-srebot wants to merge 2 commits intopingcap:release-5.3from
ti-srebot:release-5.3-404895c04a51
Closed

executor: fix the returned field count of the prepare statement (#30981)#30996
ti-srebot wants to merge 2 commits intopingcap:release-5.3from
ti-srebot:release-5.3-404895c04a51

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Dec 24, 2021 •
edited
Loading

cherry-pick #30981 to release-5.3
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/30996

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/30996:release-5.3-404895c04a51

What problem does this PR solve?

Issue Number: close #30971

Problem Summary:

What is changed and how it works?

Return the correct fields count for the prepare statement...
The old code only consider the 'select' statement and ignore all the other cases.
And 'select ... union select ...' is a counter-example trigger the bug.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Fix a bug that the `mysql_stmt_field_count` returned to mysql client is incorrect in prepare protocal when handling union statement.

@tiancaiamao @ti-srebot
cherry pick pingcap#30981 to release-5.3
6dd5ad4 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 24, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • ichn-hu

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Details

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 24, 2021

@ti-srebot: This cherry pick PR is for a release branch and has not yet been approved by release team.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, it must first be approved by the collaborators.

AFTER it has been approved by collaborators, please ping the release team in a comment to request a cherry pick review.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ti-srebot
Copy link
Contributor Author

ti-srebot commented Dec 24, 2021

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Dec 24, 2021
@ti-srebot ti-srebot mentioned this pull request Dec 24, 2021
Merged
12 tasks
@ti-srebot ti-srebot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/5.3-cherry-pick labels Dec 24, 2021
@ti-srebot ti-srebot requested review from bb7133 and ichn-hu December 24, 2021 01:25
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Dec 24, 2021

@tiancaiamao you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 24, 2021
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 24, 2021
@tiancaiamao
Copy link
Contributor

tiancaiamao commented Dec 24, 2021

/run-check_dev

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 24, 2021
@guo-shaoge
Copy link
Collaborator

guo-shaoge commented Feb 15, 2022

@tiancaiamao merge remainder~

@tiancaiamao
Copy link
Contributor

tiancaiamao commented Feb 23, 2022

This fix may introduce another issue #31141
It's not cherry-picked to other branches, so I'd rather leave the bug there on old versions.

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

Reviewers

@ichn-hu ichn-hu ichn-hu approved these changes

@bb7133 bb7133 Awaiting requested review from bb7133

Assignees

@tiancaiamao tiancaiamao

Labels

do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/LGT1 Indicates that a PR has LGTM 1. type/5.3-cherry-pick

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ti-srebot @ti-chi-bot @tiancaiamao @guo-shaoge @ichn-hu