diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-07 08:58:11 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-07 09:15:51 +0200 |
| commit | 114c03b9a6122d85ec5ccaafc031ee47e7c26df8 (patch) | |
| tree | 8f929e5a0a63716f1fd80e3b7ce32392209f9628 /ext/pdo_mysql/mysql_statement.c | |
| parent | 545412a6cdefbb6d6bddf29a636832873349e10c (diff) | |
| download | php-git-114c03b9a6122d85ec5ccaafc031ee47e7c26df8.tar.gz | |
Fix #78623: Regression caused by "SP call yields additional empty result set"
This reverts commit 41a4379cb45419a376043ca5f8c5a2bca82cea7c.
Diffstat (limited to 'ext/pdo_mysql/mysql_statement.c')
| -rw-r--r-- | ext/pdo_mysql/mysql_statement.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index 950aa64f07..e230cfbf05 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -425,14 +425,14 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt) /* {{{ */ pdo_mysql_error_stmt(stmt); PDO_DBG_RETURN(0); } else { - PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt) && stmt->row_count); + PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt)); } #else if (mysql_next_result(H->server) > 0) { pdo_mysql_error_stmt(stmt); PDO_DBG_RETURN(0); } else { - PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt) && stmt->row_count); + PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt)); } #endif } |