Cleaned up compile failure if DEBUG_SYNC is disabled in DEBUG builds

MariaDB · Jun 14, 2020 · b3179b7 · b3179b7
1 parent 7f941c4
commit b3179b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/sql/wsrep_high_priority_service.cc b/sql/wsrep_high_priority_service.cc
@@ -508,11 +508,11 @@ int Wsrep_applier_service::apply_write_set(const wsrep::ws_meta& ws_meta,
 
   thd_proc_info(thd, "applying write set");
 
-#ifdef ENABLED_DEBUG_SYNC
   /* moved dbug sync point here, after possible THD switch for SR transactions
      has ben done
   */
   /* Allow tests to block the applier thread using the DBUG facilities */
+#ifdef ENABLED_DEBUG_SYNC
   DBUG_EXECUTE_IF("sync.wsrep_apply_cb",
                  {
                    const char act[]=
@@ -522,7 +522,7 @@ int Wsrep_applier_service::apply_write_set(const wsrep::ws_meta& ws_meta,
                    DBUG_ASSERT(!debug_sync_set_action(thd,
                                                       STRING_WITH_LEN(act)));
                  };);
-#endif
+#endif /* ENABLED_DEBUG_SYNC */
 
   wsrep_setup_uk_and_fk_checks(thd);
   int ret= apply_events(thd, m_rli, data, err);

diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc
@@ -8977,6 +8977,7 @@ int ha_rocksdb::get_row_by_rowid(uchar *const buf, const char *const rowid,
   Rdb_transaction *const tx = get_or_create_tx(table->in_use);
   DBUG_ASSERT(tx != nullptr);
 
+#ifdef ENABLED_DEBUG_SYNC
   DEBUG_SYNC(ha_thd(), "rocksdb.get_row_by_rowid");
   DBUG_EXECUTE_IF("dbug.rocksdb.get_row_by_rowid", {
     THD *thd = ha_thd();
@@ -8986,6 +8987,7 @@ int ha_rocksdb::get_row_by_rowid(uchar *const buf, const char *const rowid,
     DBUG_ASSERT(opt_debug_sync_timeout > 0);
     DBUG_ASSERT(!debug_sync_set_action(thd, STRING_WITH_LEN(act)));
   };);
+#endif /* ENABLED_DEBUG_SYNC */
 
   bool found;
   rocksdb::Status s;