Commit cccdb176 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-16862 build failure for WITH_INNODB_AHI=0

Fix the build, which was broken by MDEV-16515.
parent 0de3c423
...@@ -3928,7 +3928,7 @@ row_import_for_mysql( ...@@ -3928,7 +3928,7 @@ row_import_for_mysql(
DBUG_EXECUTE_IF("ib_import_reset_space_and_lsn_failure", DBUG_EXECUTE_IF("ib_import_reset_space_and_lsn_failure",
err = DB_TOO_MANY_CONCURRENT_TRXS;); err = DB_TOO_MANY_CONCURRENT_TRXS;);
#ifdef BTR_CUR_HASH_ADAPT
/* On DISCARD TABLESPACE, we did not drop any adaptive hash /* On DISCARD TABLESPACE, we did not drop any adaptive hash
index entries. If we replaced the discarded tablespace with a index entries. If we replaced the discarded tablespace with a
smaller one here, there could still be some adaptive hash smaller one here, there could still be some adaptive hash
...@@ -3945,6 +3945,7 @@ row_import_for_mysql( ...@@ -3945,6 +3945,7 @@ row_import_for_mysql(
break; break;
} }
} }
#endif /* BTR_CUR_HASH_ADAPT */
if (err != DB_SUCCESS) { if (err != DB_SUCCESS) {
char table_name[MAX_FULL_NAME_LEN + 1]; char table_name[MAX_FULL_NAME_LEN + 1];
......
...@@ -3433,6 +3433,7 @@ row_drop_table_for_mysql( ...@@ -3433,6 +3433,7 @@ row_drop_table_for_mysql(
if (!dict_table_is_temporary(table)) { if (!dict_table_is_temporary(table)) {
if (table->space != TRX_SYS_SPACE) { if (table->space != TRX_SYS_SPACE) {
#ifdef BTR_CUR_HASH_ADAPT
/* On DISCARD TABLESPACE, we would not drop the /* On DISCARD TABLESPACE, we would not drop the
adaptive hash index entries. If the tablespace is adaptive hash index entries. If the tablespace is
missing here, delete-marking the record in SYS_INDEXES missing here, delete-marking the record in SYS_INDEXES
...@@ -3454,6 +3455,7 @@ row_drop_table_for_mysql( ...@@ -3454,6 +3455,7 @@ row_drop_table_for_mysql(
goto funct_exit; goto funct_exit;
} }
} }
#endif /* BTR_CUR_HASH_ADAPT */
/* Delete the link file if used. */ /* Delete the link file if used. */
if (DICT_TF_HAS_DATA_DIR(table->flags)) { if (DICT_TF_HAS_DATA_DIR(table->flags)) {
......
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