Skip to content

Commit cccdb17

Browse files
committed
MDEV-16862 build failure for WITH_INNODB_AHI=0
Fix the build, which was broken by MDEV-16515.
1 parent 0de3c42 commit cccdb17

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

storage/innobase/row/row0import.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3928,7 +3928,7 @@ row_import_for_mysql(
39283928

39293929
DBUG_EXECUTE_IF("ib_import_reset_space_and_lsn_failure",
39303930
err = DB_TOO_MANY_CONCURRENT_TRXS;);
3931-
3931+
#ifdef BTR_CUR_HASH_ADAPT
39323932
/* On DISCARD TABLESPACE, we did not drop any adaptive hash
39333933
index entries. If we replaced the discarded tablespace with a
39343934
smaller one here, there could still be some adaptive hash
@@ -3945,6 +3945,7 @@ row_import_for_mysql(
39453945
break;
39463946
}
39473947
}
3948+
#endif /* BTR_CUR_HASH_ADAPT */
39483949

39493950
if (err != DB_SUCCESS) {
39503951
char table_name[MAX_FULL_NAME_LEN + 1];

storage/innobase/row/row0mysql.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3433,6 +3433,7 @@ row_drop_table_for_mysql(
34333433

34343434
if (!dict_table_is_temporary(table)) {
34353435
if (table->space != TRX_SYS_SPACE) {
3436+
#ifdef BTR_CUR_HASH_ADAPT
34363437
/* On DISCARD TABLESPACE, we would not drop the
34373438
adaptive hash index entries. If the tablespace is
34383439
missing here, delete-marking the record in SYS_INDEXES
@@ -3454,6 +3455,7 @@ row_drop_table_for_mysql(
34543455
goto funct_exit;
34553456
}
34563457
}
3458+
#endif /* BTR_CUR_HASH_ADAPT */
34573459

34583460
/* Delete the link file if used. */
34593461
if (DICT_TF_HAS_DATA_DIR(table->flags)) {

0 commit comments

Comments
 (0)