From e41145f76bb668d4b262ef30f14da32d23e3937e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 4 Dec 2024 09:30:18 +0200 Subject: [PATCH] Update libmariadb --- client/mysqlbinlog.cc | 5 +++++ libmariadb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 22946132913..d34fdb85beb 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -43,6 +43,11 @@ #include "sql_priv.h" #include "sql_basic_types.h" #include +#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 efb0d9ac8bb..1093c22e357 160000 --- a/libmariadb +++ b/libmariadb @@ -1 +1 @@ -Subproject commit efb0d9ac8bb60b77efbe3fc230f50577726efeeb +Subproject commit 1093c22e357d0164aa072b829693e39f14322384