diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-06 14:40:32 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-06 14:40:32 +0200 |
| commit | 7a0a2c4b849a38814db8aa996964268ff6aa0f6f (patch) | |
| tree | f5d5584082c1e8bb167fecefec5dda47f7a1c220 | |
| parent | aff4854dfd3667b58e73996a2710621efc468374 (diff) | |
| download | mariadb-git-7a0a2c4b849a38814db8aa996964268ff6aa0f6f.tar.gz | |
after tokudb-7.1.6 merge
| -rw-r--r-- | .bzrignore | 8 | ||||
| -rw-r--r-- | storage/tokudb/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/tokudb/ft-index/tools/CMakeLists.txt | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.bzrignore b/.bzrignore index 4142df6575f..84ccfa2beff 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1415,7 +1415,7 @@ storage/tokudb/ft-index/portability/tests/try-uninit storage/tokudb/ft-index/src/merge_archives_tokufractaltree_static.cmake storage/tokudb/ft-index/src/tokufractaltree_static_depends.cc storage/tokudb/ft-index/src/tests/recovery_fileops_unit_dir -storage/tokudb/ft-index/toku_include/toku_config.h +storage/tokudb/ft-index/portability/toku_config.h storage/tokudb/ft-index/util/tests/marked-omt-test storage/tokudb/ft-index/util/tests/omt-tmpl-test storage/tokudb/ft-index/util/tests/sort-tmpl-test @@ -1429,8 +1429,8 @@ storage/tokudb/ft-index/util/tests/test_partitioned_counter storage/tokudb/ft-index/util/tests/test_partitioned_counter_5833 storage/tokudb/ft-index/util/tests/threadpool-test storage/tokudb/ft-index/util/tests/threadpool-testrunf -storage/tokudb/ft-index/utils/tokudb_dump -storage/tokudb/ft-index/utils/tokudb_gen -storage/tokudb/ft-index/utils/tokudb_load +storage/tokudb/ft-index/tools/tokudb_dump +storage/tokudb/ft-index/tools/tokudb_gen +storage/tokudb/ft-index/tools/tokudb_load libmysql/libmysql_versions.ld scripts/mysql_config.pl diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt index 5f9f92a3f2b..c46f816dc2b 100644 --- a/storage/tokudb/CMakeLists.txt +++ b/storage/tokudb/CMakeLists.txt @@ -14,7 +14,7 @@ IF(NOT TOKUDB_OK OR WITHOUT_TOKUDB OR WITHOUT_TOKUDB_STORAGE_ENGINE) ENDIF() ############################################ -SET(TOKUDB_VERSION "7.1.5") +SET(TOKUDB_VERSION "7.1.6") 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 "") diff --git a/storage/tokudb/ft-index/tools/CMakeLists.txt b/storage/tokudb/ft-index/tools/CMakeLists.txt index 498918951e2..67763535920 100644 --- a/storage/tokudb/ft-index/tools/CMakeLists.txt +++ b/storage/tokudb/ft-index/tools/CMakeLists.txt @@ -2,7 +2,7 @@ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE DONT_DEPR set(utils tokudb_gen tokudb_load tokudb_dump) foreach(util ${utils}) - add_executable(${util} ${util}) + add_executable(${util} ${util}.cc) set_target_properties(${util} PROPERTIES COMPILE_DEFINITIONS "IS_TDB=1;USE_TDB=1;TDB_IS_STATIC=1") target_link_libraries(${util} ${LIBTOKUDB}_static ft_static z lzma ${LIBTOKUPORTABILITY}_static ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS}) |