Commit graph

33 commits

Author SHA1 Message Date
Sergei Golubchik
0dc23679c8 10.0-base merge 2014-02-26 15:28:07 +01:00
Sergei Golubchik
004642525d Fix "cmake . && cmake -DWITHOUT_TOKUDB=1" to disable tokudb 2014-02-21 23:42:29 +01:00
Sergei Golubchik
d28d3ba40d 10.0-base merge 2013-12-16 13:02:21 +01:00
Sergei Golubchik
976e242c78 update tokudb version. mask tests that are broken there. 2013-12-12 11:42:00 +01:00
Sergei Golubchik
ff41edab6c merge with ft-engine and ft-index up to tag:tokudb-7.1.0 2013-11-19 15:35:31 +01:00
Sergei Golubchik
4157185f24 10.0-base merge 2013-11-13 23:03:48 +01:00
Sergei Golubchik
fb46f35f05 mark ft-index cmake variables as advanced 2013-11-11 17:20:10 +01:00
Sergei Golubchik
3d57c343e5 MDEV-5038 put tokudb into the server package 2013-11-11 09:30:35 +01:00
Rich Prohaska
3152434eeb #92 add compiler and cmake checks from mariadb 2013-09-26 12:05:54 -04:00
Rich Prohaska
c939c606e8 #97 use ${ZLIB_LIBRARY} 2013-09-24 10:26:27 -04:00
unknown
e5746665c9 merge 10.0-base -> 10.0 2013-09-26 21:20:15 +03:00
Sergei Golubchik
181b13d926 simplify CMakeLists.txt for cassandra/connect engines
now, if the dynamic plugin puts itself in a distinct component, then
* ${plugin}.cnf file is generated and installed automatically
* a separate RPM is generated automatically
* necessary FILELIST/PROVIDES/OBSOLETES/REQUIRES are filled in automatically
2013-09-25 19:32:14 +02:00
Sergei Golubchik
43f4e364f0 MDEV-5021 tokudb ft-index libraries are build with -DWITHOUT_TOKUDB=1 2013-09-19 20:19:10 +02:00
Leif Walsh
a4f82b7d99 added -flto -fuse-linker-plugin to RelWithDebInfo #77 2013-09-17 13:02:58 -04:00
unknown
28a8d40c22 Tokudb made compilig. 2013-09-23 12:17:18 +03:00
Sergei Golubchik
adf637dff6 tokudb buildbot fixes
BUILD/compile-solaris-amd64:
  * call cmake directly, don't go through three layers of wrappers
    (but preserve the compile-solaris-amd64 file - buildbot uses it for 5.1 and 5.5)
  * disable jemalloc, it doesn't compile on our sol10-64 box
storage/federated/ha_federated.cc:
  clang warning
storage/tokudb/CMakeLists.txt:
  * require cmake-2.8.9, because 2.8.8 doesn't add -fPIC for POSITION_INDEPENDENT_CODE
    property that ft-index CMakeLists.txt files are using
2013-09-12 10:10:09 +02:00
Sergei Golubchik
265bbf5fe1 introduce sysconf2dir, install tokudb.conf there, both in rpm and deb 2013-09-10 22:59:18 +02:00
Sergei Golubchik
3e5b21067b MariaDB-tokudb-engine.rpm
cmake/plugin.cmake:
  * auto-create an rpm for a plugin, if it places itself in a new component
storage/tokudb/CMakeLists.txt:
  install tokudb in COMPONENT tokudb-engine.
  this automatically creates a separate rpm for it.
2013-09-09 14:09:09 +02:00
Sergei Golubchik
5b2e3b01f0 fixes for buildbot
* disable jemalloc on windows (cannot run ./configure)
* disable jemalloc on ancient cmake (ExternalProject does not work)
* rewrite TokuDB compiler test to check for features, not versions (to work on cmake before 2.8.11)
* fix ft-index to not add VALGRIND_INCLUDE_DIR to includes, if no valgrind was found
* correct the package name in FindValgrind.cmake (for find_package(... REQUIRED) to work)
* disable ft-index tests by default (faster compilation and they aren't used anyway)
* don't build ft-index with valgrind by default (otherwise it *requires* valgrind, it doesn't auto-detect)
* use --loose-tokudb in the .opt file
2013-09-09 14:02:42 +02:00
Sergei Golubchik
00686e6d0e cmake fixes for tokudb
cmake/jemalloc.cmake:
  for dependencies to work, LIBJEMALLOC should be the target name, not the path
storage/tokudb/CMakeLists.txt:
  * check the preconditions
  * disable bdb tests (compilation errors)
  * set variable, instead of SET_PROPERTY. same effect,
    but doesn't fail when a plugin is disabled (that is, a target does not exist)
storage/tokudb/ft-index/CMakeLists.txt:
  cmake should not look into examples/ directory,
  there is hand-crafted examples/Makefile that
  cmake will overwrite
storage/tokudb/ft-index/buildheader/CMakeLists.txt:
  the syntax is ADD_EXECUTABLE(target source) and "source" is the file name
storage/tokudb/ft-index/cmake_modules/TokuMergeLibs.cmake:
  Libraries must be specified in the specific order,
  REMOVE_DUPLICATES cannot be used, because it destroys this order.
  
  (when OSLIBS contains "-lpthread -ljemalloc -lpthread", REMOVE_DUPLICATES
  makes it "-lpthread -ljemalloc". But a thread library *must* be *after* jemalloc)
storage/tokudb/ft-index/cmake_modules/TokuSetupCTest.cmake:
  * 'which' might print errors to stderr, they are not important, shut them up
  * we don't have TOKUDB_DATA, no need to warn about it
  * don't configure_file into itself (with input=output)
storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake:
  jemalloc is built externally to tokudb/ft-index
storage/tokudb/ft-index/ft/CMakeLists.txt:
  the syntax is ADD_EXECUTABLE(target source) and "source" is the file name
storage/tokudb/ft-index/ft/tests/CMakeLists.txt:
  the syntax is ADD_EXECUTABLE(target source) and "source" is the file name
storage/tokudb/ft-index/locktree/tests/CMakeLists.txt:
  the syntax is ADD_EXECUTABLE(target source) and "source" is the file name
storage/tokudb/ft-index/portability/CMakeLists.txt:
  s/jemalloc/libjemalloc/
storage/tokudb/ft-index/portability/os_malloc.cc:
  unnecessary include file
storage/tokudb/ft-index/portability/tests/CMakeLists.txt:
  the syntax is ADD_EXECUTABLE(target source) and "source" is the file name
storage/tokudb/ft-index/src/tests/CMakeLists.txt:
  the syntax is ADD_EXECUTABLE(target source) and "source" is the file name
storage/tokudb/ft-index/util/tests/CMakeLists.txt:
  the syntax is ADD_EXECUTABLE(target source) and "source" is the file name
storage/tokudb/ft-index/utils/CMakeLists.txt:
  the syntax is ADD_EXECUTABLE(target source) and "source" is the file name
2013-09-09 13:57:22 +02:00
Leif Walsh
ce338d55ac #10 add binary directory's toku_include dir 2013-04-27 15:38:20 -03:00
Leif Walsh
c5d0f4dad6 try fixing names 2013-04-27 15:22:31 -03:00
Leif Walsh
8871076abc #10 change handlerton cmake to include ft-index directly 2013-04-27 13:54:48 -04:00
Rich Prohaska
441ed1b542 refs #5780 build basic tokudb in percona server
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@51373 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:02:16 -04:00
Leif Walsh
2ccde85fc2 refs #5368 add lto flags to handlerton
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@48336 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:02:14 -04:00
Leif Walsh
758cb019a5 refs #4871 try fixing handlerton linkage of stdc++
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@46048 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:02:13 -04:00
Rich Prohaska
420dec8bb1 #4536 add z lib to the handlerton library lib in mysql 5.5.25 refs[t:4536]
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@44793 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:02:12 -04:00
Rich Prohaska
ee1e9cfd38 #4921 add per table data size to the tokudb_user_data information schema. also, combine all handlerton source into one compiled file refs[t:4921]
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@43824 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:02:11 -04:00
Rich Prohaska
118501a0e2 #4096 add version string to portability lib name refs[t:4096]
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@38430 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:02:08 -04:00
Rich Prohaska
656714c994 #3018 build tokudb on mysql-5.5.10 refs[t:3018]
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@29822 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:02:05 -04:00
Rich Prohaska
4e9922211a #3018 build 5.5.9 with tokudb using cmake refs[t:3018]
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@28788 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:02:04 -04:00
Yoni Fogel
e0345dbc54 Addresses #1504 Add ability to generate CMakeLists.txt
with appropriate include directories
make -f Makefile.win TOKUDB_DIR=c:/.../..

git-svn-id: file:///svn/mysql/tokudb-engine/src@9833 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:47 -04:00
Zardosht Kasheff
4cb946351d addresses #1283
make it so that for MySQL, we can just check out a directory and have tokudb
compiled in

git-svn-id: file:///svn/mysql/tokudb-engine/src@9093 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:46 -04:00