MDEV-38408 WITH_DBUG_TRACE=OFF doesn't disable DBUG_DUMP or DBUG_LOG

DBUG_DUMP(), DBUG_LOG(): Null expand unless DBUG_TRACE is enabled.

Fixes up commit a69cf6f (MDEV-29613)

Author: dr-m

include/my_dbug.h

@@ -79,6 +79,7 @@ extern int (*dbug_sanity)(void);
 
 #define DBUG_PRINT(keyword,arglist) \
         do if (_db_pargs_(__LINE__,keyword)) _db_doprnt_ arglist; while(0)
+#define DBUG_DUMP(keyword,a1,a2) _db_dump_(__LINE__,keyword,a1,a2)
 
 #ifdef HAVE_ATTRIBUTE_CLEANUP
 #define DBUG_ENTER(a) struct _db_stack_frame_ _db_stack_frame_  __attribute__((cleanup(_db_return_))); \
@@ -98,6 +99,7 @@ extern int (*dbug_sanity)(void);
 #define DBUG_RETURN(a1) return(a1)
 #define DBUG_VOID_RETURN return
 #define DBUG_PRINT(keyword,arglist) do{} while(0)
+#define DBUG_DUMP(keyword,a1,a2) do{} while(0)
 #endif
 
 #define DBUG_EXECUTE(keyword,a1) \
@@ -116,7 +118,6 @@ extern int (*dbug_sanity)(void);
 #define DBUG_SET_INITIAL(a1) _db_set_init_ (a1)
 #define DBUG_PROCESS(a1) _db_process_(a1)
 #define DBUG_FILE _db_fp_()
-#define DBUG_DUMP(keyword,a1,a2) _db_dump_(__LINE__,keyword,a1,a2)
 #define DBUG_END()  _db_end_ ()
 #define DBUG_LOCK_FILE _db_lock_file_()
 #define DBUG_UNLOCK_FILE _db_unlock_file_()
@@ -236,7 +237,7 @@ void debug_sync_point(const char* lock_name, uint lock_timeout);
   one should #include <sstream>. We intentionally avoid including it here to save
   compilation time.
 */
-# ifdef DBUG_OFF
+# if defined DBUG_OFF || !defined DBUG_TRACE
 #  define DBUG_LOG(keyword, v) do {} while (0)
 # else
 #  define DBUG_LOG(keyword, v) do { \

sql/log_event.cc

@@ -216,7 +216,7 @@ class Write_on_release_cache
   Log_event *m_ev; // Used for Flashback
 };
 
-#ifndef DBUG_OFF
+#if !defined DBUG_OFF && defined DBUG_TRACE
 #define DBUG_DUMP_EVENT_BUF(B,L)                                         \
   do {                                                                   \
     const uchar *_buf=(uchar*)(B);                                       \

sql/rpl_record.cc

@@ -100,7 +100,7 @@ pack_row(TABLE *table, MY_BITMAP const* cols,
           length is stored in little-endian format, since this is the
           format used for the binlog.
         */
-#ifndef DBUG_OFF
+#if !defined DBUG_OFF && defined DBUG_TRACE
         const uchar *old_pack_ptr= pack_ptr;
 #endif
         pack_ptr= field->pack(pack_ptr, field->ptr + offset,