Commit 6c64101b authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-12266 follow-up fix to Mariabackup

xtrabackup_apply_delta(): Refer to fil_system.sys_space directly.
parent c6ba758d
...@@ -4654,7 +4654,7 @@ xtrabackup_apply_delta( ...@@ -4654,7 +4654,7 @@ xtrabackup_apply_delta(
n_pages * page_size)) n_pages * page_size))
goto error; goto error;
} else if (fil_space_t* space } else if (fil_space_t* space
= fil_space_acquire(0)) { = fil_system.sys_space) {
/* The system tablespace can /* The system tablespace can
consist of multiple files. The consist of multiple files. The
first one has full tablespace first one has full tablespace
...@@ -4665,7 +4665,6 @@ xtrabackup_apply_delta( ...@@ -4665,7 +4665,6 @@ xtrabackup_apply_delta(
bool fail = !strcmp(n->name, dst_path) bool fail = !strcmp(n->name, dst_path)
&& !fil_space_extend( && !fil_space_extend(
space, (ulint)n_pages); space, (ulint)n_pages);
fil_space_release(space);
if (fail) goto error; if (fail) goto error;
} }
} }
......
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