summaryrefslogtreecommitdiff
path: root/include/my_dbug.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-09-26 14:34:43 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-09-26 14:34:43 +0300
commit829e8111c70cf0354f686bd9087818de61f452a2 (patch)
tree7e63e7facd44cc3b0d937c34de9b6f5737019a1c /include/my_dbug.h
parent70701ee4b1a9962e33a83da94aea61d7537fe9d4 (diff)
parentfe7c95ec7833d424b1dcaf64f6c78c74ce0832d6 (diff)
downloadmariadb-git-829e8111c70cf0354f686bd9087818de61f452a2.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'include/my_dbug.h')
-rw-r--r--include/my_dbug.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/my_dbug.h b/include/my_dbug.h
index e25bfcf28a7..b4b16d653b5 100644
--- a/include/my_dbug.h
+++ b/include/my_dbug.h
@@ -77,6 +77,9 @@ extern int (*dbug_sanity)(void);
_db_stack_frame_.line= 0; \
} while(0)
+#define DBUG_PRINT(keyword,arglist) \
+ do if (_db_pargs_(__LINE__,keyword)) _db_doprnt_ arglist; while(0)
+
#ifdef HAVE_ATTRIBUTE_CLEANUP
#define DBUG_ENTER(a) struct _db_stack_frame_ _db_stack_frame_ __attribute__((cleanup(_db_return_))); \
_db_enter_ (a,__FILE__,__LINE__,&_db_stack_frame_)
@@ -94,6 +97,7 @@ extern int (*dbug_sanity)(void);
#define DBUG_ENTER(a)
#define DBUG_RETURN(a1) return(a1)
#define DBUG_VOID_RETURN return
+#define DBUG_PRINT(keyword,arglist) do{} while(0)
#endif
#define DBUG_EXECUTE(keyword,a1) \
@@ -104,9 +108,6 @@ extern int (*dbug_sanity)(void);
(_db_keyword_(0,(keyword), 0) ? (a1) : (a2))
#define DBUG_EVALUATE_IF(keyword,a1,a2) \
(_db_keyword_(0,(keyword), 1) ? (a1) : (a2))
-#define DBUG_PRINT(keyword,arglist) \
- do if (_db_pargs_(__LINE__,keyword)) _db_doprnt_ arglist; while(0)
-
#define DBUG_PUSH_EMPTY if (_dbug_on_) { DBUG_PUSH(""); }
#define DBUG_POP_EMPTY if (_dbug_on_) { DBUG_POP(); }
#define DBUG_PUSH(a1) _db_push_ (a1)
@@ -170,6 +171,7 @@ extern void _db_suicide_(void);
#define DBUG_LEAVE
#define DBUG_RETURN(a1) do { return(a1); } while(0)
#define DBUG_VOID_RETURN do { return; } while(0)
+#define DBUG_PRINT(keyword, arglist) do { } while(0)
#define DBUG_EXECUTE(keyword,a1) do { } while(0)
#define DBUG_EXECUTE_IF(keyword,a1) do { } while(0)
#define DBUG_EVALUATE(keyword,a1,a2) (a2)