diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-05 21:16:22 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-05 21:16:22 +0300 |
| commit | 7bcaa541aa1f298abf8e863566a19b3e9ec2f659 (patch) | |
| tree | 066d58ad89536edf0e9a3de898506735c933381f /include/my_dbug.h | |
| parent | 36b8ac2c0d763a3f96b254cb6e2cbdbc40dde22b (diff) | |
| parent | 2c3c851d2cba73825f81cd06220138b15c17ae4d (diff) | |
| download | mariadb-git-7bcaa541aa1f298abf8e863566a19b3e9ec2f659.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'include/my_dbug.h')
| -rw-r--r-- | include/my_dbug.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/my_dbug.h b/include/my_dbug.h index 56afe9335ae..09ccb6102fc 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -67,6 +67,7 @@ extern void dbug_free_code_state(void **code_state_store); extern const char* _db_get_func_(void); extern int (*dbug_sanity)(void); +#ifdef DBUG_TRACE #define DBUG_LEAVE do { \ _db_stack_frame_.line= __LINE__; \ _db_return_ (&_db_stack_frame_); \ @@ -85,6 +86,13 @@ extern int (*dbug_sanity)(void); #define DBUG_VOID_RETURN do {DBUG_LEAVE; return;} while(0) #endif +#else +#define DBUG_LEAVE +#define DBUG_ENTER(a) +#define DBUG_RETURN(a1) return(a1) +#define DBUG_VOID_RETURN return +#endif + #define DBUG_EXECUTE(keyword,a1) \ do {if (_db_keyword_(0, (keyword), 0)) { a1 }} while(0) #define DBUG_EXECUTE_IF(keyword,a1) \ |