diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-03 13:30:05 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-03 13:31:24 +0200 |
| commit | b90cd91eba12b99ec095b4e315b6baafdfa2ea21 (patch) | |
| tree | 2d9d8e9092f1f6739995ee9b81a1ffa84b5c6816 | |
| parent | d66e0f165d41788d5eb576cadc273ae8205ee567 (diff) | |
| parent | 41a4379cb45419a376043ca5f8c5a2bca82cea7c (diff) | |
| download | php-git-b90cd91eba12b99ec095b4e315b6baafdfa2ea21.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #41997: SP call yields additional empty result set
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/pdo_mysql/mysql_statement.c | 4 | ||||
| -rw-r--r-- | ext/pdo_mysql/tests/bug_39858.phpt | 2 | ||||
| -rw-r--r-- | ext/pdo_mysql/tests/bug_41997.phpt | 2 | ||||
| -rw-r--r-- | ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt | 2 |
5 files changed, 5 insertions, 8 deletions
@@ -30,6 +30,9 @@ PHP NEWS - ODBC: . Fixed bug #78473 (odbc_close() closes arbitrary resources). (cmb) +- PDO_MySQL: + . Fixed bug #41997 (SP call yields additional empty result set). (cmb) + 29 Aug 2019, PHP 7.3.9 - Core: diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index 4e23d10245..5eb0f9601e 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 } diff --git a/ext/pdo_mysql/tests/bug_39858.phpt b/ext/pdo_mysql/tests/bug_39858.phpt index ec4c9586cc..0ae0dce714 100644 --- a/ext/pdo_mysql/tests/bug_39858.phpt +++ b/ext/pdo_mysql/tests/bug_39858.phpt @@ -18,8 +18,6 @@ if ($version < 50000) die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n", $matches[0], $matches[1], $matches[2], $version)); ?> ---XFAIL-- -nextRowset() problem with stored proc & emulation mode & mysqlnd --FILE-- <?php require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc'); diff --git a/ext/pdo_mysql/tests/bug_41997.phpt b/ext/pdo_mysql/tests/bug_41997.phpt index 3a90244365..a9f8322cf8 100644 --- a/ext/pdo_mysql/tests/bug_41997.phpt +++ b/ext/pdo_mysql/tests/bug_41997.phpt @@ -1,7 +1,5 @@ --TEST-- PDO MySQL Bug #41997 (stored procedure call returning single rowset blocks future queries) ---XFAIL-- -nextRowset() problem with stored proc & emulation mode & mysqlnd --SKIPIF-- <?php require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc'); diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt index 02f8c682b2..be3771aa99 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt @@ -1,7 +1,5 @@ --TEST-- MySQL Prepared Statements and different column counts ---XFAIL-- -nextRowset() problem with stored proc & emulation mode & mysqlnd --SKIPIF-- <?php require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc'); |