From ee91abd64dedfbdefac3380f80bffdf63b55a765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Wed, 8 Feb 2023 18:53:07 +0000 Subject: [PATCH] Patch on mariadb_rpl.{c|h} Patching mariadb_rpl.c and mariadb_rpl.h to recognize (recognize only, no processing) GTID events and V2 events. --- deps/Makefile | 2 ++ deps/mariadb-client-library/mariadb_rpl.c.patch | 15 +++++++++++++++ deps/mariadb-client-library/mariadb_rpl.h.patch | 9 +++++++++ 3 files changed, 26 insertions(+) create mode 100644 deps/mariadb-client-library/mariadb_rpl.c.patch create mode 100644 deps/mariadb-client-library/mariadb_rpl.h.patch diff --git a/deps/Makefile b/deps/Makefile index 55a45ba99..93f5a0ff6 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -247,6 +247,8 @@ endif cd mariadb-client-library/mariadb_client && patch libmariadb/mariadb_dyncol.c < ../mariadb_dyncol.c-multiplication-overflow.patch cd mariadb-client-library/mariadb_client && patch libmariadb/ma_array.c < ../ma_array.c-multiplication-overflow.patch cd mariadb-client-library/mariadb_client && patch zlib/zutil.c < ../zutil.c-multiplication-overflow.patch + cd mariadb-client-library/mariadb_client && patch libmariadb/mariadb_rpl.c < ../mariadb_rpl.c.patch + cd mariadb-client-library/mariadb_client && patch include/mariadb_rpl.h < ../mariadb_rpl.h.patch cd mariadb-client-library/mariadb_client && CC=${CC} CXX=${CXX} ${MAKE} mariadbclient # cd mariadb-client-library/mariadb_client/include && make my_config.h diff --git a/deps/mariadb-client-library/mariadb_rpl.c.patch b/deps/mariadb-client-library/mariadb_rpl.c.patch new file mode 100644 index 000000000..bd255e139 --- /dev/null +++ b/deps/mariadb-client-library/mariadb_rpl.c.patch @@ -0,0 +1,15 @@ +@@ -386,6 +386,14 @@ + memcpy(rpl_event->event.rows.row_data, ev, rpl_event->event.rows.row_data_size); + } + break; ++ case PREVIOUS_GTIDS_LOG_EVENT: ++ case ANONYMOUS_GTID_LOG_EVENT: ++ case WRITE_ROWS_EVENT: ++ case UPDATE_ROWS_EVENT: ++ case DELETE_ROWS_EVENT: ++ case GTID_LOG_EVENT: ++ case HEARTBEAT_LOG_EVENT_V2: ++ break; + default: + free(rpl_event); + return NULL; diff --git a/deps/mariadb-client-library/mariadb_rpl.h.patch b/deps/mariadb-client-library/mariadb_rpl.h.patch new file mode 100644 index 000000000..039536ef5 --- /dev/null +++ b/deps/mariadb-client-library/mariadb_rpl.h.patch @@ -0,0 +1,9 @@ +@@ -94,6 +94,8 @@ + VIEW_CHANGE_EVENT= 37, + XA_PREPARE_LOG_EVENT= 38, + ++ HEARTBEAT_LOG_EVENT_V2 = 41, ++ + /* + Add new events here - right above this comment! + Existing events (except ENUM_END_EVENT) should never change their numbers