bf49d1e86c
- Add a build fix for Clang to resolve building on riscv64 - Add a fix for retrieving the MAC address - Update patch comments
52 lines
1.9 KiB
Plaintext
52 lines
1.9 KiB
Plaintext
Rocksdb: Add initial OpenBSD support
|
|
055cb3fcd1aec2a05908a312a2ae4dfd3a0d4d81
|
|
|
|
Index: storage/rocksdb/ha_rocksdb.cc
|
|
--- storage/rocksdb/ha_rocksdb.cc.orig
|
|
+++ storage/rocksdb/ha_rocksdb.cc
|
|
@@ -266,7 +266,7 @@ Rdb_cf_manager cf_manager;
|
|
Rdb_ddl_manager ddl_manager;
|
|
Rdb_binlog_manager binlog_manager;
|
|
|
|
-#if !defined(_WIN32) && !defined(__APPLE__)
|
|
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__OpenBSD__)
|
|
Rdb_io_watchdog *io_watchdog = nullptr;
|
|
#endif
|
|
/**
|
|
@@ -851,7 +851,7 @@ static void rocksdb_set_io_write_timeout(
|
|
void *const var_ptr MY_ATTRIBUTE((__unused__)), const void *const save) {
|
|
DBUG_ASSERT(save != nullptr);
|
|
DBUG_ASSERT(rdb != nullptr);
|
|
-#if !defined(_WIN32) && !defined(__APPLE__)
|
|
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__OpenBSD__)
|
|
DBUG_ASSERT(io_watchdog != nullptr);
|
|
#endif
|
|
|
|
@@ -860,7 +860,7 @@ static void rocksdb_set_io_write_timeout(
|
|
const uint32_t new_val = *static_cast<const uint32_t *>(save);
|
|
|
|
rocksdb_io_write_timeout_secs = new_val;
|
|
-#if !defined(_WIN32) && !defined(__APPLE__)
|
|
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__OpenBSD__)
|
|
io_watchdog->reset_timeout(rocksdb_io_write_timeout_secs);
|
|
#endif
|
|
RDB_MUTEX_UNLOCK_CHECK(rdb_sysvars_mutex);
|
|
@@ -5794,7 +5794,7 @@ static int rocksdb_init_func(void *const p) {
|
|
directories.push_back(myrocks::rocksdb_wal_dir);
|
|
}
|
|
|
|
-#if !defined(_WIN32) && !defined(__APPLE__)
|
|
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__OpenBSD__)
|
|
io_watchdog = new Rdb_io_watchdog(std::move(directories));
|
|
io_watchdog->reset_timeout(rocksdb_io_write_timeout_secs);
|
|
#endif
|
|
@@ -5893,7 +5893,7 @@ static int rocksdb_done_func(void *const p) {
|
|
delete commit_latency_stats;
|
|
commit_latency_stats = nullptr;
|
|
|
|
-#if !defined(_WIN32) && !defined(__APPLE__)
|
|
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__OpenBSD__)
|
|
delete io_watchdog;
|
|
io_watchdog = nullptr;
|
|
#endif
|