From 92a6789638d27f10044be9fb2d57b63f8bbf5e6e Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Sat, 25 Jan 2025 18:09:41 +0100
Subject: [PATCH] C/C 3.4.4

---
 client/mysqlbinlog.cc | 5 -----
 libmariadb            | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index d34fdb85beb..22946132913 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -43,11 +43,6 @@
 #include "sql_priv.h"
 #include "sql_basic_types.h"
 #include <atomic>
-#if 0 /* FIXME: the following is broken for now */
-# include "mariadb_rpl.h"
-#else
-enum Item_result {STRING_RESULT,REAL_RESULT,INT_RESULT,ROW_RESULT,DECIMAL_RESULT};
-#endif
 #include "log_event.h"
 #include "compat56.h"
 #include "sql_common.h"
diff --git a/libmariadb b/libmariadb
index 52d0a38ed15..93e420621a9 160000
--- a/libmariadb
+++ b/libmariadb
@@ -1 +1 @@
-Subproject commit 52d0a38ed15f62906206d77b675079fc159cec7e
+Subproject commit 93e420621a9b367081dcfab17fd1a8340c411cf2