diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-21 08:54:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-21 12:10:18 +0300 |
| commit | cccdb176a6eb506426ba63724bf807cc5dfbb844 (patch) | |
| tree | 96cec3b0e4a025e1d65aaf289819d82626b64079 | |
| parent | 0de3c423cc51d362c3a9b4dc8fa90d549ce0754e (diff) | |
| download | mariadb-git-cccdb176a6eb506426ba63724bf807cc5dfbb844.tar.gz | |
MDEV-16862 build failure for WITH_INNODB_AHI=0
Fix the build, which was broken by MDEV-16515.
| -rw-r--r-- | storage/innobase/row/row0import.cc | 3 | ||||
| -rw-r--r-- | storage/innobase/row/row0mysql.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc index 117a2e573de..371b9aa556f 100644 --- a/storage/innobase/row/row0import.cc +++ b/storage/innobase/row/row0import.cc @@ -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]; diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc index 5ba8d038671..e1fe6e15067 100644 --- a/storage/innobase/row/row0mysql.cc +++ b/storage/innobase/row/row0mysql.cc @@ -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)) { |