diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index 1387eea4dcc..a8097f03824 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -46,7 +46,7 @@ SET(FEATURE_SET_large   5)
 SET(FEATURE_SET_xlarge  6)
 SET(FEATURE_SET_community 7)
 
-SET(WITH_CASSANDRA_STORAGE_ENGINE  ON)
+#SET(WITH_CASSANDRA_STORAGE_ENGINE  ON)
 
 IF(FEATURE_SET)
   STRING(TOLOWER ${FEATURE_SET} feature_set)
diff --git a/storage/cassandra/CMakeLists.txt b/storage/cassandra/CMakeLists.txt
index 5db15542443..98644b7798b 100644
--- a/storage/cassandra/CMakeLists.txt
+++ b/storage/cassandra/CMakeLists.txt
@@ -1,4 +1,10 @@
 
+
+IF(NOT WITH_CASSANDRA_STORAGE_ENGINE)
+  SET(WITHOUT_CASSANDRA 1)
+ENDIF(NOT WITH_CASSANDRA_STORAGE_ENGINE)
+
+
 SET(cassandra_sources 
      ha_cassandra.cc 
      ha_cassandra.h 
@@ -13,8 +19,8 @@ SET(cassandra_sources
 
 #INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS})
 
-INCLUDE_DIRECTORIES(AFTER /usr/local/include/thrift)
-#INCLUDE_DIRECTORIES(AFTER /home/buildbot/build/thrift-inst/include/thrift/) 
+#INCLUDE_DIRECTORIES(AFTER /usr/local/include/thrift)
+INCLUDE_DIRECTORIES(AFTER /home/buildbot/build/thrift-inst/include/thrift/) 
 #INCLUDE_DIRECTORIES(AFTER /home/psergey/cassandra/thrift/include/thrift/) 
 
 #