Skip to content

with ATTR_EMULATE_PREPARES = false, don't ignore deadlock errors #5937

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

Closed
wants to merge 2 commits into from
Closed

with ATTR_EMULATE_PREPARES = false, don't ignore deadlock errors #5937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efca656
with ATTR_EMULATE_PREPARES = false, don't ignore deadlock errors
houxiaoxian Jul 31, 2020
6700be2
only modify pdo_mysql_stmt_set_row_count, no custom error handler
SjonHortensius Sep 1, 2020
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
4 changes: 3 additions & 1 deletion NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ PHP NEWS

- PDO:
. Fixed bug #80027 (Terrible performance using $query->fetch on queries with
many bind parameters (Matteo)
many bind parameters) (Matteo)
. Fixed bug #79914 (PHP PDO mysqlnd ignores InnoDB deadlock errors).
(houxiaoxian)

- Standard:
. Fixed bug #79986 (str_ireplace bug with diacritics characters). (cmb)
Expand Down
12 changes: 12 additions & 0 deletions ext/pdo_mysql/mysql_statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,21 @@ static void pdo_mysql_stmt_set_row_count(pdo_stmt_t *stmt) /* {{{ */
{
zend_long row_count;
pdo_mysql_stmt *S = stmt->driver_data;
pdo_mysql_db_handle *H = S->H;
row_count = (zend_long) mysql_stmt_affected_rows(S->stmt);
if (row_count != (zend_long)-1) {
stmt->row_count = row_count;
} else {
if (!H->buffered) {
S->result = mysql_use_result(H->server);
} else {
S->result = mysql_store_result(H->server);
}

S->stmt = NULL;
stmt->dbh->methods = NULL;
pdo_mysql_error_stmt(stmt);
PDO_DBG_VOID_RETURN;
}
}
/* }}} */
Expand Down