From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 11 Dec 2015 16:32:41 +0000 (-0500)
Subject: Pass correct struct to field counting functions
X-Git-Tag: release_3_0_11~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f928656d77f5129eb9dda2434a2d977a51f763b6;p=thirdparty%2Ffreeradius-server.git

Pass correct struct to field counting functions
---

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 d37482f8151..91d161fc3d5 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
@@ -389,9 +389,15 @@ static int sql_num_fields(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *con
 	rlm_sql_mysql_conn_t *conn = handle->conn;
 
 #if MYSQL_VERSION_ID >= 32224
+	/*
+	 *	Count takes a connection handle
+	 */
 	if (!(num = mysql_field_count(conn->sock))) {
 #else
-	if (!(num = mysql_num_fields(conn->sock))) {
+	/*
+	 *	Fields takes a result struct
+	 */
+	if (!(num = mysql_num_fields(conn->result))) {
 #endif
 		return -1;
 	}