Merge branch 'master' into columnfamilies

11 years ago · 2a0917b28e
parent 3d2fe844ab f6ed420e4d
commit 2a0917b28e
2 changed files with 2 additions and 2 deletions
--- a/db/db_impl.cc
+++ b/db/db_impl.cc
@ -294,7 +294,7 @@ DBOptions SanitizeOptions(const std::string& dbname, const DBOptions& src) {
    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);
  }

  return result;
--- 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