diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index d34fdb85bebfc..2294613291322 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 52d0a38ed15f6..1135b92dd0bfa 160000
--- a/libmariadb
+++ b/libmariadb
@@ -1 +1 @@
-Subproject commit 52d0a38ed15f62906206d77b675079fc159cec7e
+Subproject commit 1135b92dd0bfa3e18516c95dd5141b6b9997918d