diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2017-09-21 17:01:24 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2017-09-22 11:42:46 +0400 |
| commit | 4b46dab0338ad101171c9342ff6d263c833d5387 (patch) | |
| tree | 192f63518c1ce14621d05d30c30097f6eef978bb | |
| parent | 5a8a3c3fe3d89c6612374d9553d109b6f878ffbc (diff) | |
| download | mariadb-git-bb-10.3-svoj1.tar.gz | |
MDEV-13857 - Use the 10.2 libmariadb in 10.3bb-10.3-svoj1
| -rw-r--r-- | client/mysqlbinlog.cc | 2 | ||||
| m--------- | libmariadb | 0 |
2 files changed, 2 insertions, 0 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 584f6955453..6fe165e6f32 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -32,7 +32,9 @@ #define MYSQL_CLIENT #undef MYSQL_SERVER #define TABLE TABLE_CLIENT +#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 -Subproject e069fb8e76eeab096b8255805244f73048e3575 +Subproject ba8310e82dac659482f04cd2e270e666da072f9 |