mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-5038 put tokudb into the server package

Browse source
This commit is contained in:
Sergei Golubchik 2013-11-11 09:30:35 +01:00
parent d1f2ba3985
commit 3d57c343e5
10 changed files with 24 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -350,6 +350,12 @@ 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-5.5.files.in
${CMAKE_SOURCE_DIR}/debian/mariadb-server-5.5.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

2
debian/autobake-deb.sh vendored
View file

@ -15,7 +15,7 @@ set -e
# Buildbot, running the test suite from installed .debs on a clean VM.
export DEB_BUILD_OPTIONS="nocheck"
export MARIADB_OPTIONAL_DEBS="tokudb-engine"
#export MARIADB_OPTIONAL_DEBS="tokudb-engine"
# Find major.minor version.
#

15
debian/dist/Debian/control vendored
View file

@ -190,12 +190,13 @@ Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6),
Provides: mariadb-server, mysql-server, virtual-mysql-server
Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
mariadb-tokudb-engine-5.5
Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
libmariadbclient16 (<< 5.3.4),
libmariadbclient-dev (<< 5.5.0)
libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
mariadb-tokudb-engine-5.5
Description: MariaDB database server binaries
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query
@ -239,11 +240,3 @@ Description: MariaDB database regression test suite (metapackage depending on th
mariadb-test (currently mariadb-test-5.5), as determined by the MariaDB
maintainers.
Package: mariadb-tokudb-engine-5.5
Section: database
Architecture: any
Depends: mariadb-server-5.5
Description: TokuDB storage engine for MariaDB
TokuDB is a highly scalable, zero maintenance downtime, ACID and MVCC
compliant MariaDB Storage Engine that offers powerful indexing-based query
acceleration. http://www.tokutek.com/products/tokudb-for-mysql/

1
debian/dist/Debian/mariadb-server-5.5.files → debian/dist/Debian/mariadb-server-5.5.files.in vendored
View file

@ -71,3 +71,4 @@ 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
@TOKUDB_DEB_FILES@

15
debian/dist/Ubuntu/control vendored
View file

@ -184,12 +184,13 @@ Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6),
Provides: mariadb-server, mysql-server, virtual-mysql-server
Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
mariadb-tokudb-engine-5.5
Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
libmariadbclient16 (<< 5.3.4),
libmariadbclient-dev (<< 5.5.0)
libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
mariadb-tokudb-engine-5.5
Description: MariaDB database server binaries
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query
@ -233,11 +234,3 @@ Description: MariaDB database regression test suite (metapackage depending on th
mariadb-test (currently mariadb-test-5.5), as determined by the MariaDB
maintainers.
Package: mariadb-tokudb-engine-5.5
Section: database
Architecture: any
Depends: mariadb-server-5.5
Description: TokuDB storage engine for MariaDB
TokuDB is a highly scalable, zero maintenance downtime, ACID and MVCC
compliant MariaDB Storage Engine that offers powerful indexing-based query
acceleration. http://www.tokutek.com/products/tokudb-for-mysql/

1
debian/dist/Ubuntu/mariadb-server-5.5.files → debian/dist/Ubuntu/mariadb-server-5.5.files.in vendored
View file

@ -73,3 +73,4 @@ 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
@TOKUDB_DEB_FILES@

5
debian/mariadb-tokudb-engine-5.5.files vendored
View file

@ -1,5 +0,0 @@
etc/mysql/conf.d/tokudb.cnf
usr/bin/tokuftdump
usr/lib/mysql/plugin/ha_tokudb.so
usr/share/doc/mariadb-tokudb-engine-5.5/README-TOKUDB
usr/share/doc/mariadb-tokudb-engine-5.5/README.md

8
storage/tokudb/CMakeLists.txt
View file

@ -15,6 +15,7 @@ IF(NOT TOKUDB_OK)
ENDIF()
SET(ENV{TOKUDB_VERSION} "7.0.4")
SET(TOKUDB_DEB_FILES "usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-5.5/README-TOKUDB\nusr/share/doc/mariadb-server-5.5/README.md" PARENT_SCOPE)
SET(USE_BDB OFF CACHE BOOL "")
SET(USE_VALGRIND OFF CACHE BOOL "")
SET(BUILD_TESTING OFF CACHE BOOL "")
@ -45,12 +46,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/ft-index/toku_include)
SET(TOKUDB_PLUGIN_DYNAMIC "ha_tokudb")
SET(TOKUDB_SOURCES ha_tokudb.cc)
MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY
COMPONENT "tokudb-engine"
LINK_LIBRARIES tokufractaltree_static tokuportability_static ${ZLIB_LIBRARY} stdc++)
SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin")
SET(CPACK_RPM_server_PACKAGE_OBSOLETES
"${CPACK_RPM_server_PACKAGE_OBSOLETES} MariaDB-tokudb-engine < 5.5.34" PARENT_SCOPE)
IF (INSTALL_SYSCONF2DIR)
INSTALL(FILES tokudb.cnf DESTINATION ${INSTALL_SYSCONF2DIR} COMPONENT tokudb-engine)
SET(CPACK_RPM_tokudb-engine_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*" PARENT_SCOPE)
INSTALL(FILES tokudb.cnf DESTINATION ${INSTALL_SYSCONF2DIR} COMPONENT Server)
ENDIF(INSTALL_SYSCONF2DIR)

2
storage/tokudb/ft-index/CMakeLists.txt
View file

@ -57,7 +57,7 @@ add_subdirectory(include)
add_subdirectory(toku_include)
#add_subdirectory(examples)
INSTALL_DOCUMENTATION(README.md README-TOKUDB COMPONENT "tokudb-engine")
INSTALL_DOCUMENTATION(README.md README-TOKUDB COMPONENT Server)
## build tags
#include(TokuBuildTagDatabases)

2
storage/tokudb/ft-index/ft/CMakeLists.txt
View file

@ -103,7 +103,7 @@ target_link_libraries(ftverify m)
install(
TARGETS tokuftdump
COMPONENT "tokudb-engine"
COMPONENT Server
DESTINATION ${INSTALL_BINDIR}
)