Commit 719acf0a authored by heikki@donna.mysql.fi's avatar heikki@donna.mysql.fi
Browse files

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
parent d03b4308

innobase/include/ut0dbg.h

+2 −2
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ extern ulint* ut_dbg_null_ptr; 
	ulint	dbg_i;\

\

	if (!((ulint)(EXPR) + ut_dbg_zero)) {\

	   	/* printf(\

	   	printf(\

		"Assertion failure in thread %lu in file %s line %lu\n",\

			os_thread_get_curr_id(), IB__FILE__, (ulint)__LINE__);\

	   	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;\

		dbg_i = *(ut_dbg_null_ptr);\

	   	if (dbg_i) {\

innobase/log/log0log.c

+10 −1
Original line number Diff line number Diff line
@@ -1884,7 +1884,16 @@ log_group_archive( 
							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) {

			printf("Created archive file %s\n", name);