Fix #78623: Regression caused by "SP call yields additional empty result set"

This reverts commit 41a4379cb45419a376043ca5f8c5a2bca82cea7c.

diff --git a/NEWS b/NEWS
index a04f3bf3f8cc3466d32529972af1dfc71d342300..62b6d7342f40be523cb9ea444493abdbee0e1139 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,10 @@ PHP                                                                        NEWS
   . Fixed bug #76809 (SSL settings aren't respected when persistent connections 
     are used). (fabiomsouto)
 
+- PDO_MySQL:
+  . Fixed bug #78623 (Regression caused by "SP call yields additional empty
+    result set"). (cmb)
+
 - Session:
   . Fixed bug #78624 (session_gc return value for user defined session 
     handlers). (bshaffer)

diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c
index 950aa64f074b17587a01fdae499dc36957103408..e230cfbf05a5da8e289e576b43b053c5f77bf2f9 100644 (file)
--- a/ext/pdo_mysql/mysql_statement.c
+++ b/ext/pdo_mysql/mysql_statement.c
@@ -425,14 +425,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 aaf0f3e9f99d3720e7a8b06f83d2c557f610a051..896519f8ab0278c26575f7d4baa59d29fe57db3f 100644 (file)
--- 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[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 69ba9e7c4cf1ab9e46ccbb32037d17967a7f2c00..f001eec7d032ae9da9fbbba4efdb87b3d2625f09 100644 (file)
--- 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(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 94544e2120a5de773ad27e502d41dccd89ec66cb..e58d4a657821cfbc66818a665f7f8f1aba75c66f 100644 (file)
--- 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(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');