Merge commit 'adae78ea9940f4d44382967d1296e7db0b54a4de' into leveldb-squashed

2013-07-01 08:36:32 -07:00
parent 28bcf3b7ef adae78ea99
commit fb1da62318
18 changed files with 190 additions and 59 deletions
--- a/src/leveldb/db/dbformat.cc
+++ b/src/leveldb/db/dbformat.cc
@@ -26,7 +26,7 @@ std::string ParsedInternalKey::DebugString() const {
           (unsigned long long) sequence,
           int(type));
  std::string result = "'";
-  result += user_key.ToString();
+  result += EscapeString(user_key.ToString());
  result += buf;
  return result;
 }