diff options
| author | Monty <monty@mariadb.org> | 2020-06-10 12:04:01 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-06-14 19:39:43 +0300 |
| commit | b3179b7e3294b8e6869283b69d1ab811b7a86944 (patch) | |
| tree | d86d731fe991bdcfeb3d105323d6f5adcae9094d | |
| parent | 7f941c4ef6a1373da3957a19c3b4dec89de31a68 (diff) | |
| download | mariadb-git-b3179b7e3294b8e6869283b69d1ab811b7a86944.tar.gz | |
Cleaned up compile failure if DEBUG_SYNC is disabled in DEBUG builds
| -rw-r--r-- | sql/wsrep_high_priority_service.cc | 4 | ||||
| -rw-r--r-- | storage/rocksdb/ha_rocksdb.cc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sql/wsrep_high_priority_service.cc b/sql/wsrep_high_priority_service.cc index d3c49eac655..de0aab4b81a 100644 --- 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 index a179ae1ddf5..6ddd20a750b 100644 --- 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; |