diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-01-06 13:07:20 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-01-06 13:07:20 +0100 |
| commit | d26173439113812d125a5763c394faef323b805b (patch) | |
| tree | b55841101a8208837d1e48a2d20db2bf20a0558b /sql/sql_partition.cc | |
| parent | 72c5d7a44da4552d05d3d68b03ff3501a0488d14 (diff) | |
| download | mariadb-git-d26173439113812d125a5763c394faef323b805b.tar.gz | |
Fix some failing tests on Windows
- ensure that mtr supressions table is flushed before doing controlled crash and restart
- use DBUG_SUICIDE() rather than abort() in partition tests - avoids a crash message/warning
- disable perfschema all_instances test on Windows- there are legitimate reasons for output to be different on Unix (some different threads, some different locks), the differences are expected to grow in the future, e.g with threadpool.
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 646d829a51e..ace785948e0 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -71,9 +71,8 @@ #ifdef WITH_PARTITION_STORAGE_ENGINE #include "ha_partition.h" -/* TODO: Change abort() to DBUG_SUICIDE() when bug#52002 is pushed */ #define ERROR_INJECT_CRASH(code) \ - DBUG_EVALUATE_IF(code, (abort(), 0), 0) + DBUG_EVALUATE_IF(code, (DBUG_SUICIDE(), 0), 0) #define ERROR_INJECT_ERROR(code) \ DBUG_EVALUATE_IF(code, (my_error(ER_UNKNOWN_ERROR, MYF(0)), TRUE), 0) |