0005-modules-rlm_sql-remove-mysql_version.h.patch 1.4 KB

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