Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
cccdb176
Commit
cccdb176
authored
Aug 21, 2018
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-16862 build failure for WITH_INNODB_AHI=0
Fix the build, which was broken by MDEV-16515.
parent
0de3c423
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
storage/innobase/row/row0import.cc
storage/innobase/row/row0import.cc
+2
-1
storage/innobase/row/row0mysql.cc
storage/innobase/row/row0mysql.cc
+2
-0
No files found.
storage/innobase/row/row0import.cc
View file @
cccdb176
...
...
@@ -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
];
...
...
storage/innobase/row/row0mysql.cc
View file @
cccdb176
...
...
@@ -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
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment