From 751e4b1a352140e59db5e60a0d33581175ad25b6 Mon Sep 17 00:00:00 2001 From: Igor Canadi Date: Mon, 7 Apr 2014 11:36:03 -0700 Subject: [PATCH 1/2] Fix wal_dir sanitizing --- db/db_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/db_impl.cc b/db/db_impl.cc index bb35dd49f6..ab89df434a 100644 --- a/db/db_impl.cc +++ b/db/db_impl.cc @@ -323,7 +323,7 @@ Options SanitizeOptions(const std::string& dbname, result.wal_dir = dbname; } if (result.wal_dir.back() == '/') { - result.wal_dir = result.wal_dir.substr(result.wal_dir.size() - 1); + result.wal_dir = result.wal_dir.substr(0, result.wal_dir.size() - 1); } // -- Sanitize the table properties collector From f6ed420e4d71471430c4f135f8084eddd72bac0a Mon Sep 17 00:00:00 2001 From: Igor Canadi Date: Mon, 7 Apr 2014 13:04:16 -0700 Subject: [PATCH 2/2] Fix default path in geodb_test --- utilities/geodb/geodb_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/geodb/geodb_test.cc b/utilities/geodb/geodb_test.cc index 49e72d9d07..1a42e32477 100644 --- a/utilities/geodb/geodb_test.cc +++ b/utilities/geodb/geodb_test.cc @@ -35,7 +35,7 @@ class GeoDBTest { } }; -const std::string GeoDBTest::kDefaultDbName = "/tmp/geodefault/"; +const std::string GeoDBTest::kDefaultDbName = "/tmp/geodefault"; Options GeoDBTest::options = Options(); // Insert, Get and Remove