From 75d381ffb2bd183912759819bd60d685c015eeb9 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Tue, 7 Jan 2025 16:58:39 +0100 Subject: [PATCH] Build fix: moved Item_result back to mariadb_com.h Since Item_result is not used by Connector/C's binlog api only, but also by server code, Item_result enumeration was moved back to mariadb_com.h --- include/mariadb_com.h | 2 ++ include/mariadb_rpl.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mariadb_com.h b/include/mariadb_com.h index 994109d2..16eac23d 100644 --- a/include/mariadb_com.h +++ b/include/mariadb_com.h @@ -52,6 +52,8 @@ #define MYSQL_AUTODETECT_CHARSET_NAME "auto" #define BINCMP_FLAG 131072 +enum Item_result {STRING_RESULT,REAL_RESULT,INT_RESULT,ROW_RESULT,DECIMAL_RESULT}; + enum mysql_enum_shutdown_level { SHUTDOWN_DEFAULT = 0, diff --git a/include/mariadb_rpl.h b/include/mariadb_rpl.h index 255a9a56..ea0ca4db 100644 --- a/include/mariadb_rpl.h +++ b/include/mariadb_rpl.h @@ -73,8 +73,6 @@ extern "C" { #define SEMI_SYNC_INDICATOR 0xEF #define SEMI_SYNC_ACK_REQ 0x01 -enum Item_result {STRING_RESULT,REAL_RESULT,INT_RESULT,ROW_RESULT,DECIMAL_RESULT}; - /* Options */ enum mariadb_rpl_option { MARIADB_RPL_FILENAME, /* Filename and length */