diff --git a/VERSION b/VERSION
index b20ede5502..c89f2840a8 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
 COLUMNSTORE_VERSION_MAJOR=25
 COLUMNSTORE_VERSION_MINOR=10
-COLUMNSTORE_VERSION_PATCH=0
+COLUMNSTORE_VERSION_PATCH=1
 COLUMNSTORE_VERSION_RELEASE=1
diff --git a/cmake/compiler_flags.cmake b/cmake/compiler_flags.cmake
index b88e1eb2f0..dd701bb695 100644
--- a/cmake/compiler_flags.cmake
+++ b/cmake/compiler_flags.cmake
@@ -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")
diff --git a/dbcon/mysql/ha_mcs.cpp b/dbcon/mysql/ha_mcs.cpp
index c340cc7f43..2891a00c6c 100644
--- a/dbcon/mysql/ha_mcs.cpp
+++ b/dbcon/mysql/ha_mcs.cpp
@@ -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.
@@ -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;