Skip to content

server: replace instead of truncate encoded result (#61080) #61193

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 5 commits into from
May 23, 2025
Merged

server: replace instead of truncate encoded result (#61080) #61193

merged 5 commits into from
May 23, 2025

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #61080

What problem does this PR solve?

Issue Number: close #61085

Problem Summary: Change behavior when convert result.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

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

Please refer to Release Notes Language Style Guide to write a quality release note.

Fix bug that character_set_results will truncate instead of replace on error char

@ti-chi-bot ti-chi-bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. ok-to-test Indicates a PR is ready to be tested. 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. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR. labels May 20, 2025
@ti-chi-bot ti-chi-bot mentioned this pull request May 20, 2025
Merged
13 tasks
@ti-chi-bot
Copy link
Member Author

@xhebox This PR has conflicts, I have hold it.
Please resolve them or ask others to resolve them, then comment /unhold to remove the hold label.

@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cherry-pick-approved Cherry pick PR approved by release team. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/cherry-pick-not-approved size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 20, 2025
@xhebox xhebox force-pushed the cherry-pick-61080-to-release-7.1 branch from 9841c91 to f13f391 Compare May 21, 2025 07:26
@ti-chi-bot ti-chi-bot bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 21, 2025
@xhebox
fix
2cbb866 
Signed-off-by: xhe <[email protected]>
@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 21, 2025
@xhebox
fix
96ac6d9 
Signed-off-by: xhe <[email protected]>
@ti-chi-bot ti-chi-bot bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 21, 2025
@xhebox
fix
b87b742 
Signed-off-by: xhe <[email protected]>
@codecov Codecov
Copy link

codecov bot commented May 21, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (release-7.1@82626f4). Learn more about missing BASE report.

Additional details and impacted files 
@@               Coverage Diff                @@
##             release-7.1     #61193   +/-   ##
================================================
  Coverage               ?   73.4940%           
================================================
  Files                  ?       1213           
  Lines                  ?     382167           
  Branches               ?          0           
================================================
  Hits                   ?     280870           
  Misses                 ?      83370           
  Partials               ?      17927
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label May 22, 2025
@ti-chi-bot ti-chi-bot bot added the approved label May 22, 2025
bb7133
bb7133 approved these changes May 22, 2025
View reviewed changes
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

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels May 22, 2025
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented May 22, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bb7133, tangenta

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented May 22, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-05-22 02:25:54.658496521 +0000 UTC m=+59259.075556084: ☑️ agreed by tangenta.
  • 2025-05-22 16:26:21.726315475 +0000 UTC m=+109686.143375023: ☑️ agreed by bb7133.

@xhebox xhebox removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 23, 2025
@xhebox
Copy link
Contributor

xhebox commented May 23, 2025

/unhold

@xhebox
Copy link
Contributor

xhebox commented May 23, 2025

/retest

@ti-chi-bot ti-chi-bot bot merged commit b28c84d into pingcap:release-7.1 May 23, 2025
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bb7133 bb7133 bb7133 approved these changes

@tangenta tangenta tangenta approved these changes

Assignees

@xhebox xhebox

Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm ok-to-test Indicates a PR is ready to be tested. 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. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ti-chi-bot @xhebox @bb7133 @tangenta