diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-07 09:19:08 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-07 09:19:08 +0200 |
| commit | 2ff42076ff53abc031b666b5385bd7d70d4f691f (patch) | |
| tree | 32491dae362df4b57e5eb7e1b37a80c4f85ce20b | |
| parent | 8f7238ed5ca2b63646347b898af464466cd8b13e (diff) | |
| parent | b142e8a4b3e82c49600edc3469d09b4febb889ee (diff) | |
| download | php-git-2ff42076ff53abc031b666b5385bd7d70d4f691f.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78623: Regression caused by "SP call yields additional empty result set"
| -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 |
4 files changed, 8 insertions, 2 deletions
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index 0da1c9c0e9..e99a11c715 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -421,14 +421,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 } diff --git a/ext/pdo_mysql/tests/bug_39858.phpt b/ext/pdo_mysql/tests/bug_39858.phpt index 8b073997e1..db8afa99b8 100644 --- a/ext/pdo_mysql/tests/bug_39858.phpt +++ b/ext/pdo_mysql/tests/bug_39858.phpt @@ -18,6 +18,8 @@ if ($version < 50000) die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n", $matches[1], $matches[2], $matches[3], $version)); ?> +--XFAIL-- +nextRowset() problem with stored proc & emulation mode & mysqlnd --FILE-- <?php require_once(__DIR__ . 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 bf0350d7c1..e3b52944be 100644 --- a/ext/pdo_mysql/tests/bug_41997.phpt +++ b/ext/pdo_mysql/tests/bug_41997.phpt @@ -1,5 +1,7 @@ --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(__DIR__ . 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 07fae1c672..63a500b7b3 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt @@ -1,5 +1,7 @@ --TEST-- MySQL Prepared Statements and different column counts +--XFAIL-- +nextRowset() problem with stored proc & emulation mode & mysqlnd --SKIPIF-- <?php require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc'); |