Fix merge erorr in previous cherry-pick

This commit is contained in:
sdong 2016-02-05 09:03:59 -08:00
parent b8f656767a
commit f300da40d0

View File

@ -89,8 +89,8 @@ bool DBTestBase::ChangeOptions(int skip_mask) {
option_config_ == kUniversalCompaction || option_config_ == kUniversalCompaction ||
option_config_ == kUniversalCompactionMultiLevel || option_config_ == kUniversalCompactionMultiLevel ||
option_config_ == kUniversalSubcompactions || option_config_ == kUniversalSubcompactions ||
option_config_ == kFIFOCompaction) || option_config_ == kFIFOCompaction ||
option_config == kConcurrentSkipList) { option_config_ == kConcurrentSkipList) {
continue; continue;
} }
#endif #endif