From 363bb5aa56bd31776ac45681204b9d09330a226f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Sun, 7 Apr 2019 09:55:43 +0300 Subject: [PATCH] Update Connector-C to 3.1 Updated the connector to 3.1 as it adds support for the replication protocol. --- cmake/BuildMariaDBConnector.cmake | 2 +- server/modules/include/blr_constants.hh | 14 ++++++-------- .../modules/routing/binlogrouter/binlog_common.cc | 12 ------------ 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/cmake/BuildMariaDBConnector.cmake b/cmake/BuildMariaDBConnector.cmake index 3fa32ae54..b3916d258 100644 --- a/cmake/BuildMariaDBConnector.cmake +++ b/cmake/BuildMariaDBConnector.cmake @@ -9,7 +9,7 @@ set(MARIADB_CONNECTOR_C_REPO "https://github.com/MariaDB/mariadb-connector-c.git CACHE STRING "MariaDB Connector-C Git repository") # Connector-C tag to use -set(MARIADB_CONNECTOR_C_TAG "v3.0.6" +set(MARIADB_CONNECTOR_C_TAG "3.1" CACHE STRING "MariaDB Connector-C Git tag") ExternalProject_Add(connector-c diff --git a/server/modules/include/blr_constants.hh b/server/modules/include/blr_constants.hh index c8ef0871a..814bbe7b6 100644 --- a/server/modules/include/blr_constants.hh +++ b/server/modules/include/blr_constants.hh @@ -18,6 +18,9 @@ #include +#include +#include + MXS_BEGIN_DECLS #define BINLOG_FNAMELEN 255 @@ -30,9 +33,10 @@ MXS_BEGIN_DECLS #define BINLOG_EVENT_HDR_LEN 19 /** - * Binlog event types + * Definitions/aliases for binlog event types + * + * They are already defined in mariadb_rpl.h but legacy code uses these defines */ -#define START_EVENT_V3 0x01 #define QUERY_EVENT 0x02 #define STOP_EVENT 0x03 #define ROTATE_EVENT 0x04 @@ -64,9 +68,6 @@ MXS_BEGIN_DECLS #define WRITE_ROWS_EVENTv2 0x1E #define UPDATE_ROWS_EVENTv2 0x1F #define DELETE_ROWS_EVENTv2 0x20 -#define GTID_EVENT 0x21 -#define ANONYMOUS_GTID_EVENT 0x22 -#define PREVIOUS_GTIDS_EVENT 0x23 #define MAX_EVENT_TYPE 0x23 @@ -75,8 +76,6 @@ MXS_BEGIN_DECLS #define MARIADB_ANNOTATE_ROWS_EVENT 0xa0 /* New MariaDB 10 event numbers start from here */ #define MARIADB10_BINLOG_CHECKPOINT_EVENT 0xa1 -#define MARIADB10_GTID_EVENT 0xa2 -#define MARIADB10_GTID_GTID_LIST_EVENT 0xa3 #define MAX_EVENT_TYPE_MARIADB10 0xa3 @@ -91,7 +90,6 @@ MXS_BEGIN_DECLS #define LOG_EVENT_THREAD_SPECIFIC_F 0x0004 #define LOG_EVENT_SUPPRESS_USE_F 0x0008 #define LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F 0x0010 -#define LOG_EVENT_ARTIFICIAL_F 0x0020 #define LOG_EVENT_RELAY_LOG_F 0x0040 #define LOG_EVENT_IGNORABLE_F 0x0080 #define LOG_EVENT_NO_FILTER_F 0x0100 diff --git a/server/modules/routing/binlogrouter/binlog_common.cc b/server/modules/routing/binlogrouter/binlog_common.cc index 83f5858b1..c54f7292a 100644 --- a/server/modules/routing/binlogrouter/binlog_common.cc +++ b/server/modules/routing/binlogrouter/binlog_common.cc @@ -219,24 +219,12 @@ const char* binlog_event_name(int type) case GTID_EVENT: return "GTID_EVENT"; - case ANONYMOUS_GTID_EVENT: - return "ANONYMOUS_GTID_EVENT"; - - case PREVIOUS_GTIDS_EVENT: - return "PREVIOUS_GTIDS_EVENT"; - case MARIADB_ANNOTATE_ROWS_EVENT: return "MARIADB_ANNOTATE_ROWS_EVENT"; case MARIADB10_BINLOG_CHECKPOINT_EVENT: return "MARIADB10_BINLOG_CHECKPOINT_EVENT"; - case MARIADB10_GTID_EVENT: - return "MARIADB10_GTID_EVENT"; - - case MARIADB10_GTID_GTID_LIST_EVENT: - return "MARIADB10_GTID_GTID_LIST_EVENT"; - default: return "UNKNOWN_EVENT"; }