From 4e1e5a32668bc717e0049961e789dd29883cc66c Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Thu, 21 Sep 2017 17:01:24 +0400 Subject: [PATCH] MDEV-13857 - Use the 10.2 libmariadb in 10.3 --- client/mysqlbinlog.cc | 3 +++ libmariadb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 584f6955453fb..b0b0111c865da 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 #include /* That one is necessary for defines of OPTION_NO_FOREIGN_KEY_CHECKS etc */ diff --git a/libmariadb b/libmariadb index e069fb8e76eea..ba8310e82dac6 160000 --- a/libmariadb +++ b/libmariadb @@ -1 +1 @@ -Subproject commit e069fb8e76eeab096b8255805244f73048e3575a +Subproject commit ba8310e82dac659482f04cd2e270e666da072f95