Commit 8e722064 authored by Michael Widenius's avatar Michael Widenius Committed by Sergei Golubchik

Remove dumping of some not needed core's when running test suite

Before this patch running full mtr generated some 70 cores (at least
on systemd). Now no cores should be generated.

- Changed DBUG_ABORT()'s used by mysql-test-run to DBUG_SUICIDE()
- Changed DBUG_ABORT() used to crash server with core to DBUG_ASSERT(0)
- DBUG_ASSERT now flushes DBUG files
parent 94bbe8ad
...@@ -102,8 +102,8 @@ extern const char* _db_get_func_(void); ...@@ -102,8 +102,8 @@ extern const char* _db_get_func_(void);
#define DBUG_END() _db_end_ () #define DBUG_END() _db_end_ ()
#define DBUG_LOCK_FILE _db_lock_file_() #define DBUG_LOCK_FILE _db_lock_file_()
#define DBUG_UNLOCK_FILE _db_unlock_file_() #define DBUG_UNLOCK_FILE _db_unlock_file_()
#define DBUG_ASSERT(A) assert(A) #define DBUG_ASSERT(A) ( _db_flush_(), assert(A) )
#define DBUG_SLOW_ASSERT(A) assert(A) #define DBUG_SLOW_ASSERT(A) ( _db_flush_(), assert(A) )
#define DBUG_ASSERT_EXISTS #define DBUG_ASSERT_EXISTS
#define DBUG_EXPLAIN(buf,len) _db_explain_(0, (buf),(len)) #define DBUG_EXPLAIN(buf,len) _db_explain_(0, (buf),(len))
#define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len)) #define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len))
......
...@@ -1457,7 +1457,7 @@ static void debug_sync_execute(THD *thd, st_debug_sync_action *action) ...@@ -1457,7 +1457,7 @@ static void debug_sync_execute(THD *thd, st_debug_sync_action *action)
ER_DEBUG_SYNC_TIMEOUT, ER_DEBUG_SYNC_TIMEOUT,
ER_THD(thd, ER_DEBUG_SYNC_TIMEOUT)); ER_THD(thd, ER_DEBUG_SYNC_TIMEOUT));
thd->abort_on_warning= save_abort_on_warning; thd->abort_on_warning= save_abort_on_warning;
DBUG_EXECUTE_IF("debug_sync_abort_on_timeout", DBUG_ABORT();); DBUG_EXECUTE_IF("debug_sync_abort_on_timeout", DBUG_ASSERT(0););
break; break;
} }
error= 0; error= 0;
......
...@@ -10928,7 +10928,7 @@ int read_keys_and_merge_scans(THD *thd, ...@@ -10928,7 +10928,7 @@ int read_keys_and_merge_scans(THD *thd,
if (unique == NULL) if (unique == NULL)
{ {
DBUG_EXECUTE_IF("index_merge_may_not_create_a_Unique", DBUG_ABORT(); ); DBUG_EXECUTE_IF("index_merge_may_not_create_a_Unique", DBUG_SUICIDE(); );
DBUG_EXECUTE_IF("only_one_Unique_may_be_created", DBUG_EXECUTE_IF("only_one_Unique_may_be_created",
DBUG_SET("+d,index_merge_may_not_create_a_Unique"); ); DBUG_SET("+d,index_merge_may_not_create_a_Unique"); );
......
...@@ -1592,7 +1592,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1592,7 +1592,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
DBUG_EXECUTE_IF("crash_dispatch_command_before", DBUG_EXECUTE_IF("crash_dispatch_command_before",
{ DBUG_PRINT("crash_dispatch_command_before", ("now")); { DBUG_PRINT("crash_dispatch_command_before", ("now"));
DBUG_ABORT(); }); DBUG_SUICIDE(); });
/* Performance Schema Interface instrumentation, begin */ /* Performance Schema Interface instrumentation, begin */
thd->m_statement_psi= MYSQL_REFINE_STATEMENT(thd->m_statement_psi, thd->m_statement_psi= MYSQL_REFINE_STATEMENT(thd->m_statement_psi,
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
while(!(X)) \ while(!(X)) \
{ \ { \
fprintf(stderr, "Sysvar '%s' failed '%s'\n", name_arg, #X); \ fprintf(stderr, "Sysvar '%s' failed '%s'\n", name_arg, #X); \
DBUG_ABORT(); \ DBUG_ASSERT(0); \
exit(255); \ exit(255); \
} }
......
...@@ -2058,7 +2058,7 @@ int ha_maria::enable_indexes(uint mode) ...@@ -2058,7 +2058,7 @@ int ha_maria::enable_indexes(uint mode)
DBUG_EXECUTE_IF("maria_crash_enable_index", DBUG_EXECUTE_IF("maria_crash_enable_index",
{ {
DBUG_PRINT("maria_crash_enable_index", ("now")); DBUG_PRINT("maria_crash_enable_index", ("now"));
DBUG_ABORT(); DBUG_SUICIDE();
}); });
return error; return error;
} }
......
...@@ -3165,7 +3165,7 @@ static my_bool write_block_record(MARIA_HA *info, ...@@ -3165,7 +3165,7 @@ static my_bool write_block_record(MARIA_HA *info,
translog_flush(translog_get_horizon()); translog_flush(translog_get_horizon());
}); });
DBUG_EXECUTE_IF("maria_crash", DBUG_EXECUTE_IF("maria_crash",
{ DBUG_PRINT("maria_crash", ("now")); DBUG_ABORT(); }); { DBUG_PRINT("maria_crash", ("now")); DBUG_SUICIDE(); });
} }
#endif #endif
......
...@@ -3175,7 +3175,7 @@ int maria_sort_index(HA_CHECK *param, register MARIA_HA *info, char *name) ...@@ -3175,7 +3175,7 @@ int maria_sort_index(HA_CHECK *param, register MARIA_HA *info, char *name)
DBUG_EXECUTE_IF("maria_crash_sort_index", DBUG_EXECUTE_IF("maria_crash_sort_index",
{ {
DBUG_PRINT("maria_crash_sort_index", ("now")); DBUG_PRINT("maria_crash_sort_index", ("now"));
DBUG_ABORT(); DBUG_SUICIDE();
}); });
DBUG_RETURN(0); DBUG_RETURN(0);
...@@ -3913,7 +3913,7 @@ int maria_repair_by_sort(HA_CHECK *param, register MARIA_HA *info, ...@@ -3913,7 +3913,7 @@ int maria_repair_by_sort(HA_CHECK *param, register MARIA_HA *info,
DBUG_EXECUTE_IF("maria_crash_create_index_by_sort", DBUG_EXECUTE_IF("maria_crash_create_index_by_sort",
{ {
DBUG_PRINT("maria_crash_create_index_by_sort", ("now")); DBUG_PRINT("maria_crash_create_index_by_sort", ("now"));
DBUG_ABORT(); DBUG_SUICIDE();
}); });
if (scan_inited) if (scan_inited)
{ {
...@@ -4124,7 +4124,7 @@ int maria_repair_by_sort(HA_CHECK *param, register MARIA_HA *info, ...@@ -4124,7 +4124,7 @@ int maria_repair_by_sort(HA_CHECK *param, register MARIA_HA *info,
DBUG_EXECUTE_IF("maria_crash_repair", DBUG_EXECUTE_IF("maria_crash_repair",
{ {
DBUG_PRINT("maria_crash_repair", ("now")); DBUG_PRINT("maria_crash_repair", ("now"));
DBUG_ABORT(); DBUG_SUICIDE();
}); });
} }
share->state.changed|= STATE_NOT_SORTED_PAGES; share->state.changed|= STATE_NOT_SORTED_PAGES;
......
...@@ -131,7 +131,7 @@ int ma_checkpoint_execute(CHECKPOINT_LEVEL level, my_bool no_wait) ...@@ -131,7 +131,7 @@ int ma_checkpoint_execute(CHECKPOINT_LEVEL level, my_bool no_wait)
result= really_execute_checkpoint(); result= really_execute_checkpoint();
DBUG_EXECUTE_IF("maria_crash_after_checkpoint", DBUG_EXECUTE_IF("maria_crash_after_checkpoint",
{ DBUG_PRINT("maria_crash", ("now")); DBUG_ABORT(); }); { DBUG_PRINT("maria_crash", ("now")); DBUG_SUICIDE(); });
mysql_cond_broadcast(&COND_checkpoint); mysql_cond_broadcast(&COND_checkpoint);
end: end:
...@@ -426,7 +426,7 @@ void ma_checkpoint_end(void) ...@@ -426,7 +426,7 @@ void ma_checkpoint_end(void)
flush_all_tables(1); flush_all_tables(1);
}); });
DBUG_EXECUTE_IF("maria_crash", DBUG_EXECUTE_IF("maria_crash",
{ DBUG_PRINT("maria_crash", ("now")); DBUG_ABORT(); }); { DBUG_PRINT("maria_crash", ("now")); DBUG_SUICIDE(); });
if (checkpoint_control.inited) if (checkpoint_control.inited)
{ {
......
...@@ -1141,7 +1141,7 @@ int maria_create(const char *name, enum data_file_type datafile_type, ...@@ -1141,7 +1141,7 @@ int maria_create(const char *name, enum data_file_type datafile_type,
DBUG_EXECUTE_IF("maria_crash_create_table", DBUG_EXECUTE_IF("maria_crash_create_table",
{ {
DBUG_PRINT("maria_crash_create_table", ("now")); DBUG_PRINT("maria_crash_create_table", ("now"));
DBUG_ABORT(); DBUG_SUICIDE();
}); });
/* /*
store LSN into file, needed for Recovery to not be confused if a store LSN into file, needed for Recovery to not be confused if a
......
...@@ -63,7 +63,7 @@ int mi_close(register MI_INFO *info) ...@@ -63,7 +63,7 @@ int mi_close(register MI_INFO *info)
if (flag) if (flag)
{ {
DBUG_EXECUTE_IF("crash_before_flush_keys", DBUG_EXECUTE_IF("crash_before_flush_keys",
if (share->kfile >= 0) DBUG_ABORT();); if (share->kfile >= 0) DBUG_SUICIDE(););
if (share->kfile >= 0 && if (share->kfile >= 0 &&
flush_key_blocks(share->key_cache, share->kfile, flush_key_blocks(share->key_cache, share->kfile,
&share->dirty_part_map, &share->dirty_part_map,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment