From 2bd85c6b5020929296860074ca9a5dbc0cbde69c Mon Sep 17 00:00:00 2001
From: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Fri, 27 Nov 2015 00:03:26 +0100
Subject: [PATCH] db_mysql: updated include paths for libmysqlclient

- direct use of mysql_config, the old substitution done in module
  Makefile can break the includes of libmysqlclient files
- reported by Ian Yu-Hsun Lin, GH#419
---
 modules/db_mysql/Makefile      | 2 +-
 modules/db_mysql/km_db_mysql.c | 2 +-
 modules/db_mysql/km_dbase.c    | 6 +++---
 modules/db_mysql/km_my_con.c   | 2 +-
 modules/db_mysql/km_my_con.h   | 2 +-
 modules/db_mysql/km_res.c      | 2 +-
 modules/db_mysql/km_val.h      | 2 +-
 modules/db_mysql/my_cmd.c      | 4 ++--
 modules/db_mysql/my_cmd.h      | 2 +-
 modules/db_mysql/my_con.h      | 2 +-
 modules/db_mysql/my_fld.h      | 2 +-
 modules/db_mysql/my_res.c      | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/db_mysql/Makefile b/modules/db_mysql/Makefile
index 1cea920cad6..d9239e0ecae 100644
--- a/modules/db_mysql/Makefile
+++ b/modules/db_mysql/Makefile
@@ -20,7 +20,7 @@ endif
 
 ifneq ($(MYSQLCFG),)
 	# use autodetection
-	DEFS += $(shell $(MYSQLCFG) --include | sed 's/\(-I[^ ]*\)\/mysql/\1/g' )
+	DEFS += $(shell $(MYSQLCFG) --include)
 	LIBS = $(shell $(MYSQLCFG) --libs)
 else
 	# mysql.h locations (freebsd,openbsd  solaris)
diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c
index 201c0188223..38cb66aecf4 100644
--- a/modules/db_mysql/km_db_mysql.c
+++ b/modules/db_mysql/km_db_mysql.c
@@ -38,7 +38,7 @@
 #include "km_dbase.h"
 #include "km_db_mysql.h"
 
-#include <mysql/mysql.h>
+#include <mysql.h>
 
 unsigned int db_mysql_timeout_interval = 2;   /* Default is 6 seconds */
 unsigned int db_mysql_auto_reconnect = 1;     /* Default is enabled   */
diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c
index f1956e8454b..9b220c3650e 100644
--- a/modules/db_mysql/km_dbase.c
+++ b/modules/db_mysql/km_dbase.c
@@ -33,9 +33,9 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <mysql/mysql.h>
-#include <mysql/errmsg.h>
-#include <mysql/mysql_version.h>
+#include <mysql.h>
+#include <errmsg.h>
+#include <mysql_version.h>
 #include "../../mem/mem.h"
 #include "../../dprint.h"
 #include "../../async_task.h"
diff --git a/modules/db_mysql/km_my_con.c b/modules/db_mysql/km_my_con.c
index d5f4dd25e06..94775f418cf 100644
--- a/modules/db_mysql/km_my_con.c
+++ b/modules/db_mysql/km_my_con.c
@@ -28,7 +28,7 @@
 
 #include "km_my_con.h"
 #include "km_db_mysql.h"
-#include <mysql/mysql_version.h>
+#include <mysql_version.h>
 #include "../../mem/mem.h"
 #include "../../dprint.h"
 #include "../../ut.h"
diff --git a/modules/db_mysql/km_my_con.h b/modules/db_mysql/km_my_con.h
index 45fed57d246..ada631430bd 100644
--- a/modules/db_mysql/km_my_con.h
+++ b/modules/db_mysql/km_my_con.h
@@ -34,7 +34,7 @@
 #include "../../lib/srdb1/db_id.h"
 
 #include <time.h>
-#include <mysql/mysql.h>
+#include <mysql.h>
 
 
 struct my_con {
diff --git a/modules/db_mysql/km_res.c b/modules/db_mysql/km_res.c
index c7dbb9e5c48..95cd7fa292b 100644
--- a/modules/db_mysql/km_res.c
+++ b/modules/db_mysql/km_res.c
@@ -30,7 +30,7 @@
 
 
 #include <string.h>
-#include <mysql/mysql.h>
+#include <mysql.h>
 #include "../../lib/srdb1/db_res.h"
 #include "../../mem/mem.h"
 #include "../../dprint.h"
diff --git a/modules/db_mysql/km_val.h b/modules/db_mysql/km_val.h
index 345541b1b27..68cee0055c1 100644
--- a/modules/db_mysql/km_val.h
+++ b/modules/db_mysql/km_val.h
@@ -29,7 +29,7 @@
 #ifndef KM_VAL_H
 #define KM_VAL_H
 
-#include <mysql/mysql.h>
+#include <mysql.h>
 #include "../../lib/srdb1/db_val.h"
 #include "../../lib/srdb1/db.h"
 
diff --git a/modules/db_mysql/my_cmd.c b/modules/db_mysql/my_cmd.c
index 666692c2127..61b3c6121bf 100644
--- a/modules/db_mysql/my_cmd.c
+++ b/modules/db_mysql/my_cmd.c
@@ -46,8 +46,8 @@
 #include <stdio.h>
 #include <time.h>  /*strptime, XOPEN issue must be >=4 */
 #include <string.h>
-#include <mysql/errmsg.h>
-#include <mysql/mysqld_error.h>
+#include <errmsg.h>
+#include <mysqld_error.h>
 
 #define STR_BUF_SIZE 1024
 
diff --git a/modules/db_mysql/my_cmd.h b/modules/db_mysql/my_cmd.h
index d8a3d6460e0..36b1f6733f4 100644
--- a/modules/db_mysql/my_cmd.h
+++ b/modules/db_mysql/my_cmd.h
@@ -24,7 +24,7 @@
 
 #include "../../lib/srdb2/db_drv.h"
 #include "../../lib/srdb2/db_cmd.h"
-#include <mysql/mysql.h>
+#include <mysql.h>
 #include <stdarg.h>
 
 typedef enum my_flags {
diff --git a/modules/db_mysql/my_con.h b/modules/db_mysql/my_con.h
index 7194320ed58..2d773cfadd5 100644
--- a/modules/db_mysql/my_con.h
+++ b/modules/db_mysql/my_con.h
@@ -27,7 +27,7 @@
 #include "../../lib/srdb2/db_uri.h"
 
 #include <time.h>
-#include <mysql/mysql.h>
+#include <mysql.h>
 
 enum my_con_flags {
 	MY_CONNECTED = 1
diff --git a/modules/db_mysql/my_fld.h b/modules/db_mysql/my_fld.h
index 0a024ce7c0b..79a9fb15e64 100644
--- a/modules/db_mysql/my_fld.h
+++ b/modules/db_mysql/my_fld.h
@@ -28,7 +28,7 @@
 
 #include "../../lib/srdb2/db_drv.h"
 #include "../../lib/srdb2/db_fld.h"
-#include <mysql/mysql.h>
+#include <mysql.h>
 
 struct my_fld {
 	db_drv_t gen;
diff --git a/modules/db_mysql/my_res.c b/modules/db_mysql/my_res.c
index 0c93d40029c..83ee74f7445 100644
--- a/modules/db_mysql/my_res.c
+++ b/modules/db_mysql/my_res.c
@@ -27,7 +27,7 @@
 #include "../../dprint.h"
 #include "../../lib/srdb2/db_gen.h"
 
-#include <mysql/mysql.h>
+#include <mysql.h>
 
 
 void my_res_free(db_res_t* res, struct my_res* payload)