fix for issue brianmario#878

actsasflinn · Sep 9, 2017 · f60600d · f60600d
1 parent 9c2d277
commit f60600d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ext/mysql2/client.c b/ext/mysql2/client.c
@@ -53,8 +53,10 @@ VALUE rb_hash_dup(VALUE other) {
  * variable to use, but MYSQL_SERVER_VERSION gives the correct numbers when
  * linking against the server itself
  */
-#ifdef LIBMYSQL_VERSION
-  #define MYSQL_LINK_VERSION LIBMYSQL_VERSION
+#ifdef MARIADB_CLIENT_VERSION_STR
+  #define MYSQL_LINK_VERSION MARIADB_CLIENT_VERSION_STR
+#elif LIBMYSQL_VERSION
+  #define MYSQL_LINK_VERSION MYSQL_VERSION_ID
 #else
   #define MYSQL_LINK_VERSION MYSQL_SERVER_VERSION
 #endif

diff --git a/ext/mysql2/mysql2_ext.h b/ext/mysql2/mysql2_ext.h
@@ -11,10 +11,8 @@ void Init_mysql2(void);
 
 #ifdef HAVE_MYSQL_H
 #include <mysql.h>
-#include <mysql_com.h>
 #include <errmsg.h>
 #include <mysqld_error.h>
-#include <mysql_version.h>
 #else
 #include <mysql/mysql.h>
 #include <mysql/mysql_com.h>