ext/mysqlnd: Use iterated struct and remove dulicate SET_AFFECTED_ROWS#21713
Merged
kamil-tekiela merged 2 commits intophp:masterfrom May 5, 2026
Merged
ext/mysqlnd: Use iterated struct and remove dulicate SET_AFFECTED_ROWS#21713kamil-tekiela merged 2 commits intophp:masterfrom
kamil-tekiela merged 2 commits intophp:masterfrom
Conversation
ndossche
reviewed
Apr 11, 2026
Member
There was a problem hiding this comment.
Very outdated and inaccurate comment
| COPY_CLIENT_ERROR(&set->error_info, row_packet.error_info); | ||
| } else { | ||
| /* libmysql's documentation says it should be so for SELECT statements */ | ||
| UPSERT_STATUS_SET_AFFECTED_ROWS(conn->upsert_status, set->row_count); |
Member
There was a problem hiding this comment.
Huh? I don't see how this is set elsewhere
Member
Author
There was a problem hiding this comment.
After each time this method is called, the caller sets it.
bwoebi
added a commit
to bwoebi/php-src
that referenced
this pull request
May 6, 2026
* 'master' of github.com:php/php-src: (156 commits) PHP-8.2 is now for PHP 8.2.32-dev [skip ci] Add NEWS entries for 8.2.31 security issues Fix mbstring test with oniguruma deprecation GHSA-74r9-qxhc-fx53: [mbstring] Fix out-of-bounds access in mbfl_name2encoding_ex() GHSA-m8rr-4c36-8gq4: Consistently pass unsigned char to ctype.h functions GHSA-96wq-48vp-hh57: [metaphone] Fix signed integer overflow of char array offset GHSA-w476-322c-wpvm: [pdo_firebird] Fix SQL injection via NUL bytes in quoted strings GHSA-wm6j-2649-pv75: [mbstring] Fix null pointer dereference in php_mb_check_encoding() via mb_ereg_search_init() GHSA-7qg2-v9fj-4mwv: [fpm] XSS within status endpoint GHSA-hmxp-6pc4-f3vv: [soap] Fix broken Apache map value NULL check GHSA-m33r-qmcv-p97q: [soap] Fix use-after-free after header parsing failure with SOAP_PERSISTENCE_SESSION GHSA-85c2-q967-79q5: [soap] Fix stale SOAP_GLOBAL(ref_map) pointer with Apache Map Fix bad merge Fix compiler warning with glibc 2.43 support of C23 const-preserving standard library macros: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] Fix compiler warning with GCC 16: variable 'offset' set but not used [-Werror=unused-but-set-variable=] Fix compiler warning with glibc 2.43 support of C23 const-preserving standard library macros: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] ext/mysqlnd: Use iterated struct and remove dulicate SET_AFFECTED_ROWS (php#21713) ext/intl: Use ICU U16_APPEND_UNSAFE macro for UTF-16 surrogate pair encoding (php#21954) Fix incorrect trace stop type [ci skip] fix NEWS last entry ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.