From 6c64101bf06c24d090ec55cc4fc0b54af2ebc1b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Mon, 23 Apr 2018 13:14:28 +0300
Subject: [PATCH] MDEV-12266 follow-up fix to Mariabackup

xtrabackup_apply_delta(): Refer to fil_system.sys_space directly.
---
 extra/mariabackup/xtrabackup.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 654d62a6cb5..a8b7022b948 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -4654,7 +4654,7 @@ xtrabackup_apply_delta(
 						    n_pages * page_size))
 						goto error;
 				} else if (fil_space_t* space
-					   = fil_space_acquire(0)) {
+					   = fil_system.sys_space) {
 					/* The system tablespace can
 					consist of multiple files. The
 					first one has full tablespace
@@ -4665,7 +4665,6 @@ xtrabackup_apply_delta(
 					bool fail = !strcmp(n->name, dst_path)
 						&& !fil_space_extend(
 							space, (ulint)n_pages);
-					fil_space_release(space);
 					if (fail) goto error;
 				}
 			}