From 62c7ab648028d15c888ee88db60ed0d9e6b62424 Mon Sep 17 00:00:00 2001
From: Patrick LeBlanc <patrick.leblanc@mariadb.com>
Date: Mon, 5 Aug 2019 16:35:59 -0500
Subject: [PATCH] Fixed a merge error.

---
 versioning/BRM/extentmap.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/versioning/BRM/extentmap.cpp b/versioning/BRM/extentmap.cpp
index c17d49588..f153ff667 100644
--- a/versioning/BRM/extentmap.cpp
+++ b/versioning/BRM/extentmap.cpp
@@ -1284,7 +1284,7 @@ void ExtentMap::load(const string& filename, bool fixFL)
             throw runtime_error("ExtentMap::load(): That file is not a valid ExtentMap image");
         }
     }
-    else   // fstream path to be remove
+    catch (...)
     {
         releaseFreeList(WRITE);
         releaseEMEntryTable(WRITE);
@@ -1310,7 +1310,6 @@ void ExtentMap::save(const string& filename)
 #endif
 
     int allocdSize, loadSize[3], i;
-    mode_t utmp;
 
     grabEMEntryTable(READ);