andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into columnfamilies

Browse Source
This commit is contained in:
Igor Canadi 2014-04-07 13:04:25 -07:00
commit 2a0917b28e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/db_impl.cc
View File

@ -294,7 +294,7 @@ DBOptions SanitizeOptions(const std::string& dbname, const DBOptions& src) {
result.wal_dir = dbname; result.wal_dir = dbname;
} }
if (result.wal_dir.back() == '/') { 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; return result;

2
utilities/geodb/geodb_test.cc
View File

@ -35,7 +35,7 @@ class GeoDBTest {
} }
}; };
const std::string GeoDBTest::kDefaultDbName = "/tmp/geodefault/"; const std::string GeoDBTest::kDefaultDbName = "/tmp/geodefault";
Options GeoDBTest::options = Options(); Options GeoDBTest::options = Options();
// Insert, Get and Remove // Insert, Get and Remove