From b65a894b956f1a2aa99380afc6194944ccb1fa9f Mon Sep 17 00:00:00 2001 From: Anna Filina Date: Mon, 11 Jan 2021 19:49:38 +0100 Subject: [PATCH] Other queries can also produce a result set Co-authored-by: Christoph M. Becker Closes GH-324. --- reference/mysqli/mysqli/query.xml | 6 +++--- reference/mysqli/mysqli/reap-async-query.xml | 5 ++++- reference/mysqli/mysqli_stmt/get-result.xml | 9 ++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/reference/mysqli/mysqli/query.xml b/reference/mysqli/mysqli/query.xml index d772d70cfe..e1b53fde77 100644 --- a/reference/mysqli/mysqli/query.xml +++ b/reference/mysqli/mysqli/query.xml @@ -111,9 +111,9 @@ &reftitle.returnvalues; - Returns &false; on failure. For successful SELECT, SHOW, DESCRIBE or - EXPLAIN queries mysqli_query will return - a mysqli_result object. For other successful queries mysqli_query will + Returns &false; on failure. For successful queries which produce a result set, such as SELECT, SHOW, DESCRIBE or + EXPLAIN, mysqli_query will return + a mysqli_result object. For other successful queries, mysqli_query will return &true;. diff --git a/reference/mysqli/mysqli/reap-async-query.xml b/reference/mysqli/mysqli/reap-async-query.xml index e05a6d6707..e6092d2228 100644 --- a/reference/mysqli/mysqli/reap-async-query.xml +++ b/reference/mysqli/mysqli/reap-async-query.xml @@ -37,7 +37,10 @@ &reftitle.returnvalues; - Returns mysqli_result in success, &false; otherwise. + Returns &false; on failure. For successful queries which produce a result set, such as SELECT, SHOW, DESCRIBE or + EXPLAIN, mysqli_reap_async_query will return + a mysqli_result object. For other successful queries, mysqli_reap_async_query will + return &true;. diff --git a/reference/mysqli/mysqli_stmt/get-result.xml b/reference/mysqli/mysqli_stmt/get-result.xml index 14a3592129..f789fcca1d 100644 --- a/reference/mysqli/mysqli_stmt/get-result.xml +++ b/reference/mysqli/mysqli_stmt/get-result.xml @@ -37,9 +37,12 @@ &reftitle.returnvalues; - Returns a resultset for successful SELECT queries, or &false; for other DML - queries or on failure. The mysqli_errno function can be - used to distinguish between the two types of failure. + Returns &false; on failure. For successful queries which produce a result set, such as SELECT, SHOW, DESCRIBE or + EXPLAIN, mysqli_stmt_get_result will return + a mysqli_result object. For other successful queries, mysqli_stmt_get_result will + return &false;. The mysqli_stmt_errno function can be + used to distinguish between the two reasons for &false;; due to a bug, prior to PHP 7.4.13, + mysqli_errno had to be used for this purpose.