diff options
Diffstat (limited to 'storage/tokudb/ha_tokudb.h')
| -rw-r--r-- | storage/tokudb/ha_tokudb.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/storage/tokudb/ha_tokudb.h b/storage/tokudb/ha_tokudb.h index 52d26d6ad26..be54e2f4f41 100644 --- a/storage/tokudb/ha_tokudb.h +++ b/storage/tokudb/ha_tokudb.h @@ -109,15 +109,6 @@ typedef struct loader_context { ha_tokudb* ha; } *LOADER_CONTEXT; -typedef struct hot_optimize_context { - THD *thd; - char* write_status_msg; - ha_tokudb *ha; - uint progress_stage; - uint current_table; - uint num_tables; -} *HOT_OPTIMIZE_CONTEXT; - // // This object stores table information that is to be shared // among all ha_tokudb objects. @@ -475,7 +466,7 @@ private: ); int create_main_dictionary(const char* name, TABLE* form, DB_TXN* txn, KEY_AND_COL_INFO* kc_info, toku_compression_method compression_method); void trace_create_table_info(const char *name, TABLE * form); - int is_index_unique(bool* is_unique, DB_TXN* txn, DB* db, KEY* key_info); + int is_index_unique(bool* is_unique, DB_TXN* txn, DB* db, KEY* key_info, int lock_flags); int is_val_unique(bool* is_unique, uchar* record, KEY* key_info, uint dict_index, DB_TXN* txn); int do_uniqueness_checks(uchar* record, DB_TXN* txn, THD* thd); void set_main_dict_put_flags(THD* thd, bool opt_eligible, uint32_t* put_flags); @@ -803,6 +794,7 @@ private: void remove_from_trx_handler_list(); private: + int do_optimize(THD *thd); int map_to_handler_error(int error); }; |