From 6efdc398bae24483dc7eff73f92142fd968b8a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Tue, 14 Jul 2015 20:36:23 +0300
Subject: [PATCH] MDEV-8463: 10.0 tree does not build

Merge error on srv0start.cc
---
 storage/xtradb/srv/srv0start.cc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/storage/xtradb/srv/srv0start.cc b/storage/xtradb/srv/srv0start.cc
index 6ac44e44dc0..1dd09b9e294 100644
--- a/storage/xtradb/srv/srv0start.cc
+++ b/storage/xtradb/srv/srv0start.cc
@@ -251,7 +251,7 @@ srv_file_check_mode(
 
 		/* Note: stat.rw_perm is only valid of files */
 
-		if (stat.type == OS_FILE_TYPE_FILE {
+		if (stat.type == OS_FILE_TYPE_FILE) {
 
 			if (!stat.rw_perm) {
 
@@ -937,9 +937,6 @@ open_or_create_data_files(
 			const char*	check_msg;
 			check_msg = fil_read_first_page(
 				files[i], FALSE, &flags, &space,
-#ifdef UNIV_LOG_ARCHIVE
-				min_arch_log_no, max_arch_log_no,
-#endif /* UNIV_LOG_ARCHIVE */
 				min_flushed_lsn, max_flushed_lsn);
 
 			/* If first page is valid, don't overwrite DB.