[BACK]Return to patch-storage_rocksdb_rdb__io__watchdog.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / databases / mariadb104-client / patches
File: [cvs.NetBSD.org] / pkgsrc / databases / mariadb104-client / patches / patch-storage_rocksdb_rdb__io__watchdog.h (download)

Revision 1.1, Sat May 8 19:47:16 2021 UTC (2 years, 11 months ago) by jdolecek
Branch: MAIN
CVS Tags: pkgsrc-2024Q1-base, pkgsrc-2024Q1, pkgsrc-2023Q4-base, pkgsrc-2023Q4, pkgsrc-2023Q3-base, pkgsrc-2023Q3, pkgsrc-2023Q2-base, pkgsrc-2023Q2, pkgsrc-2023Q1-base, pkgsrc-2023Q1, pkgsrc-2022Q4-base, pkgsrc-2022Q4, pkgsrc-2022Q3-base, pkgsrc-2022Q3, pkgsrc-2022Q2-base, pkgsrc-2022Q2, pkgsrc-2022Q1-base, pkgsrc-2022Q1, pkgsrc-2021Q4-base, pkgsrc-2021Q4, pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, HEAD 

Add client and server packages for MariaDB 10.4

Copy of the pkgsrc-wip packages by nia@. Consider experimental for now.

$NetBSD: patch-storage_rocksdb_rdb__io__watchdog.h,v 1.1 2021/05/08 19:47:16 jdolecek Exp $

If timer_t is an integer type, setting it to nullptr fails.

XXX: Using NULL turns it into a warning.

--- storage/rocksdb/rdb_io_watchdog.h.orig	2020-01-26 20:43:56.000000000 +0000
+++ storage/rocksdb/rdb_io_watchdog.h
@@ -60,7 +60,7 @@ class Rdb_io_watchdog {
       ret = timer_delete(m_io_check_watchdog_timer);
 
       if (!ret) {
-        m_io_check_watchdog_timer = nullptr;
+        m_io_check_watchdog_timer = NULL;
       }
     }
 
@@ -68,7 +68,7 @@ class Rdb_io_watchdog {
       ret = timer_delete(m_io_check_timer);
 
       if (!ret) {
-        m_io_check_timer = nullptr;
+        m_io_check_timer = NULL;
       }
     }
 
@@ -93,8 +93,8 @@ class Rdb_io_watchdog {
 
  public:
   explicit Rdb_io_watchdog(std::vector<std::string> &&directories)
-      : m_io_check_timer(nullptr),
-        m_io_check_watchdog_timer(nullptr),
+      : m_io_check_timer(NULL),
+        m_io_check_watchdog_timer(NULL),
         m_io_in_progress(false),
         m_dirs_to_check(std::move(directories)),
         m_buf(nullptr) {