diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-03 13:32:40 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-03 13:33:15 +0200 |
| commit | fd7309d194734cd5b7dfbcbc877018212eef035d (patch) | |
| tree | 707c091265b5eb9f58593c95366aa7f611d4a85c /ext/pdo_mysql/mysql_statement.c | |
| parent | 5dc37cc306717998cf9f4bc8283a735d34c66cef (diff) | |
| parent | b90cd91eba12b99ec095b4e315b6baafdfa2ea21 (diff) | |
| download | php-git-fd7309d194734cd5b7dfbcbc877018212eef035d.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #41997: 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 9b880ea1fa..3f239b7e4c 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)); + PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt) && stmt->row_count); } #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)); + PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt) && stmt->row_count); } #endif } |