Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
COLUMNSTORE_VERSION_MAJOR=25
COLUMNSTORE_VERSION_MINOR=10
COLUMNSTORE_VERSION_PATCH=0
COLUMNSTORE_VERSION_PATCH=1
COLUMNSTORE_VERSION_RELEASE=1
8 changes: 8 additions & 0 deletions cmake/compiler_flags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,14 @@ set(GNU_FLAGS # suppressed warnings
set(ASAN_FLAGS -U_FORTIFY_SOURCE -fsanitize=address -fsanitize-address-use-after-scope -fPIC)
# } end Sanitizers

# Check if built with enterprise configuration
if(MYSQL_SERVER_SUFFIX STREQUAL "-enterprise")
message(STATUS "ColumnStore: Compiling with ENTERPRISE features enabled")
my_check_and_set_compiler_flag("-DCOLUMNSTORE_COMPILED_WITH_ENTERPRISE")
else()
message(STATUS "ColumnStore: Compiling with COMMUNITY features")
endif()

# configured by cmake/configureEngine.cmake {
if(MASK_LONGDOUBLE)
my_check_and_set_compiler_flag("-DMASK_LONGDOUBLE")
Expand Down
11 changes: 10 additions & 1 deletion dbcon/mysql/ha_mcs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,15 @@ pthread_mutex_t mcs_mutex;
#endif
#define DEBUG_RETURN return

bool isEnterprise()
{
#ifdef COLUMNSTORE_COMPILED_WITH_ENTERPRISE
return true;
#else
return false;
#endif
}

/**
@brief
Function we use in the creation of our hash to get key.
Expand Down Expand Up @@ -1866,7 +1875,7 @@ static int columnstore_init_func(void* p)
mcs_hton->create_unit = create_columnstore_unit_handler;
mcs_hton->db_type = DB_TYPE_AUTOASSIGN;

if (get_innodb_queries_uses_mcs())
if (isEnterprise() && get_innodb_queries_uses_mcs())
{
std::cerr << "Columnstore: innodb_queries_uses_mcs is set, redirecting all InnoDB queries to Columnstore."
<< std::endl;
Expand Down