Merge branch 'PHP-8.4' into PHP-8.5

Author: kamil-tekiela

NEWS

@@ -70,6 +70,9 @@ PHP                                                                        NEWS
   . Fix GH-22854: Fixed failed assertion when accessing mysqli property after
     failed reconnection. (Kamil Tekiela)
 
+- MySQLnd:
+  . Fixed field_count not resetting on OK packet. (Kamil Tekiela)
+
 - Opcache:
   . Fixed OSS-Fuzz #546798343 (Heap-buffer-overflow in optimizer with
     FCCs and inlining). (ndossche)

ext/mysqli/tests/mysqli_stmt_next_result_field_count.phpt

@@ -0,0 +1,34 @@
+--TEST--
+mysqli_stmt::$field_count is 0 for the trailing OK packet of a stored procedure
+--EXTENSIONS--
+mysqli
+--SKIPIF--
+<?php
+require_once 'skipifconnectfailure.inc';
+?>
+--FILE--
+<?php
+require_once 'connect.inc';
+
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+$link->query('DROP PROCEDURE IF EXISTS test_field_count_p');
+$link->query('CREATE PROCEDURE test_field_count_p() BEGIN SELECT 1 AS a; SELECT 2 AS b, 3 AS c; END');
+
+$stmt = $link->prepare('CALL test_field_count_p()');
+$stmt->execute();
+do {
+    var_dump($stmt->field_count);
+    $stmt->get_result();
+} while ($stmt->next_result());
+?>
+--CLEAN--
+<?php
+require_once 'connect.inc';
+$link = new mysqli($host, $user, $passwd, $db, $port, $socket);
+$link->query('DROP PROCEDURE IF EXISTS test_field_count_p');
+?>
+--EXPECT--
+int(1)
+int(2)
+int(0)

ext/mysqlnd/mysqlnd_ps.c

@@ -515,6 +515,7 @@ mysqlnd_stmt_execute_parse_response(MYSQLND_STMT * const s, enum_mysqlnd_parse_e
 
 		stmt->state = MYSQLND_STMT_EXECUTED;
 		if (conn->last_query_type == QUERY_UPSERT || conn->last_query_type == QUERY_LOAD_LOCAL) {
+			stmt->field_count = conn->field_count;
 			DBG_INF("PASS");
 			DBG_RETURN(PASS);
 		}

ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset_columncount.phpt

@@ -0,0 +1,39 @@
+--TEST--
+MySQL PDOStatement->columnCount() is 0 for the trailing OK packet of a stored procedure
+--EXTENSIONS--
+pdo_mysql
+--SKIPIF--
+<?php
+require_once __DIR__ . '/inc/mysql_pdo_test.inc';
+MySQLPDOTest::skip();
+?>
+--FILE--
+<?php
+require_once __DIR__ . '/inc/mysql_pdo_test.inc';
+$db = MySQLPDOTest::factory();
+$db->exec('DROP PROCEDURE IF EXISTS pdo_mysql_stmt_nextrowset_columncount_p');
+$db->exec('CREATE PROCEDURE pdo_mysql_stmt_nextrowset_columncount_p() BEGIN SELECT 1 AS a; SELECT 2 AS b, 3 AS c; END');
+
+foreach ([true, false] as $emulate) {
+    $db->setAttribute(PDO::ATTR_EMULATE_PREPARES, $emulate);
+    $stmt = $db->prepare('CALL pdo_mysql_stmt_nextrowset_columncount_p()');
+    $stmt->execute();
+    do {
+        var_dump($stmt->columnCount());
+        $stmt->fetchAll();
+    } while ($stmt->nextRowset());
+}
+?>
+--CLEAN--
+<?php
+require_once __DIR__ . '/inc/mysql_pdo_test.inc';
+$db = MySQLPDOTest::factory();
+$db->exec('DROP PROCEDURE IF EXISTS pdo_mysql_stmt_nextrowset_columncount_p');
+?>
+--EXPECT--
+int(1)
+int(2)
+int(0)
+int(1)
+int(2)
+int(0)