Skip to content

ext/mysqlnd: Use iterated struct and remove dulicate SET_AFFECTED_ROWS #21713

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

Open
kamil-tekiela wants to merge 2 commits into
base: master
Choose a base branch
from
+3 −13
Open

ext/mysqlnd: Use iterated struct and remove dulicate SET_AFFECTED_ROWS #21713

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eec86c5
Use iterated struct and remove dulicate SET_AFFECTED_ROWS
kamil-tekiela Apr 10, 2026
9b3640f
Remove outdated comment
kamil-tekiela Apr 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions ext/mysqlnd/mysqlnd_result.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,9 +722,6 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND_CONN_DATA * const c

if (ret == FAIL) {
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);
Copy link
Copy Markdown
Member

@ndossche ndossche Apr 11, 2026

Choose a reason for hiding this comment

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

Huh? I don't see how this is set elsewhere

Copy link
Copy Markdown
Member Author

@kamil-tekiela kamil-tekiela Apr 11, 2026

Choose a reason for hiding this comment

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

After each time this method is called, the caller sets it.

}
DBG_INF_FMT("ret=%s row_count=%u warnings=%u server_status=%u",
ret == PASS? "PASS":"FAIL",
Expand Down Expand Up @@ -1004,18 +1001,11 @@ MYSQLND_METHOD(mysqlnd_res, fetch_into)(MYSQLND_RES * result, const unsigned int
}
}
if (flags & MYSQLND_FETCH_ASSOC) {
/* zend_hash_quick_update needs length + trailing zero */
/* QQ: Error handling ? */
/*
zend_hash_quick_update does not check, as add_assoc_zval_ex do, whether
the index is a numeric and convert it to it. This however means constant
hashing of the column name, which is not needed as it can be precomputed.
*/
Z_TRY_ADDREF_P(data);
if (meta->fields[i].is_numeric == FALSE) {
zend_hash_update(row_ht, meta->fields[i].sname, data);
if (field->is_numeric == FALSE) {
zend_hash_update(row_ht, field->sname, data);
} else {
zend_hash_index_update(row_ht, meta->fields[i].num_key, data);
zend_hash_index_update(row_ht, field->num_key, data);
}
}

Expand Down
Loading