diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-07 09:18:29 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-07 09:18:46 +0200 |
| commit | b142e8a4b3e82c49600edc3469d09b4febb889ee (patch) | |
| tree | bf309b2f0a8ad073fb6022756c9ab95438e983b1 /ext/pdo_mysql/mysql_statement.c | |
| parent | 6623e7ac51f0bafe85e013f9aed5340199e80c10 (diff) | |
| parent | 3322c78a889e278b738b2c483b4d09d0a9127369 (diff) | |
| download | php-git-b142e8a4b3e82c49600edc3469d09b4febb889ee.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78623: Regression caused by "SP call yields additional empty result set"
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 3f239b7e4c..9b880ea1fa 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -423,14 +423,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 } |