1From 77b8c75f9904897768f87e20fef5d7739ddcd3c7 Mon Sep 17 00:00:00 2001
2From: Jared Bents <jared.bents@rockwellcollins.com>
3Date: Tue, 4 Feb 2020 08:22:11 -0600
4Subject: [PATCH] modules/rlm_sql: remove mysql_version.h
5
6remove mysql_version.h as mysql.h is included and mysql_version.h
7should not be included by per the header file warning
8
9Upstream: http://lists.freeradius.org/pipermail/freeradius-devel/2021-April/014218.html
10
11Signed-off-by: Jared Bents <jared.bents@rockwellcollins.com>
12Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
13[Applied upstream as https://github.com/FreeRADIUS/freeradius-server/commit/f20e80fce5f1b0589dccdf441b5d835188c0dfa2]
14---
15 src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c | 2 --
16 1 file changed, 2 deletions(-)
17
18diff --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
19index a7992647cd..ea44d0cc7a 100644
20--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
21+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
22@@ -34,12 +34,10 @@ RCSID("$Id$")
23 #include "config.h"
24
25 #ifdef HAVE_MYSQL_MYSQL_H
26-#  include <mysql/mysql_version.h>
27 #  include <mysql/errmsg.h>
28 #  include <mysql/mysql.h>
29 #  include <mysql/mysqld_error.h>
30 #elif defined(HAVE_MYSQL_H)
31-#  include <mysql_version.h>
32 #  include <errmsg.h>
33 #  include <mysql.h>
34 #  include <mysqld_error.h>
35--
362.17.1
37
38