remove cruft

storage/tokudb/ha_tokudb.cc

@@ -1873,7 +1873,7 @@ exit:
 //      1 on error
 //
 int ha_tokudb::open(const char *name, int mode, uint test_if_locked) {
-    TOKUDB_DBUG_ENTER("ha_tokudb::open %p %s", this, name);
+    TOKUDB_DBUG_ENTER("ha_tokudb::open %p %s %o %u", this, name, mode, test_if_locked);
     THD* thd = ha_thd();
 
     int error = 0;
@@ -3341,7 +3341,7 @@ cleanup:
 }
 
 void ha_tokudb::start_bulk_insert(ha_rows rows) {
-    TOKUDB_DBUG_ENTER("ha_tokudb::start_bulk_insert");
+    TOKUDB_DBUG_ENTER("ha_tokudb::start_bulk_insert %p txn %p", this, transaction);
     THD* thd = ha_thd();
     tokudb_trx_data* trx = (tokudb_trx_data *) thd_data_get(thd, tokudb_hton->slot);
     delay_updating_ai_metadata = true;
@@ -6956,7 +6956,7 @@ row_format_to_row_type(srv_row_format_t row_format)
 //      error otherwise
 //
 int ha_tokudb::create(const char *name, TABLE * form, HA_CREATE_INFO * create_info) {
-    TOKUDB_DBUG_ENTER("ha_tokudb::create");
+    TOKUDB_DBUG_ENTER("ha_tokudb::create %p %s", this, name);
     int error;
     DB *status_block = NULL;
     uint version;
@@ -7005,7 +7005,7 @@ int ha_tokudb::create(const char *name, TABLE * form, HA_CREATE_INFO * create_in
     newname = (char *)my_malloc(get_max_dict_name_path_length(name),MYF(MY_WME));
     if (newname == NULL){ error = ENOMEM; goto cleanup;}
 
-    if (thd_sql_command(thd) == SQLCOM_CREATE_TABLE && trx && trx->sub_sp_level) {
+    if (trx && trx->sub_sp_level && thd_sql_command(thd) == SQLCOM_CREATE_TABLE) {
         txn = trx->sub_sp_level;
     }
     else {

storage/tokudb/hatoku_defines.h

@@ -215,7 +215,6 @@ extern ulong tokudb_debug;
 #define TOKUDB_DEBUG_TXN 32
 #define TOKUDB_DEBUG_AUTO_INCREMENT 64
 #define TOKUDB_DEBUG_LOCK 256
-#define TOKUDB_DEBUG_LOCKRETRY 512
 #define TOKUDB_DEBUG_CHECK_KEY 1024
 #define TOKUDB_DEBUG_HIDE_DDL_LOCK_ERRORS 2048
 #define TOKUDB_DEBUG_ALTER_TABLE_INFO 4096

storage/tokudb/hatoku_hton.cc

@@ -331,16 +331,7 @@ static int tokudb_init_func(void *p) {
     if (!tokudb_home)
         tokudb_home = mysql_real_data_home;
     DBUG_PRINT("info", ("tokudb_home: %s", tokudb_home));
-#if 0
-    if (!tokudb_log_buffer_size) { // QQQ
-        tokudb_log_buffer_size = max(table_cache_size * 512, 32 * 1024);
-        DBUG_PRINT("info", ("computing tokudb_log_buffer_size %ld\n", tokudb_log_buffer_size));
-    }
-    tokudb_log_file_size = tokudb_log_buffer_size * 4;
-    tokudb_log_file_size = MY_ALIGN(tokudb_log_file_size, 1024 * 1024L);
-    tokudb_log_file_size = max(tokudb_log_file_size, 10 * 1024 * 1024L);
-    DBUG_PRINT("info", ("computing tokudb_log_file_size: %ld\n", tokudb_log_file_size));
-#endif
+
     if ((r = db_env_create(&db_env, 0))) {
         DBUG_PRINT("info", ("db_env_create %d\n", r));
         goto error;
@@ -425,16 +416,6 @@ static int tokudb_init_func(void *p) {
         if (tokudb_debug & TOKUDB_DEBUG_INIT) 
             TOKUDB_TRACE("%s:tokudb_cache_size=%lld\n", __FUNCTION__, ((unsigned long long) gbytes << 30) + bytes);
 
-#if 0
-    // QQQ config the logs
-    DBUG_PRINT("info", ("tokudb_log_file_size: %ld\n", tokudb_log_file_size));
-    db_env->set_lg_max(db_env, tokudb_log_file_size);
-    DBUG_PRINT("info", ("tokudb_log_buffer_size: %ld\n", tokudb_log_buffer_size));
-    db_env->set_lg_bsize(db_env, tokudb_log_buffer_size);
-    // DBUG_PRINT("info",("tokudb_region_size: %ld\n", tokudb_region_size));
-    // db_env->set_lg_regionmax(db_env, tokudb_region_size);
-#endif
-
     if (db_env->set_redzone) {
         r = db_env->set_redzone(db_env, tokudb_fs_reserve_percent);
         if (r && (tokudb_debug & TOKUDB_DEBUG_INIT))
@@ -2059,39 +2040,9 @@ static int show_tokudb_vars(THD *thd, SHOW_VAR *var, char *buff) {
     uint64_t num_rows;
     error = db_env->get_engine_status (db_env, toku_global_status_rows, toku_global_status_max_rows, &num_rows, &redzone_state, &panic, panic_string, panic_string_len, TOKU_GLOBAL_STATUS);
     //TODO: Maybe do something with the panic output?
-#if 0
-    if (strlen(panic_string)) {
-        STATPRINT("Environment panic string", panic_string);
-    }
-#endif
     if (error == 0) {
         assert(num_rows <= toku_global_status_max_rows);
         //TODO: Maybe enable some of the items here: (copied from engine status
-#if 0
-        if (panic) {
-            snprintf(buf, bufsiz, "%" PRIu64, panic);
-            STATPRINT("Environment panic", buf);
-        }
-
-        if(redzone_state == FS_BLOCKED) {
-            STATPRINT("*** URGENT WARNING ***", "FILE SYSTEM IS COMPLETELY FULL");
-            snprintf(buf, bufsiz, "FILE SYSTEM IS COMPLETELY FULL");
-        }
-        else if (redzone_state == FS_GREEN) {
-            snprintf(buf, bufsiz, "more than %d percent of total file system space", 2*tokudb_fs_reserve_percent);
-        }
-        else if (redzone_state == FS_YELLOW) {
-            snprintf(buf, bufsiz, "*** WARNING *** FILE SYSTEM IS GETTING FULL (less than %d percent free)", 2*tokudb_fs_reserve_percent);
-        }
-        else if (redzone_state == FS_RED){
-            snprintf(buf, bufsiz, "*** WARNING *** FILE SYSTEM IS GETTING VERY FULL (less than %d percent free): INSERTS ARE PROHIBITED", tokudb_fs_reserve_percent);
-        }
-        else {
-            snprintf(buf, bufsiz, "information unavailable, unknown redzone state %d", redzone_state);
-        }
-        STATPRINT ("disk free space", buf);
-#endif
-
 
         //TODO: (optionally) add redzone state, panic, panic string, etc. Right now it's being ignored.