From a8f9a57aa51b1db112e65355ba13ce879334a0ed Mon Sep 17 00:00:00 2001 From: Daniel Bartholomew Date: Tue, 11 Feb 2025 15:01:15 -0500 Subject: [PATCH 1/2] bump the VERSION --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31d7fd8e..c15e87d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ SET(CC_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) SET(CPACK_PACKAGE_VERSION_MAJOR 3) SET(CPACK_PACKAGE_VERSION_MINOR 1) -SET(CPACK_PACKAGE_VERSION_PATCH 27) +SET(CPACK_PACKAGE_VERSION_PATCH 28) SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") MATH(EXPR MARIADB_PACKAGE_VERSION_ID "${CPACK_PACKAGE_VERSION_MAJOR} * 10000 + ${CPACK_PACKAGE_VERSION_MINOR} * 100 + From d4eec05d00ce77d2bab3848ff49d04acf0ed2cc0 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Tue, 18 Feb 2025 16:19:50 +0100 Subject: [PATCH 2/2] Revert "CONC-710: Remove UDF declarations" Since UDF declarations are used e.g. by lib_mysqludf_sys, I'm reverting this commit. (See also CONC-757). This reverts commit 1a2ed3f67af698b394b2faed069b49d4f409a155. --- include/mariadb_com.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/mariadb_com.h b/include/mariadb_com.h index 195979af..4418bf8f 100644 --- a/include/mariadb_com.h +++ b/include/mariadb_com.h @@ -406,6 +406,30 @@ struct rand_struct { double max_value_dbl; }; + /* The following is for user defined functions */ + +enum Item_result {STRING_RESULT,REAL_RESULT,INT_RESULT,ROW_RESULT,DECIMAL_RESULT}; + +typedef struct st_udf_args +{ + unsigned int arg_count; /* Number of arguments */ + enum Item_result *arg_type; /* Pointer to item_results */ + char **args; /* Pointer to argument */ + unsigned long *lengths; /* Length of string arguments */ + char *maybe_null; /* Set to 1 for all maybe_null args */ +} UDF_ARGS; + + /* This holds information about the result */ + +typedef struct st_udf_init +{ + my_bool maybe_null; /* 1 if function can return NULL */ + unsigned int decimals; /* for real functions */ + unsigned int max_length; /* For string functions */ + char *ptr; /* free pointer for function data */ + my_bool const_item; /* 0 if result is independent of arguments */ +} UDF_INIT; + /* Connection types */ #define MARIADB_CONNECTION_UNIXSOCKET 0 #define MARIADB_CONNECTION_TCP 1