diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-22 18:04:38 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-22 18:04:38 +0100 |
| commit | d2755a2c9c109ddb4e2e0c9feda89431a6c4fd50 (patch) | |
| tree | c6e4678908c750d7f558e98cedc349aa1d350892 /mysys/thr_mutex.c | |
| parent | af32b02c06f32a89dc9f52e556bc5dd3bf49c19e (diff) | |
| parent | 42221abaed700f6dc5d280b462755851780e8487 (diff) | |
| download | mariadb-git-d2755a2c9c109ddb4e2e0c9feda89431a6c4fd50.tar.gz | |
5.3->5.5 merge
Diffstat (limited to 'mysys/thr_mutex.c')
| -rw-r--r-- | mysys/thr_mutex.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/thr_mutex.c b/mysys/thr_mutex.c index de222e7047f..d268fb618d5 100644 --- a/mysys/thr_mutex.c +++ b/mysys/thr_mutex.c @@ -836,6 +836,7 @@ static void print_deadlock_warning(safe_mutex_t *new_mutex, mutex_root->file, mutex_root->line)); } fflush(stderr); + DBUG_ASSERT(my_assert_on_error == 0); DBUG_VOID_RETURN; } |