mirror of
https://github.com/MariaDB/server.git
synced 2025-12-28 08:10:14 +00:00
MDEV-35049 fixup: Fix SUX_LOCK_GENERIC
xtrabackup_backup_func(): Invoke btr_search_sys_create(), because innodb_shutdown() assumes that it will have been called. srv_boot(): Invoke btr_search_sys_create(). This fixes assertion failures in the test innodb.temporary_table. btr_sea::create(): Do not invoke enable(). buf_pool_t::create(): Instead of invoking btr_sea::create(), invoke btr_sea::enable() when needed.
This commit is contained in:
parent
643d365ced
commit
5a74bfa054
@ -5510,6 +5510,7 @@ fail:
|
||||
srv_thread_pool_init();
|
||||
/* Reset the system variables in the recovery module. */
|
||||
trx_pool_init();
|
||||
btr_search_sys_create();
|
||||
recv_sys.create();
|
||||
|
||||
xb_filters_init();
|
||||
|
||||
@ -118,8 +118,6 @@ void btr_sea::create() noexcept
|
||||
{
|
||||
for (partition &part : parts)
|
||||
part.init();
|
||||
if (enabled)
|
||||
enable();
|
||||
}
|
||||
|
||||
void btr_sea::alloc(ulint hash_size) noexcept
|
||||
|
||||
@ -1506,7 +1506,10 @@ bool buf_pool_t::create() noexcept
|
||||
last_activity_count= srv_get_activity_count();
|
||||
|
||||
buf_LRU_old_ratio_update(100 * 3 / 8, false);
|
||||
btr_search_sys_create();
|
||||
#ifdef BTR_CUR_HASH_ADAPT
|
||||
if (btr_search.enabled)
|
||||
btr_search.enable();
|
||||
#endif
|
||||
|
||||
#ifdef __linux__
|
||||
if (srv_operation == SRV_OPERATION_NORMAL)
|
||||
|
||||
@ -604,6 +604,7 @@ void srv_boot()
|
||||
buf_dblwr.init();
|
||||
srv_thread_pool_init();
|
||||
trx_pool_init();
|
||||
btr_search_sys_create();
|
||||
srv_init();
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user