after tokudb-7.1.6 merge

.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

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 "")

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})