1From 552474a477989d0d3514f126b8e314dccc27878c Mon Sep 17 00:00:00 2001 2From: Kamel Bouhara <kamel.bouhara@bootlin.com> 3Date: Wed, 1 Jul 2020 08:58:24 +0200 4Subject: [PATCH] mariadb FTBFS fix 5 6From: https://sources.debian.org/patches/libodb-mysql/2.4.0-4/mariadb_FTBFS_fix.patch/ 7 8Description: fix FTBFS with recent MariaDB versions 9Don't include internal an header, only the main one. 10Bug-Debian: https://bugs.debian.org/919374 11Forwarded: no 12Author: Laszlo Boszormenyi (GCS) <gcs@debian.org> 13 14Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com> 15--- 16 odb/mysql/mysql-types.hxx | 4 ++-- 17 odb/mysql/version.hxx | 2 +- 18 2 files changed, 3 insertions(+), 3 deletions(-) 19 20diff --git a/odb/mysql/mysql-types.hxx b/odb/mysql/mysql-types.hxx 21index 1254ccd..0e8f9a8 100644 22--- a/odb/mysql/mysql-types.hxx 23+++ b/odb/mysql/mysql-types.hxx 24@@ -11,9 +11,9 @@ typedef char my_bool; 25 typedef struct st_mysql_bind MYSQL_BIND; 26 27 #ifdef LIBODB_MYSQL_INCLUDE_SHORT 28-# include <mysql_time.h> 29+# include <mysql.h> 30 #else 31-# include <mysql/mysql_time.h> 32+# include <mysql/mysql.h> 33 #endif 34 35 #endif // ODB_MYSQL_MYSQL_TYPES_HXX 36diff --git a/odb/mysql/version.hxx b/odb/mysql/version.hxx 37index 05b4ba5..e711c2e 100644 38--- a/odb/mysql/version.hxx 39+++ b/odb/mysql/version.hxx 40@@ -12,7 +12,7 @@ 41 #ifdef LIBODB_MYSQL_INCLUDE_SHORT 42 # include <mysql_version.h> 43 #else 44-# include <mysql/mysql_version.h> 45+# include <mysql/mysql.h> 46 #endif 47 48 #include <odb/version.hxx> 49-- 502.26.2 51 52