]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Remove call to sql_num_fields() which does nothing
authorNick Porter <nick@portercomputing.co.uk>
Mon, 22 Apr 2024 11:13:17 +0000 (12:13 +0100)
committerNick Porter <nick@portercomputing.co.uk>
Mon, 22 Apr 2024 11:13:17 +0000 (12:13 +0100)
src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c

index 92dc9192af962195a2b530dbe703360a7cf60e4f..87cfcb1b933c25655f9ca086db69d2c37134ebf4 100644 (file)
@@ -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)