database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

In DBUG_EXECUTE_IF, change abort() to DBUG_ABORT() to avoid popups on windows

Browse Source
This commit is contained in:
Vladislav Vaintroub
2010-01-18 23:42:22 +01:00
parent 5ca186b519
commit b3d8871c8d
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/handler.cc
View File

@ -1151,7 +1151,7 @@ int ha_commit_trans(THD *thd, bool all)
uint rw_ha_count; uint rw_ha_count;
bool rw_trans; 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 */ /* Close all cursors that can not survive COMMIT */
if (is_real_trans) /* not a statement 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); 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 && if (error || (is_real_trans && xid &&
(error= !(cookie= tc_log->log_xid(thd, xid))))) (error= !(cookie= tc_log->log_xid(thd, xid)))))
{ {
@ -1211,13 +1211,13 @@ int ha_commit_trans(THD *thd, bool all)
error= 1; error= 1;
goto end; 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; 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) if (cookie)
tc_log->unlog(cookie, xid); 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)); RUN_HOOK(transaction, after_commit, (thd, FALSE));
end: end:
if (rw_trans) if (rw_trans)

16
sql/log.cc
View File

@ -2826,7 +2826,7 @@ bool MYSQL_BIN_LOG::open(const char *log_name,
sql_print_error("MSYQL_BIN_LOG::open failed to sync the index file."); sql_print_error("MSYQL_BIN_LOG::open failed to sync the index file.");
DBUG_RETURN(1); DBUG_RETURN(1);
} }
DBUG_EXECUTE_IF("crash_create_non_critical_before_update_index", abort();); DBUG_EXECUTE_IF("crash_create_non_critical_before_update_index", DBUG_ABORT(););
#endif #endif
write_error= 0; write_error= 0;
@ -2923,7 +2923,7 @@ bool MYSQL_BIN_LOG::open(const char *log_name,
if (write_file_name_to_index_file) if (write_file_name_to_index_file)
{ {
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
DBUG_EXECUTE_IF("crash_create_critical_before_update_index", abort();); DBUG_EXECUTE_IF("crash_create_critical_before_update_index", DBUG_ABORT(););
#endif #endif
DBUG_ASSERT(my_b_inited(&index_file) != 0); DBUG_ASSERT(my_b_inited(&index_file) != 0);
@ -2942,7 +2942,7 @@ bool MYSQL_BIN_LOG::open(const char *log_name,
goto err; goto err;
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
DBUG_EXECUTE_IF("crash_create_after_update_index", abort();); DBUG_EXECUTE_IF("crash_create_after_update_index", DBUG_ABORT(););
#endif #endif
} }
} }
@ -3404,7 +3404,7 @@ int MYSQL_BIN_LOG::purge_first_log(Relay_log_info* rli, bool included)
/* Store where we are in the new file for the execution thread */ /* Store where we are in the new file for the execution thread */
flush_relay_log_info(rli); flush_relay_log_info(rli);
DBUG_EXECUTE_IF("crash_before_purge_logs", abort();); DBUG_EXECUTE_IF("crash_before_purge_logs", DBUG_ABORT(););
mysql_mutex_lock(&rli->log_space_lock); mysql_mutex_lock(&rli->log_space_lock);
rli->relay_log.purge_logs(to_purge_if_included, included, rli->relay_log.purge_logs(to_purge_if_included, included,
@ -3547,7 +3547,7 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log,
goto err; goto err;
} }
DBUG_EXECUTE_IF("crash_purge_critical_after_update_index", abort();); DBUG_EXECUTE_IF("crash_purge_critical_after_update_index", DBUG_ABORT(););
err: err:
/* Read each entry from purge_index_file and delete the file. */ /* Read each entry from purge_index_file and delete the file. */
@ -3557,7 +3557,7 @@ err:
" that would be purged."); " that would be purged.");
close_purge_index_file(); close_purge_index_file();
DBUG_EXECUTE_IF("crash_purge_non_critical_after_update_index", abort();); DBUG_EXECUTE_IF("crash_purge_non_critical_after_update_index", DBUG_ABORT(););
if (need_mutex) if (need_mutex)
mysql_mutex_unlock(&LOCK_index); mysql_mutex_unlock(&LOCK_index);
@ -5101,7 +5101,7 @@ bool MYSQL_BIN_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event,
DBUG_PRINT("info", ("error writing binlog cache: %d", DBUG_PRINT("info", ("error writing binlog cache: %d",
write_error)); write_error));
DBUG_PRINT("info", ("crashing before writing xid")); DBUG_PRINT("info", ("crashing before writing xid"));
abort(); DBUG_ABORT();
}); });
if ((write_error= write_cache(cache, false, false))) if ((write_error= write_cache(cache, false, false)))
@ -5116,7 +5116,7 @@ bool MYSQL_BIN_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event,
bool synced= 0; bool synced= 0;
if (flush_and_sync(&synced)) if (flush_and_sync(&synced))
goto err; goto err;
DBUG_EXECUTE_IF("half_binlogged_transaction", abort();); DBUG_EXECUTE_IF("half_binlogged_transaction", DBUG_ABORT(););
if (cache->error) // Error on read if (cache->error) // Error on read
{ {
sql_print_error(ER(ER_ERROR_ON_READ), cache->file_name, errno); sql_print_error(ER(ER_ERROR_ON_READ), cache->file_name, errno);