Commit 0a98c1c8 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

[t:4472], fix bug caused by removing DB_PRELOCKED_FILE_READ

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@39771 c7de825b-a66e-492c-adef-691d508d4ae1
parent 74f974e9
...@@ -3165,7 +3165,6 @@ int ha_tokudb::end_bulk_insert(bool abort) { ...@@ -3165,7 +3165,6 @@ int ha_tokudb::end_bulk_insert(bool abort) {
THD* thd = ha_thd(); THD* thd = ha_thd();
tokudb_trx_data* trx = (tokudb_trx_data *) thd_data_get(thd, tokudb_hton->slot); tokudb_trx_data* trx = (tokudb_trx_data *) thd_data_get(thd, tokudb_hton->slot);
bool using_loader = (loader != NULL); bool using_loader = (loader != NULL);
uint curr_num_DBs = table->s->keys + test(hidden_primary_key);
if (ai_metadata_update_required) { if (ai_metadata_update_required) {
pthread_mutex_lock(&share->mutex); pthread_mutex_lock(&share->mutex);
error = update_max_auto_inc(share->status_block, share->last_auto_increment); error = update_max_auto_inc(share->status_block, share->last_auto_increment);
...@@ -3613,7 +3612,7 @@ void ha_tokudb::set_main_dict_put_flags( ...@@ -3613,7 +3612,7 @@ void ha_tokudb::set_main_dict_put_flags(
u_int32_t* put_flags u_int32_t* put_flags
) )
{ {
u_int32_t old_prelock_flags = (*put_flags); u_int32_t old_prelock_flags = 0;
uint curr_num_DBs = table->s->keys + test(hidden_primary_key); uint curr_num_DBs = table->s->keys + test(hidden_primary_key);
bool in_hot_index = share->num_DBs > curr_num_DBs; bool in_hot_index = share->num_DBs > curr_num_DBs;
bool using_ignore_flag_opt = do_ignore_flag_optimization( bool using_ignore_flag_opt = do_ignore_flag_optimization(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment