1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make cassandra module and do not load it by default.

Browse Source
This commit is contained in:
unknown 2013-01-10 00:07:44 +02:00
parent d27d9d76a8
commit 363436ede1
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/have_cassandra.opt
View File

@ -1 +1 @@
--cassandra=on --plugin-load=$HA_CASSANDRA_SO --cassandra=on

3
sql/sql_plugin.cc
View File

@ -175,7 +175,8 @@ static struct
/* we disable few other plugins by default */ /* we disable few other plugins by default */
{ "ndbcluster", PLUGIN_OFF }, { "ndbcluster", PLUGIN_OFF },
{ "feedback", PLUGIN_OFF }, { "feedback", PLUGIN_OFF },
{ "pbxt", PLUGIN_OFF } { "pbxt", PLUGIN_OFF },
{ "cassandra", PLUGIN_OFF }
}; };
/* support for Services */ /* support for Services */

2
storage/cassandra/CMakeLists.txt
View File

@ -22,5 +22,5 @@ STRING(REPLACE "-fno-exceptions" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
#LINK_DIRECTORIES(/home/psergey/cassandra/thrift/lib) #LINK_DIRECTORIES(/home/psergey/cassandra/thrift/lib)
MYSQL_ADD_PLUGIN(cassandra ${cassandra_sources} STORAGE_ENGINE LINK_LIBRARIES thrift) MYSQL_ADD_PLUGIN(cassandra ${cassandra_sources} STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES thrift)
# was: STORAGE_ENGINE MANDATORY # was: STORAGE_ENGINE MANDATORY