summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2017-09-21 17:01:24 +0400
committerSergey Vojtovich <svoj@mariadb.org>2017-09-22 17:59:25 +0400
commit4e1e5a32668bc717e0049961e789dd29883cc66c (patch)
treea6fdd396413f8dc8ba4d896a2e6474251db91ef4 /client
parent5a8a3c3fe3d89c6612374d9553d109b6f878ffbc (diff)
downloadmariadb-git-4e1e5a32668bc717e0049961e789dd29883cc66c.tar.gz
MDEV-13857 - Use the 10.2 libmariadb in 10.3
Diffstat (limited to 'client')
-rw-r--r--client/mysqlbinlog.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 584f6955453..b0b0111c865 100644
--- 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 */