Skip to content

Commit 5a74bfa

Browse files
committed
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.
1 parent 643d365 commit 5a74bfa

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

extra/mariabackup/xtrabackup.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5510,6 +5510,7 @@ static bool xtrabackup_backup_func()
55105510
srv_thread_pool_init();
55115511
/* Reset the system variables in the recovery module. */
55125512
trx_pool_init();
5513+
btr_search_sys_create();
55135514
recv_sys.create();
55145515

55155516
xb_filters_init();

storage/innobase/btr/btr0sea.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ void btr_sea::create() noexcept
118118
{
119119
for (partition &part : parts)
120120
part.init();
121-
if (enabled)
122-
enable();
123121
}
124122

125123
void btr_sea::alloc(ulint hash_size) noexcept

storage/innobase/buf/buf0buf.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1506,7 +1506,10 @@ bool buf_pool_t::create() noexcept
15061506
last_activity_count= srv_get_activity_count();
15071507

15081508
buf_LRU_old_ratio_update(100 * 3 / 8, false);
1509-
btr_search_sys_create();
1509+
#ifdef BTR_CUR_HASH_ADAPT
1510+
if (btr_search.enabled)
1511+
btr_search.enable();
1512+
#endif
15101513

15111514
#ifdef __linux__
15121515
if (srv_operation == SRV_OPERATION_NORMAL)

storage/innobase/srv/srv0srv.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,7 @@ void srv_boot()
604604
buf_dblwr.init();
605605
srv_thread_pool_init();
606606
trx_pool_init();
607+
btr_search_sys_create();
607608
srv_init();
608609
}
609610

0 commit comments

Comments
 (0)