summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-benchmarks/sysbench/files/sysbench-fix-mariadb-include.patch')
-rw-r--r--app-benchmarks/sysbench/files/sysbench-fix-mariadb-include.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/app-benchmarks/sysbench/files/sysbench-fix-mariadb-include.patch b/app-benchmarks/sysbench/files/sysbench-fix-mariadb-include.patch
new file mode 100644
index 000000000000..7c3ac31dc9df
--- /dev/null
+++ b/app-benchmarks/sysbench/files/sysbench-fix-mariadb-include.patch
@@ -0,0 +1,21 @@
+--- a/src/drivers/mysql/drv_mysql.c.orig 2017-10-06 06:24:37.930414458 +0000
++++ b/src/drivers/mysql/drv_mysql.c 2017-10-06 06:25:19.647414458 +0000
+@@ -35,7 +35,6 @@
+ #include <stdio.h>
+
+ #include <mysql.h>
+-#include <mysql_version.h>
+ #include <mysqld_error.h>
+ #include <errmsg.h>
+
+@@ -50,8 +49,8 @@
+
+ #define SAFESTR(s) ((s != NULL) ? (s) : "(null)")
+
+-#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80001 && \
+- MYSQL_VERSION_ID != 80002 /* see https://bugs.mysql.com/?id=87337 */
++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) && \
++ MYSQL_VERSION_ID >= 80001 && MYSQL_VERSION_ID != 80002 /* see https://bugs.mysql.com/?id=87337 */
+ typedef bool my_bool;
+ #endif
+