diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-04 16:47:11 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-04 16:47:11 +0200 |
commit | 7fb73ed1432f53d1d8ab6c7aeb299ac913727ce8 (patch) | |
tree | a4931bf9418b28824d3ff4c68f4a2d888b584f65 /include/my_dbug.h | |
parent | 42bba9782b36247c6c2241ea4d5996723af273fd (diff) | |
parent | 5008fc709bca54bd29a4d3f35aebf6e25468b9dd (diff) | |
download | mariadb-git-7fb73ed1432f53d1d8ab6c7aeb299ac913727ce8.tar.gz |
Merge branch '10.2' into 10.3
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 2bbe8ff6a30..9ae482005b9 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) \ |