diff options
| -rw-r--r-- | storage/tokudb/ha_tokudb.cc | 6 | ||||
| -rw-r--r-- | storage/tokudb/ha_tokudb_alter_56.cc | 2 | ||||
| -rw-r--r-- | storage/tokudb/tokudb_memory.h | 12 |
3 files changed, 4 insertions, 16 deletions
diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc index 4555ab3a862..53feb5e430a 100644 --- a/storage/tokudb/ha_tokudb.cc +++ b/storage/tokudb/ha_tokudb.cc @@ -6387,7 +6387,7 @@ int ha_tokudb::create_txn(THD* thd, tokudb_trx_data* trx) { "created master %p", trx->all); trx->sp_level = trx->all; - trans_register_ha(thd, true, tokudb_hton); + trans_register_ha(thd, true, tokudb_hton, 0); } DBUG_PRINT("trans", ("starting transaction stmt")); if (trx->stmt) { @@ -6429,7 +6429,7 @@ int ha_tokudb::create_txn(THD* thd, tokudb_trx_data* trx) { trx->sp_level, trx->stmt); reset_stmt_progress(&trx->stmt_progress); - trans_register_ha(thd, false, tokudb_hton); + trans_register_ha(thd, false, tokudb_hton, 0); cleanup: return error; } @@ -6594,7 +6594,7 @@ int ha_tokudb::start_stmt(THD* thd, thr_lock_type lock_type) { share->rows_from_locked_table = added_rows - deleted_rows; } transaction = trx->sub_sp_level; - trans_register_ha(thd, false, tokudb_hton); + trans_register_ha(thd, false, tokudb_hton, 0); cleanup: TOKUDB_HANDLER_DBUG_RETURN(error); } diff --git a/storage/tokudb/ha_tokudb_alter_56.cc b/storage/tokudb/ha_tokudb_alter_56.cc index 4bdf2cf7bda..233d929a509 100644 --- a/storage/tokudb/ha_tokudb_alter_56.cc +++ b/storage/tokudb/ha_tokudb_alter_56.cc @@ -57,7 +57,7 @@ public: expand_varchar_update_needed(false), expand_fixed_update_needed(false), expand_blob_update_needed(false), - optimize_needed(false), + optimize_needed(false), changed_fields(PSI_INSTRUMENT_MEM), table_kc_info(NULL), altered_table_kc_info(NULL) { } diff --git a/storage/tokudb/tokudb_memory.h b/storage/tokudb/tokudb_memory.h index 2687c1cda8e..a12db83e022 100644 --- a/storage/tokudb/tokudb_memory.h +++ b/storage/tokudb/tokudb_memory.h @@ -40,31 +40,19 @@ void* multi_malloc(myf myFlags, ...); inline void* malloc(size_t s, myf flags) { -#if 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799 return ::my_malloc(0, s, flags); -#else - return ::my_malloc(s, flags); -#endif } inline void* realloc(void* p, size_t s, myf flags) { if (s == 0) return p; -#if 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799 return ::my_realloc(0, p, s, flags); -#else - return ::my_realloc(p, s, flags | MY_ALLOW_ZERO_PTR); -#endif } inline void free(void* ptr) { if (ptr) ::my_free(ptr); } inline char* strdup(const char* p, myf flags) { -#if 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799 return ::my_strdup(0, p, flags); -#else - return ::my_strdup(p, flags); -#endif } inline void* multi_malloc(myf myFlags, ...) { va_list args; |