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