MDEV-13857 - Use the 10.2 libmariadb in 10.3

MariaDB · Sep 22, 2017 · 4e1e5a3 · 4e1e5a3
1 parent 5a8a3c3
commit 4e1e5a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
@@ -32,7 +32,10 @@
 #define MYSQL_CLIENT
 #undef MYSQL_SERVER
 #define TABLE TABLE_CLIENT
+/* This hack is here to avoid adding COMPRESSED data types to libmariadb. */
+#define MYSQL_TYPE_TIME2 MYSQL_TYPE_TIME2,MYSQL_TYPE_BLOB_COMPRESSED=140,MYSQL_TYPE_VARCHAR_COMPRESSED=141
 #include "client_priv.h"
+#undef MYSQL_TYPE_TIME2
 #include <my_time.h>
 #include <sslopt-vars.h>
 /* That one is necessary for defines of OPTION_NO_FOREIGN_KEY_CHECKS etc */

diff --git a/libmariadb b/libmariadb