diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-01-18 23:42:22 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-01-18 23:42:22 +0100 |
| commit | 8d9f3d76154cb52137eb8eb1adc46ee794087ce1 (patch) | |
| tree | c662d50773b037e32f475589507fcf80e8ff301b /sql/handler.cc | |
| parent | f6afecf73d6911403b2a6d90c18b30e1ba608a1d (diff) | |
| download | mariadb-git-8d9f3d76154cb52137eb8eb1adc46ee794087ce1.tar.gz | |
In DBUG_EXECUTE_IF, change abort() to DBUG_ABORT() to avoid popups on windows
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 d9bed4ec557..40a7bb5c14a 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1151,7 +1151,7 @@ int ha_commit_trans(THD *thd, bool all) uint rw_ha_count; bool rw_trans; - DBUG_EXECUTE_IF("crash_commit_before", abort();); + DBUG_EXECUTE_IF("crash_commit_before", DBUG_ABORT();); /* Close all cursors that can not survive COMMIT */ if (is_real_trans) /* not a statement commit */ @@ -1203,7 +1203,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", abort();); + DBUG_EXECUTE_IF("crash_commit_after_prepare", DBUG_ABORT();); if (error || (is_real_trans && xid && (error= !(cookie= tc_log->log_xid(thd, xid))))) { @@ -1211,13 +1211,13 @@ int ha_commit_trans(THD *thd, bool all) error= 1; goto end; } - DBUG_EXECUTE_IF("crash_commit_after_log", abort();); + DBUG_EXECUTE_IF("crash_commit_after_log", DBUG_ABORT();); } error=ha_commit_one_phase(thd, all) ? (cookie ? 2 : 1) : 0; - DBUG_EXECUTE_IF("crash_commit_before_unlog", abort();); + DBUG_EXECUTE_IF("crash_commit_before_unlog", DBUG_ABORT();); if (cookie) tc_log->unlog(cookie, xid); - DBUG_EXECUTE_IF("crash_commit_after", abort();); + DBUG_EXECUTE_IF("crash_commit_after", DBUG_ABORT();); RUN_HOOK(transaction, after_commit, (thd, FALSE)); end: if (rw_trans) |