From: Nick Porter <nick@portercomputing.co.uk>
Date: Mon, 22 Apr 2024 11:13:17 +0000 (+0100)
Subject: Remove call to sql_num_fields() which does nothing
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44c5e9e6e9a282f6094c4f607d77fd6e93b75cfa;p=thirdparty%2Ffreeradius-server.git

Remove call to sql_num_fields() which does nothing
---

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
index 92dc9192af..87cfcb1b93 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
@@ -430,22 +430,9 @@ static sql_rcode_t sql_select_query(rlm_sql_handle_t *handle, rlm_sql_config_t c
 	sql_rcode_t rcode;
 
 	rcode = sql_query(handle, config, query);
-	if (rcode != RLM_SQL_OK) {
-		return rcode;
-	}
-
-	rcode = sql_store_result(handle, config);
-	if (rcode != RLM_SQL_OK) {
-		return rcode;
-	}
-
-	/* Why? Per http://www.mysql.com/doc/n/o/node_591.html,
-	 * this cannot return an error.  Perhaps just to complain if no
-	 * fields are found?
-	 */
-	sql_num_fields(handle, config);
+	if (rcode != RLM_SQL_OK) return rcode;
 
-	return rcode;
+	return sql_store_result(handle, config);
 }
 
 static int sql_num_rows(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t const *config)