diff options
| author | unknown <sanja@askmonty.org> | 2013-01-10 00:07:44 +0200 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2013-01-10 00:07:44 +0200 |
| commit | 363436ede1abb1afcb679db351991b9bbe9ad70b (patch) | |
| tree | 7a6c291493603a59771ec23820e1cb753e161d93 | |
| parent | d27d9d76a8c13f339b6789c02d3e6eb71bdbf497 (diff) | |
| download | mariadb-git-363436ede1abb1afcb679db351991b9bbe9ad70b.tar.gz | |
Make cassandra module and do not load it by default.
| -rw-r--r-- | mysql-test/include/have_cassandra.opt | 2 | ||||
| -rw-r--r-- | sql/sql_plugin.cc | 3 | ||||
| -rw-r--r-- | storage/cassandra/CMakeLists.txt | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/include/have_cassandra.opt b/mysql-test/include/have_cassandra.opt index 92d642a5e4c..ee3c12dc46c 100644 --- a/mysql-test/include/have_cassandra.opt +++ b/mysql-test/include/have_cassandra.opt @@ -1 +1 @@ ---cassandra=on +--plugin-load=$HA_CASSANDRA_SO --cassandra=on diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index e15f6339847..45e8adf1f5f 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -175,7 +175,8 @@ static struct /* we disable few other plugins by default */ { "ndbcluster", PLUGIN_OFF }, { "feedback", PLUGIN_OFF }, - { "pbxt", PLUGIN_OFF } + { "pbxt", PLUGIN_OFF }, + { "cassandra", PLUGIN_OFF } }; /* support for Services */ diff --git a/storage/cassandra/CMakeLists.txt b/storage/cassandra/CMakeLists.txt index 7852177b9b3..5db15542443 100644 --- a/storage/cassandra/CMakeLists.txt +++ b/storage/cassandra/CMakeLists.txt @@ -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}) #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 |