diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-03-26 14:44:27 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-03-26 14:44:27 +0100 |
| commit | 5fa4c2351902154849c90d4a8c58750ff6364e8d (patch) | |
| tree | 4ea145199c32b32b681a16895beaad958eb33584 /include/my_dbug.h | |
| parent | d9f975d08bc4480109b172e1f9c3799a375c238d (diff) | |
| download | mariadb-git-5fa4c2351902154849c90d4a8c58750ff6364e8d.tar.gz | |
MDEV-26: Global transaction ID.
Fix remaining two sporadic test failures in the full test suite:
- Remove crash in DBUG_ASSERT() in _db_flush() (bug also exists in main
tree).
- Fix locking order violation for LOCK_status by temporarily unlocking it
while locking LOCK_active_mi (like a similar fix for
LOCK_global_variables).
Diffstat (limited to 'include/my_dbug.h')
| -rw-r--r-- | include/my_dbug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_dbug.h b/include/my_dbug.h index a7ada40f8bc..bcf2015466d 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -89,7 +89,7 @@ extern const char* _db_get_func_(void); #define DBUG_END() _db_end_ () #define DBUG_LOCK_FILE _db_lock_file_() #define DBUG_UNLOCK_FILE _db_unlock_file_() -#define DBUG_ASSERT(A) do { _db_flush_(); assert(A); } while(0) +#define DBUG_ASSERT(A) assert(A) #define DBUG_EXPLAIN(buf,len) _db_explain_(0, (buf),(len)) #define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len)) #define DEBUGGER_OFF do { _dbug_on_= 0; } while(0) |