diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-29 14:18:04 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-29 14:18:04 +0100 |
| commit | 1a7bcd98927f4fde7b4cf9971f8b08c3b83bed31 (patch) | |
| tree | 2a7ddafebefc706c7b0e5bf202ea696c488ea36e /ext/pdo_mysql/mysql_statement.c | |
| parent | 489b5328c089073377f21aa616924592163dbc6b (diff) | |
| parent | 0044a81fbbe0807158a626c4c5a4d8f4d379247f (diff) | |
| download | php-git-1a7bcd98927f4fde7b4cf9971f8b08c3b83bed31.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Handle errors during PDO row fetch
Diffstat (limited to 'ext/pdo_mysql/mysql_statement.c')
| -rw-r--r-- | ext/pdo_mysql/mysql_statement.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index 11defa55f5..00a2583cdf 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -666,11 +666,7 @@ static int pdo_mysql_stmt_fetch(pdo_stmt_t *stmt, enum pdo_fetch_orientation ori #endif /* PDO_USE_MYSQLND */ if ((S->current_data = mysql_fetch_row(S->result)) == NULL) { -#ifdef PDO_USE_MYSQLND - if (S->result->unbuf && !S->result->unbuf->eof_reached && mysql_errno(S->H->server)) { -#else - if (!S->result->eof && mysql_errno(S->H->server)) { -#endif + if (!S->H->buffered && mysql_errno(S->H->server)) { pdo_mysql_error_stmt(stmt); } PDO_DBG_RETURN(0); |