Skip to content
Permalink
Browse files
MDEV-16862 build failure for WITH_INNODB_AHI=0
Fix the build, which was broken by MDEV-16515.
  • Loading branch information
dr-m committed Aug 21, 2018
1 parent 0de3c42 commit cccdb17
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
@@ -3928,7 +3928,7 @@ row_import_for_mysql(

DBUG_EXECUTE_IF("ib_import_reset_space_and_lsn_failure",
err = DB_TOO_MANY_CONCURRENT_TRXS;);

#ifdef BTR_CUR_HASH_ADAPT
/* On DISCARD TABLESPACE, we did not drop any adaptive hash
index entries. If we replaced the discarded tablespace with a
smaller one here, there could still be some adaptive hash
@@ -3945,6 +3945,7 @@ row_import_for_mysql(
break;
}
}
#endif /* BTR_CUR_HASH_ADAPT */

if (err != DB_SUCCESS) {
char table_name[MAX_FULL_NAME_LEN + 1];
@@ -3433,6 +3433,7 @@ row_drop_table_for_mysql(

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

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

0 comments on commit cccdb17

Please sign in to comment.