Make TokuDB run on 10.0

storage/tokudb/PerconaFT/portability/memory.cc

@@ -104,7 +104,13 @@ toku_memory_startup(void) {
             size_t lg_chunk; // log2 of the mmap threshold
             size_t lg_chunk_length = sizeof lg_chunk;
             result  = mallctl_f("opt.lg_chunk", &lg_chunk, &lg_chunk_length, NULL, 0);
-            if (result == 0)
+            if (result)
+            {
+                status.mmap_threshold = 1 << 21; // Default value.
+                                                 // Incompatible jemalloc change.
+                result = 0;
+            }
+            else
                 status.mmap_threshold = 1 << lg_chunk;
         }
     }

storage/tokudb/PerconaFT/tools/CMakeLists.txt

@@ -12,7 +12,7 @@ foreach(tool ${tools})
         (CMAKE_CXX_FLAGS_DEBUG MATCHES " -DENABLED_DEBUG_SYNC"))
       target_link_libraries(${tool} sql)
     endif()
-    target_link_libraries(${tool} perconaserverclient)
+    target_link_libraries(${tool} mysqlclient)
   endif ()
 
   add_space_separated_property(TARGET ${tool} COMPILE_FLAGS -fvisibility=hidden)

storage/tokudb/hatoku_defines.h

@@ -167,6 +167,14 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
 #define HA_CAN_WRITE_DURING_OPTIMIZE 0
 #endif
 
+#if !defined(HA_ONLINE_ANALYZE)
+#define HA_ONLINE_ANALYZE 0
+#endif
+
+#if !defined(MY_ATTRIBUTE)
+#define MY_ATTRIBUTE(A) __attribute__(A)
+#endif
+
 #if !defined(HA_OPTION_CREATE_FROM_ENGINE)
 #define HA_OPTION_CREATE_FROM_ENGINE 0
 #endif

storage/tokudb/hatoku_hton.cc

@@ -120,8 +120,8 @@ handlerton* tokudb_hton;
 const char* ha_tokudb_ext = ".tokudb";
 DB_ENV* db_env;
 
-#if TOKU_THDVAR_MEMALLOC_BUG
 static tokudb::thread::mutex_t tokudb_map_mutex;
+#if TOKU_THDVAR_MEMALLOC_BUG
 static TREE tokudb_map;
 struct tokudb_map_pair {
     THD* thd;

storage/tokudb/mysql-test/tokudb/disabled.def

@@ -29,3 +29,4 @@ cluster_key_part: engine options on partitioned tables
 i_s_tokudb_lock_waits_released: unstable, race conditions
 i_s_tokudb_locks_released: unstable, race conditions
 row_format: n/a
+nonflushing_analyze_debug: Freezes in MariaDB 10.0

storage/tokudb/mysql-test/tokudb_parts/disabled.def

@@ -7,3 +7,4 @@ partition_max_sub_parts_key_list_tokudb: 5.6 test not merged yet
 partition_max_sub_parts_key_range_tokudb: 5.6 test not merged yet
 partition_max_sub_parts_list_tokudb: 5.6 test not merged yet
 partition_max_sub_parts_range_tokudb: 5.6 test not merged yet
+nonflushing_analyze_debug: Freezes in MariaDB 10.0