Commit d1284292 authored by unknown's avatar unknown

log0log.c Failure to create or open the archive log file now results in exit(1)

ut0dbg.h	Innobase now prints the line and file of an assertion failure


innobase/include/ut0dbg.h:
  Innobase now prints the line and file of an assertion failure
innobase/log/log0log.c:
  Failure to create or open the archive log file now results in exit(1)
parent cfebf7c3
...@@ -26,11 +26,11 @@ extern ulint* ut_dbg_null_ptr; ...@@ -26,11 +26,11 @@ extern ulint* ut_dbg_null_ptr;
ulint dbg_i;\ ulint dbg_i;\
\ \
if (!((ulint)(EXPR) + ut_dbg_zero)) {\ if (!((ulint)(EXPR) + ut_dbg_zero)) {\
/* printf(\ printf(\
"Assertion failure in thread %lu in file %s line %lu\n",\ "Assertion failure in thread %lu in file %s line %lu\n",\
os_thread_get_curr_id(), IB__FILE__, (ulint)__LINE__);\ os_thread_get_curr_id(), IB__FILE__, (ulint)__LINE__);\
printf(\ printf(\
"we generate a memory trap on purpose to start the debugger\n");*/\ "we generate a memory trap on purpose to start the debugger\n");\
ut_dbg_stop_threads = TRUE;\ ut_dbg_stop_threads = TRUE;\
dbg_i = *(ut_dbg_null_ptr);\ dbg_i = *(ut_dbg_null_ptr);\
if (dbg_i) {\ if (dbg_i) {\
......
...@@ -1884,7 +1884,16 @@ log_group_archive( ...@@ -1884,7 +1884,16 @@ log_group_archive(
OS_FILE_AIO, &ret); OS_FILE_AIO, &ret);
} }
ut_a(ret); if (!ret) {
fprintf(stderr,
"Innobase: Cannot create or open archive log file %s.\n",
name);
fprintf(stderr, "Innobase: Cannot continue operation.\n"
"Innobase: Check that the log archive directory exists,\n"
"Innobase: you have access rights to it, and\n"
"Innobase: there is space available.\n");
exit(1);
}
if (log_debug_writes) { if (log_debug_writes) {
printf("Created archive file %s\n", name); printf("Created archive file %s\n", name);
......
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