MDEV-13857 - Use the 10.2 libmariadb in 10.3

4e1e5a32 · Sergey Vojtovich · 5a8a3c3f · 4e1e5a32 · ba8310e8
Commit 4e1e5a32 authored Sep 21, 2017 by Sergey Vojtovich
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

client/mysqlbinlog.cc client/mysqlbinlog.cc +3 -0

libmariadb libmariadb +1 -1

No files found.
--- 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 */

--- a/libmariadb @ ba8310e8
+++ b/libmariadb @ ba8310e8
-Subproject commit e069fb8e76eeab096b8255805244f73048e3575a
+Subproject commit ba8310e82dac659482f04cd2e270e666da072f95