mirror of
https://github.com/MariaDB/server.git
synced 2025-02-24 06:13:09 +01:00
Merge 10.6 into 10.7
This commit is contained in:
commit
5291f35f9f
2 changed files with 5 additions and 3 deletions
storage/innobase
|
@ -103,17 +103,18 @@ static void dict_stats_recalc_pool_add(table_id_t id)
|
|||
{
|
||||
ut_ad(!srv_read_only_mode);
|
||||
ut_ad(id);
|
||||
bool schedule = false;
|
||||
mysql_mutex_lock(&recalc_pool_mutex);
|
||||
|
||||
const auto begin= recalc_pool.begin(), end= recalc_pool.end();
|
||||
if (end == std::find_if(begin, end, [&](const recalc &r){return r.id == id;}))
|
||||
{
|
||||
recalc_pool.emplace_back(recalc{id, recalc::IDLE});
|
||||
schedule = true;
|
||||
}
|
||||
|
||||
mysql_mutex_unlock(&recalc_pool_mutex);
|
||||
|
||||
if (begin == end)
|
||||
if (schedule)
|
||||
dict_stats_schedule_now();
|
||||
}
|
||||
|
||||
|
|
|
@ -907,6 +907,7 @@ bool recv_sys_t::recover_deferred(recv_sys_t::map::iterator &p,
|
|||
node->deferred= true;
|
||||
if (!space->acquire())
|
||||
goto fail;
|
||||
fil_names_dirty(space);
|
||||
const bool is_compressed= fil_space_t::is_compressed(flags);
|
||||
#ifdef _WIN32
|
||||
const bool is_sparse= is_compressed;
|
||||
|
@ -4263,7 +4264,6 @@ completed:
|
|||
err = recv_rename_files();
|
||||
}
|
||||
mysql_mutex_unlock(&recv_sys.mutex);
|
||||
mysql_mutex_unlock(&log_sys.mutex);
|
||||
|
||||
recv_lsn_checks_on = true;
|
||||
|
||||
|
@ -4275,6 +4275,7 @@ completed:
|
|||
err = DB_CORRUPTION;
|
||||
}
|
||||
|
||||
mysql_mutex_unlock(&log_sys.mutex);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue