diff --git a/deps/Makefile b/deps/Makefile
index 15e36920a..678639849 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -268,8 +268,7 @@ endif
 	# patches for x509 cache . See https://github.com/sysown/proxysql/issues/4117 (Slow connection time with SSL and large CA file , relevant on Aurora)
 	cd mariadb-client-library/mariadb_client && patch -p0 < ../x509cache.patch
 	# patches for replication testing
-	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 && patch -p0 < ../mariadb_rpl.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
deleted file mode 100644
index cbdd85c74..000000000
--- a/deps/mariadb-client-library/mariadb_rpl.c.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-@@ -386,6 +386,15 @@
-         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:
-+	case ROWS_QUERY_LOG_EVENT:
-+		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
deleted file mode 100644
index 039536ef5..000000000
--- a/deps/mariadb-client-library/mariadb_rpl.h.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-@@ -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
diff --git a/deps/mariadb-client-library/mariadb_rpl.patch b/deps/mariadb-client-library/mariadb_rpl.patch
new file mode 100644
index 000000000..70c1eff11
--- /dev/null
+++ b/deps/mariadb-client-library/mariadb_rpl.patch
@@ -0,0 +1,29 @@
+diff --git include/mariadb_rpl.h include/mariadb_rpl.h
+index ea0ca4db..697e5684 100644
+--- include/mariadb_rpl.h
++++ include/mariadb_rpl.h
+@@ -134,7 +134,8 @@ enum mariadb_rpl_event {
+   VIEW_CHANGE_EVENT= 37,
+   XA_PREPARE_LOG_EVENT= 38,
+   PARTIAL_UPDATE_ROWS_EVENT = 39,
+-
++  HEARTBEAT_LOG_EVENT_V2 = 41,
++  
+   /*
+     Add new events here - right above this comment!
+     Existing events (except ENUM_END_EVENT) should never change their numbers
+diff --git libmariadb/mariadb_rpl.c libmariadb/mariadb_rpl.c
+index daa6d242..dd3f905c 100644
+--- libmariadb/mariadb_rpl.c
++++ libmariadb/mariadb_rpl.c
+@@ -1888,6 +1888,9 @@ MARIADB_RPL_EVENT * STDCALL mariadb_rpl_fetch(MARIADB_RPL *rpl, MARIADB_RPL_EVEN
+       }
+       break;
+     }
++    case ROWS_QUERY_LOG_EVENT:
++    case HEARTBEAT_LOG_EVENT_V2:
++      break;
+     default:
+       /* We need to report an error if this event can't be ignored */
+       if (!(rpl_event->flags & LOG_EVENT_IGNORABLE_F))
+