diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2010-10-18 13:27:52 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2010-10-18 13:27:52 +0200 |
| commit | f0e2d8ecd8ff9dfd940bd2c9223038e30c465800 (patch) | |
| tree | 01cbf172208b6ccd3319a10828e980e63b765ce5 /sql/handler.cc | |
| parent | c20cbe5b4af9fc4735fb5d4a6b15ddfcb20ae37d (diff) | |
| parent | 9074307102644d43b934ce52cc0661890098698b (diff) | |
| download | mariadb-git-f0e2d8ecd8ff9dfd940bd2c9223038e30c465800.tar.gz | |
Bug#52172 test binlog.binlog_index needs --skip-core-file to avoid leaving core files
For crash testing: kill the server without generating core file.
include/my_dbug.h
Use kill(getpid(), SIGKILL) which cannot be caught by signal handlers.
All DBUG_XXX macros should be no-ops in optimized mode, do that for DBUG_ABORT as well.
sql/handler.cc
Kill server without generating core.
sql/log.cc
Kill server without generating core.
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 1542dd99ec6..eb060002f48 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1156,7 +1156,7 @@ int ha_commit_trans(THD *thd, bool all) uint rw_ha_count; bool rw_trans; - DBUG_EXECUTE_IF("crash_commit_before", DBUG_ABORT();); + DBUG_EXECUTE_IF("crash_commit_before", DBUG_SUICIDE();); /* Close all cursors that can not survive COMMIT */ if (is_real_trans) /* not a statement commit */ @@ -1208,7 +1208,7 @@ int ha_commit_trans(THD *thd, bool all) } status_var_increment(thd->status_var.ha_prepare_count); } - DBUG_EXECUTE_IF("crash_commit_after_prepare", DBUG_ABORT();); + DBUG_EXECUTE_IF("crash_commit_after_prepare", DBUG_SUICIDE();); if (error || (is_real_trans && xid && (error= !(cookie= tc_log->log_xid(thd, xid))))) { @@ -1216,13 +1216,13 @@ int ha_commit_trans(THD *thd, bool all) error= 1; goto end; } - DBUG_EXECUTE_IF("crash_commit_after_log", DBUG_ABORT();); + DBUG_EXECUTE_IF("crash_commit_after_log", DBUG_SUICIDE();); } error=ha_commit_one_phase(thd, all) ? (cookie ? 2 : 1) : 0; - DBUG_EXECUTE_IF("crash_commit_before_unlog", DBUG_ABORT();); + DBUG_EXECUTE_IF("crash_commit_before_unlog", DBUG_SUICIDE();); if (cookie) tc_log->unlog(cookie, xid); - DBUG_EXECUTE_IF("crash_commit_after", DBUG_ABORT();); + DBUG_EXECUTE_IF("crash_commit_after", DBUG_SUICIDE();); RUN_HOOK(transaction, after_commit, (thd, FALSE)); end: if (rw_trans) |