Merge branch 'merge/merge-tokudb-5.6' into 10.0

5.6.31-77.0

storage/tokudb/CMakeLists.txt

-SET(TOKUDB_VERSION 5.6.30-76.3)
+SET(TOKUDB_VERSION 5.6.31-77.0)
 # PerconaFT only supports x86-64 and cmake-2.8.9+
 IF(CMAKE_VERSION VERSION_LESS "2.8.9")
   MESSAGE(STATUS "CMake 2.8.9 or higher is required by TokuDB")
@@ -82,10 +82,6 @@ IF(DEFINED TOKUDB_NOPATCH_CONFIG)
     ADD_DEFINITIONS("-DTOKUDB_NOPATCH_CONFIG=${TOKUDB_NOPATCH_CONFIG}")
 ENDIF()
 
-IF(DEFINED TOKUDB_CHECK_JEMALLOC)
-    ADD_DEFINITIONS("-DTOKUDB_CHECK_JEMALLOC=${TOKUDB_CHECK_JEMALLOC}")
-ENDIF()
-
 macro(set_cflags_if_supported)
   foreach(flag ${ARGN})
     string(REGEX REPLACE "-" "_" temp_flag ${flag})

storage/tokudb/PerconaFT/buildheader/make_tdb.cc

@@ -420,6 +420,8 @@ static void print_db_env_struct (void) {
                              "int (*set_client_pool_threads)(DB_ENV *, uint32_t)",
                              "int (*set_cachetable_pool_threads)(DB_ENV *, uint32_t)",
                              "int (*set_checkpoint_pool_threads)(DB_ENV *, uint32_t)",
+                             "void (*set_check_thp)(DB_ENV *, bool new_val)",
+                             "bool (*get_check_thp)(DB_ENV *)",
                              NULL};
 
         sort_and_dump_fields("db_env", true, extra);

storage/tokudb/PerconaFT/src/ydb-internal.h

@@ -132,6 +132,7 @@ struct __toku_db_env_internal {
     int datadir_lockfd;
     int logdir_lockfd;
     int tmpdir_lockfd;
+    bool check_thp;                                     // if set check if transparent huge pages are disables
     uint64_t (*get_loader_memory_size_callback)(void);
     uint64_t default_lock_timeout_msec;
     uint64_t (*get_lock_timeout_callback)(uint64_t default_lock_timeout_msec);

storage/tokudb/hatoku_defines.h

@@ -69,10 +69,6 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
 #pragma interface               /* gcc class implementation */
 #endif
 
-#if !defined(TOKUDB_CHECK_JEMALLOC)
-#define TOKUDB_CHECK_JEMALLOC 1
-#endif
-
 #if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099
 // mariadb 10.0
 #define TOKU_USE_DB_TYPE_TOKUDB 1

storage/tokudb/hatoku_hton.cc

@@ -266,7 +266,6 @@ static int tokudb_init_func(void *p) {
     db_env = NULL;
     tokudb_hton = (handlerton *) p;
 
-#if TOKUDB_CHECK_JEMALLOC
     if (tokudb::sysvars::check_jemalloc) {
         typedef int (*mallctl_type)(
             const char*,
@@ -293,7 +292,6 @@ static int tokudb_init_func(void *p) {
             goto error;
         }
     }
-#endif
 
     r = tokudb_set_product_name();
     if (r) {
@@ -538,6 +536,8 @@ static int tokudb_init_func(void *p) {
         db_env,
         tokudb_get_loader_memory_size_callback);
 
+    db_env->set_check_thp(db_env, tokudb::sysvars::check_jemalloc);
+
     r = db_env->open(
         db_env,
         tokudb_home,

storage/tokudb/mysql-test/rpl/t/suite.opt

-$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0
+$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0 --loose-tokudb-cache-size=512M --loose-tokudb-block-size=1M

storage/tokudb/mysql-test/tokudb/bulk-fetch-gen.py

@@ -71,6 +71,7 @@ tables = [
 ]
 
 # Code generation stats here
+print "source include/have_tokudb.inc;"
 print "# Tokutek"
 print "# Test that bulk fetch works with various table types"
 print ""

storage/tokudb/mysql-test/tokudb/locks-blocking-row-locks-testgen.py

@@ -56,6 +56,7 @@ write_range_queries = [
 timeouts = [0, 500]
 
 # Here's where all the magic happens
+print "source include/have_tokudb.inc;"
 print "# Tokutek"
 print "# Blocking row lock tests;"
 print "# Generated by %s on %s;" % (__file__, datetime.date.today())

storage/tokudb/mysql-test/tokudb/replace-ignore-gen.py

@@ -23,6 +23,7 @@ def sqlgen_explain_and_do(query):
 def sqlgen_drop_table():
     print "drop table t;"
 
+print "source include/have_tokudb.inc;"
 print "# Tokutek"
 print "# Test that replace into and insert ignore insertions "
 print "# work under various index schemas. "

storage/tokudb/mysql-test/tokudb/t/change_column_bin.py

@@ -22,6 +22,7 @@ def gen_test(n):
     print "DROP TABLE t;"
 
 def main():
+    print "source include/have_tokudb.inc;"
     print "# this test is generated by change_bin.py"
     print "# test binary expansion is hot"
     print "--source include/big_test.inc"

storage/tokudb/mysql-test/tokudb/t/change_column_bin_rename.py

@@ -26,6 +26,7 @@ def gen_test(n):
     print "DROP TABLE t;"
 
 def main():
+    print "source include/have_tokudb.inc;"
     print "# this test is generated by change_char_rename.py"
     print "# test char expansion + rename is hot"
     print "--disable_warnings"

storage/tokudb/mysql-test/tokudb/t/change_column_blob.py

 import sys
 def main():
+    print "source include/have_tokudb.inc;"
     print "# this test is generated by change_blob.py"
     print "# generate hot blob expansion test cases"
     print "--disable_warnings"

storage/tokudb/mysql-test/tokudb/t/change_column_char.py

@@ -22,6 +22,7 @@ def gen_test(n):
     print "DROP TABLE t;"
 
 def main():
+    print "source include/have_tokudb.inc;"
     print "# this test is generated by change_char.py"
     print "# test char expansion"
     print "--source include/big_test.inc"

storage/tokudb/mysql-test/tokudb/t/change_column_char_binary.py

@@ -23,6 +23,7 @@ def gen_test(n):
     print "DROP TABLE t;"
 
 def main():
+    print "source include/have_tokudb.inc;"
     print "# this test is generated by change_char_binary.py"
     print "# test that char(X) <-> binary(X) is not hot"
     print "--disable_warnings"

storage/tokudb/mysql-test/tokudb/t/change_column_char_charbinary.py

@@ -23,6 +23,7 @@ def gen_test(n):
     print "DROP TABLE t;"
 
 def main():
+    print "source include/have_tokudb.inc;"
     print "# this test is generated by change_char_charbinary.py"
     print "# test that char(X) <-> char(X) binary is not hot"
     print "--disable_warnings"

storage/tokudb/mysql-test/tokudb/t/change_column_char_rename.py

@@ -26,6 +26,7 @@ def gen_test(n):
     print "DROP TABLE t;"
 
 def main():
+    print "source include/have_tokudb.inc;"
     print "# this test is generated by change_char_rename.py"
     print "# test char expansion + rename is hot"
     print "--disable_warnings"

storage/tokudb/mysql-test/tokudb/t/change_column_int.py

@@ -25,6 +25,7 @@ def gen_test(types, values):
                 print "DROP TABLE ti;"
             print "DROP TABLE t;"
 def main():
+    print "source include/have_tokudb.inc;"
     print "# this test is generated by change_int.py"
     print "# test int expansion is hot"
     print "--disable_warnings"

storage/tokudb/mysql-test/tokudb/t/change_column_int_key.py

@@ -25,6 +25,7 @@ def gen_test(types):
                 print "DROP TABLE t;"
 
 def main():
+    print "source include/have_tokudb.inc;"
     print "# this test is generated by change_int_key.py"
     print "# ensure that changing an int column that is part of a key is not hot"
     print "--disable_warnings"

storage/tokudb/mysql-test/tokudb/t/change_column_int_not_supported.py

@@ -21,6 +21,7 @@ def gen_tests(int_types, modifiers):
         for from_modifier in range(len(modifiers)):
             gen_tests_for_int(from_int, from_modifier, int_types, modifiers)
 def main():
+    print "source include/have_tokudb.inc;"
     print "# this test is generated by change_int_not_supported.py"
     print "# ensure that int types are only expanded and are not cnverted to some other type"
     print "--disable_warnings"

storage/tokudb/mysql-test/tokudb/t/change_column_int_rename.py

@@ -27,6 +27,7 @@ def gen_test(types, values):
                 print "DROP TABLE ti;"
             print "DROP TABLE t;"
 def main():
+    print "source include/have_tokudb.inc;"
     print "# this test is generated by change_int_rename.py"
     print "--disable_warnings"
     print "DROP TABLE IF EXISTS t, ti;"

storage/tokudb/mysql-test/tokudb/t/change_column_multiple_columns.py

@@ -6,6 +6,7 @@ old_types = [ 'VARCHAR(1)', 'VARBINARY(1)', 'INT', 'CHAR(1)', 'BINARY(1)' ]
 new_types = [ 'VARCHAR(2)', 'VARBINARY(2)', 'BIGINT', 'CHAR(2)', 'BINARY(2)' ]
 
 def main():
+    print "source include/have_tokudb.inc;"
     print "# this test generated by change_multiple_columns.py"
     print "# this test generated multiple column changes which should all fail since we support only one at a time"
     print "--disable_warnings"

storage/tokudb/mysql-test/tokudb/t/change_column_text.py

 import sys
 def main():
+    print "source include/have_tokudb.inc;"
     print "# this test is generated by change_text.py"
     print "# generate hot text expansion test cases"
     print "--disable_warnings"

storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test

@@ -53,6 +53,9 @@ select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
 connection conn_a;
 commit;
 # verify that the lock on the 1st transaction is released and replaced by the lock for the 2nd transaction
+let $wait_condition= select count(*)=1 from information_schema.tokudb_locks where locks_dname='./test/t-main';
+source include/wait_condition.inc;
+
 replace_column 1 TRX_ID 2 MYSQL_ID;
 select * from information_schema.tokudb_locks;
 select * from information_schema.tokudb_lock_waits;

storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks_released.test

@@ -44,6 +44,9 @@ eval select * from information_schema.tokudb_locks;
 connection conn_a;
 commit;
 # verify that the lock on the 1st transaction is released and replaced by the lock for the 2nd transaction
+let $wait_condition= select count(*)=1 from information_schema.tokudb_locks where locks_dname='./test/t-main';
+source include/wait_condition.inc;
+
 replace_column 1 TRX_ID 2 MYSQL_ID;
 select * from information_schema.tokudb_locks;
 

storage/tokudb/mysql-test/tokudb/t/suite.opt

-$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0
+$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0 --loose-tokudb-cache-size=512M --loose-tokudb-block-size=1M

storage/tokudb/mysql-test/tokudb_add_index/t/suite.opt

-$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0
+$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0 --loose-tokudb-cache-size=512M --loose-tokudb-block-size=1M

storage/tokudb/mysql-test/tokudb_alter_table/t/suite.opt

-$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0
+$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0 --loose-tokudb-cache-size=512M --loose-tokudb-block-size=1M

storage/tokudb/mysql-test/tokudb_backup/t/suite.opt

-$TOKUDB_OPT $TOKUDB_LOAD_ADD $TOKUDB_BACKUP_OPT $TOKUDB_BACKUP_LOAD_ADD --loose-tokudb-check-jemalloc=0
+$TOKUDB_OPT $TOKUDB_LOAD_ADD $TOKUDB_BACKUP_OPT $TOKUDB_BACKUP_LOAD_ADD --loose-tokudb-check-jemalloc=0 --loose-tokudb-cache-size=512M --loose-tokudb-block-size=1M

storage/tokudb/mysql-test/tokudb_bugs/t/suite.opt

-$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0
+$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0 --loose-tokudb-cache-size=512M --loose-tokudb-block-size=1M

storage/tokudb/mysql-test/tokudb_parts/t/suite.opt

-$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0
+$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0 --loose-tokudb-cache-size=512M --loose-tokudb-block-size=1M

storage/tokudb/mysql-test/tokudb_rpl/t/rpl_rfr_disable_on_expl_pk_absence-slave.opt

---read-only=true --tokudb-rpl-unique-checks=false --tokudb-rpl-lookup-rows=false
+--read-only=true --loose-tokudb-rpl-unique-checks=false --loose-tokudb-rpl-lookup-rows=false

storage/tokudb/mysql-test/tokudb_sys_vars/t/suite.opt

-$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0
+$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0 --loose-tokudb-cache-size=512M --loose-tokudb-block-size=1M

storage/tokudb/tokudb_sysvars.cc

@@ -74,9 +74,7 @@ char*       gdb_path = NULL;
 my_bool     gdb_on_fatal = FALSE;
 #endif
 
-#if TOKUDB_CHECK_JEMALLOC
-uint        check_jemalloc = 0;
-#endif
+my_bool        check_jemalloc = TRUE;
 
 static MYSQL_SYSVAR_ULONGLONG(
     cache_size,
@@ -416,19 +414,14 @@ static MYSQL_SYSVAR_BOOL(
     true);
 #endif
 
-#if TOKUDB_CHECK_JEMALLOC
-static MYSQL_SYSVAR_UINT(
+static MYSQL_SYSVAR_BOOL(
     check_jemalloc,
     check_jemalloc,
-    0,
-    "check if jemalloc is linked",
+    PLUGIN_VAR_READONLY|PLUGIN_VAR_RQCMDARG,
+    "check if jemalloc is linked and transparent huge pages are disabled",
     NULL,
     NULL,
-    1,
-    0,
-    1,
-    0);
-#endif
+    TRUE);
 
 
 //******************************************************************************
@@ -948,9 +941,7 @@ st_mysql_sys_var* system_variables[] = {
     MYSQL_SYSVAR(gdb_on_fatal),
 #endif
 
-#if TOKUDB_CHECK_JEMALLOC
     MYSQL_SYSVAR(check_jemalloc),
-#endif
 
     // session vars
     MYSQL_SYSVAR(alter_print_error),

storage/tokudb/tokudb_sysvars.h

@@ -108,9 +108,7 @@ extern char*        gdb_path;
 extern my_bool      gdb_on_fatal;
 #endif
 
-#if TOKUDB_CHECK_JEMALLOC
-extern uint         check_jemalloc;
-#endif
+extern my_bool         check_jemalloc;
 
 #if TOKUDB_DEBUG
 // used to control background job manager