diff options
| -rw-r--r-- | .bzrignore | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | debian/dist/Debian/mariadb-server-10.0.files.in (renamed from debian/dist/Debian/mariadb-server-10.0.files) | 4 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/mariadb-server-10.0.files.in (renamed from debian/dist/Ubuntu/mariadb-server-10.0.files) | 4 | ||||
| -rw-r--r-- | storage/cassandra/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | storage/cassandra/cassandra_se.cc | 12 | ||||
| -rw-r--r-- | storage/cassandra/gen-cpp/Cassandra.h | 2 | ||||
| -rw-r--r-- | storage/cassandra/gen-cpp/cassandra_types.h | 8 | ||||
| -rw-r--r-- | storage/oqgraph/CMakeLists.txt | 2 |
9 files changed, 37 insertions, 17 deletions
diff --git a/.bzrignore b/.bzrignore index 2d610a792e7..457e90537fd 100644 --- a/.bzrignore +++ b/.bzrignore @@ -162,6 +162,8 @@ dbug/user.ps dbug/user.t debian/control debian/defs.mk +debian/dist/Debian/mariadb-server-10.0.files +debian/dist/Ubuntu/mariadb-server-10.0.files debug/ depcomp Docs/INSTALL-BINARY diff --git a/CMakeLists.txt b/CMakeLists.txt index 823bac6b6e3..19f951c7589 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -345,6 +345,18 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY) +IF(DEB) + CONFIGURE_FILE( + ${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.0.files.in + ${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.0.files) + CONFIGURE_FILE( + ${CMAKE_SOURCE_DIR}/debian/dist/Debian/mariadb-server-10.0.files.in + ${CMAKE_SOURCE_DIR}/debian/dist/Debian/mariadb-server-10.0.files) + CONFIGURE_FILE( + ${CMAKE_SOURCE_DIR}/debian/dist/Ubuntu/mariadb-server-10.0.files.in + ${CMAKE_SOURCE_DIR}/debian/dist/Ubuntu/mariadb-server-10.0.files) +ENDIF(DEB) + # Handle the "INFO_*" files. INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake) # Source: This can be done during the cmake phase, all information is diff --git a/debian/dist/Debian/mariadb-server-10.0.files b/debian/dist/Debian/mariadb-server-10.0.files.in index 47588b8084e..1f1132ea4fa 100644 --- a/debian/dist/Debian/mariadb-server-10.0.files +++ b/debian/dist/Debian/mariadb-server-10.0.files.in @@ -5,8 +5,6 @@ usr/lib/mysql/plugin/auth_test_plugin.so usr/lib/mysql/plugin/daemon_example.ini usr/lib/mysql/plugin/dialog_examples.so usr/lib/mysql/plugin/dialog.so -usr/lib/mysql/plugin/ha_cassandra.so -usr/lib/mysql/plugin/ha_oqgraph.so usr/lib/mysql/plugin/handlersocket.so usr/lib/mysql/plugin/libdaemon_example.so usr/lib/mysql/plugin/mypluglib.so @@ -81,3 +79,5 @@ usr/share/mysql/mysql_system_tables_data.sql usr/share/mysql/mysql_system_tables.sql usr/share/mysql/mysql_performance_tables.sql usr/share/mysql/mysql_test_data_timezone.sql +@CASSANDRA_DEB_FILES@ +@OQGRAPH_DEB_FILES@ diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.files b/debian/dist/Ubuntu/mariadb-server-10.0.files.in index bb43e15c558..565405adb6f 100644 --- a/debian/dist/Ubuntu/mariadb-server-10.0.files +++ b/debian/dist/Ubuntu/mariadb-server-10.0.files.in @@ -5,8 +5,6 @@ usr/lib/mysql/plugin/auth_test_plugin.so usr/lib/mysql/plugin/daemon_example.ini usr/lib/mysql/plugin/dialog_examples.so usr/lib/mysql/plugin/dialog.so -usr/lib/mysql/plugin/ha_cassandra.so -usr/lib/mysql/plugin/ha_oqgraph.so usr/lib/mysql/plugin/handlersocket.so usr/lib/mysql/plugin/libdaemon_example.so usr/lib/mysql/plugin/mypluglib.so @@ -83,3 +81,5 @@ usr/share/mysql/mysql_system_tables_data.sql usr/share/mysql/mysql_system_tables.sql usr/share/mysql/mysql_performance_tables.sql usr/share/mysql/mysql_test_data_timezone.sql +@CASSANDRA_DEB_FILES@ +@OQGRAPH_DEB_FILES@ diff --git a/storage/cassandra/CMakeLists.txt b/storage/cassandra/CMakeLists.txt index 5975246233e..63e413ccb7b 100644 --- a/storage/cassandra/CMakeLists.txt +++ b/storage/cassandra/CMakeLists.txt @@ -10,6 +10,7 @@ ${Thrift_INCLUDE_DIR} # this may be set ) # Verify that thrift linking library is found +SET(Thrift_LIB_PATHS ${Thrift_LIB_PATHS} /usr/local/lib /opt/local/lib /opt/lib) FIND_LIBRARY(Thrift_LIBS NAMES thrift PATHS ${Thrift_LIB_PATHS} ${Thrift_LIB}) IF(EXISTS ${Thrift_LIBS}) GET_FILENAME_COMPONENT(LINK_DIR ${Thrift_LIBS} PATH ABSOLUTE) @@ -17,15 +18,16 @@ ELSE() RETURN() ENDIF() -INCLUDE_DIRECTORIES(AFTER ${Thrift_INCLUDE_DIRS}) +INCLUDE_DIRECTORIES(AFTER ${Thrift_INCLUDE_DIRS}/..) SET(CMAKE_REQUIRED_INCLUDES ${Thrift_INCLUDE_DIRS}) STRING(REPLACE "-fno-exceptions" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) +SET(CMAKE_REQUIRED_INCLUDES "${Thrift_INCLUDE_DIRS}/..") CHECK_CXX_SOURCE_COMPILES( " -#include <Thrift.h> +#include <thrift/Thrift.h> #include <boost/shared_ptr.hpp> int main() { boost::shared_ptr<char> p(new char(10)); @@ -48,6 +50,8 @@ IF(CASSANDRASE_OK) LINK_DIRECTORIES(${LINK_DIR}) + SET(CASSANDRA_DEB_FILES "usr/lib/mysql/plugin/ha_cassandra.so" PARENT_SCOPE) + MYSQL_ADD_PLUGIN(cassandra ${cassandra_sources} STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES thrift COMPONENT cassandra-engine) IF (INSTALL_SYSCONFDIR) INSTALL(FILES cassandra.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d diff --git a/storage/cassandra/cassandra_se.cc b/storage/cassandra/cassandra_se.cc index 0d62c5af7a6..6ae3b7e3609 100644 --- a/storage/cassandra/cassandra_se.cc +++ b/storage/cassandra/cassandra_se.cc @@ -6,12 +6,12 @@ #include <stdio.h> #include <stdarg.h> -#include "Thrift.h" -#include "transport/TSocket.h" -#include "transport/TTransport.h" -#include "transport/TBufferTransports.h" -#include "protocol/TProtocol.h" -#include "protocol/TBinaryProtocol.h" +#include "thrift/Thrift.h" +#include "thrift/transport/TSocket.h" +#include "thrift/transport/TTransport.h" +#include "thrift/transport/TBufferTransports.h" +#include "thrift/protocol/TProtocol.h" +#include "thrift/protocol/TBinaryProtocol.h" #include "gen-cpp/Cassandra.h" // cassandra includes end diff --git a/storage/cassandra/gen-cpp/Cassandra.h b/storage/cassandra/gen-cpp/Cassandra.h index 2040cc63aa2..b98570043a9 100644 --- a/storage/cassandra/gen-cpp/Cassandra.h +++ b/storage/cassandra/gen-cpp/Cassandra.h @@ -7,7 +7,7 @@ #ifndef Cassandra_H #define Cassandra_H -#include <TProcessor.h> +#include <thrift/TProcessor.h> #include "cassandra_types.h" namespace org { namespace apache { namespace cassandra { diff --git a/storage/cassandra/gen-cpp/cassandra_types.h b/storage/cassandra/gen-cpp/cassandra_types.h index d675198dcc8..226c5fa570a 100644 --- a/storage/cassandra/gen-cpp/cassandra_types.h +++ b/storage/cassandra/gen-cpp/cassandra_types.h @@ -10,10 +10,10 @@ #include <inttypes.h> #include <netinet/in.h> -#include <Thrift.h> -#include <TApplicationException.h> -#include <protocol/TProtocol.h> -#include <transport/TTransport.h> +#include <thrift/Thrift.h> +#include <thrift/TApplicationException.h> +#include <thrift/protocol/TProtocol.h> +#include <thrift/transport/TTransport.h> diff --git a/storage/oqgraph/CMakeLists.txt b/storage/oqgraph/CMakeLists.txt index 593fced6235..ecb986bf018 100644 --- a/storage/oqgraph/CMakeLists.txt +++ b/storage/oqgraph/CMakeLists.txt @@ -32,6 +32,8 @@ IF(BOOST_OK) STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) ENDIF(MSVC) + SET(OQGRAPH_DEB_FILES "usr/lib/mysql/plugin/ha_oqgraph.so" PARENT_SCOPE) + MYSQL_ADD_PLUGIN(oqgraph ha_oqgraph.cc graphcore.cc STORAGE_ENGINE MODULE_ONLY) ENDIF(BOOST_OK) |