1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

TODO: enable MDEV-13049 optimization for 10.3
This commit is contained in:
Alexander Barkov
2017-10-30 20:47:39 +04:00
644 changed files with 35267 additions and 4099 deletions

View File

@@ -303,6 +303,18 @@ bool rdb_database_exists(const std::string &db_name) {
return true;
}
void rdb_log_status_error(const rocksdb::Status &s, const char *msg) {
if (msg == nullptr) {
// NO_LINT_DEBUG
sql_print_error("RocksDB: status error, code: %d, error message: %s",
s.code(), s.ToString().c_str());
return;
}
// NO_LINT_DEBUG
sql_print_error("RocksDB: %s, Status Code: %d, Status: %s", msg, s.code(),
s.ToString().c_str());
}
/*
@brief
@@ -340,18 +352,4 @@ const char *get_rocksdb_supported_compression_types()
return compression_methods_buf.c_str();
}
void rdb_log_status_error(const rocksdb::Status &s, const char *msg) {
if (msg == nullptr) {
// NO_LINT_DEBUG
sql_print_error("RocksDB: status error, code: %d, error message: %s",
s.code(), s.ToString().c_str());
return;
}
// NO_LINT_DEBUG
sql_print_error("RocksDB: %s, Status Code: %d, Status: %s", msg, s.code(),
s.ToString().c_str());
}
} // namespace myrocks