diff --git a/VERSION b/VERSION index e2b54802c..abcde5fb5 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ COLUMNSTORE_VERSION_MAJOR=23 COLUMNSTORE_VERSION_MINOR=10 -COLUMNSTORE_VERSION_PATCH=0 -COLUMNSTORE_VERSION_RELEASE=1 +COLUMNSTORE_VERSION_PATCH=1 +COLUMNSTORE_VERSION_RELEASE=2 diff --git a/dbcon/mysql/ha_mcs.cpp b/dbcon/mysql/ha_mcs.cpp index c735dbc45..d31150387 100644 --- a/dbcon/mysql/ha_mcs.cpp +++ b/dbcon/mysql/ha_mcs.cpp @@ -67,6 +67,11 @@ pthread_mutex_t mcs_mutex; #endif #define DEBUG_RETURN return +#if MYSQL_VERSION_ID >= 110500 +/* because of renames in the handler class */ +#define rows_changed rows_stats.updated +#endif + /** @brief Function we use in the creation of our hash to get key.