diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-07 09:17:03 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-07 09:17:29 +0200 |
| commit | 3322c78a889e278b738b2c483b4d09d0a9127369 (patch) | |
| tree | 65cad7a59b8b13883e077748f7c059d4fae19150 /ext/pdo_mysql/mysql_statement.c | |
| parent | 239e2dda6487761271fa5258e642b716dd79a02b (diff) | |
| parent | 114c03b9a6122d85ec5ccaafc031ee47e7c26df8 (diff) | |
| download | php-git-3322c78a889e278b738b2c483b4d09d0a9127369.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
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 5eb0f9601e..4e23d10245 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 } |