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

2 files changed, 12 insertions, 3 deletions

diff --git a/innobase/include/ut0dbg.h b/innobase/include/ut0dbg.h
index a61f80f01c6..3a7d97bb75b 100644
--- a/innobase/include/ut0dbg.h
+++ b/innobase/include/ut0dbg.h
@@ -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) {\
diff --git a/innobase/log/log0log.c b/innobase/log/log0log.c
index ee3135cf33d..6418705df4b 100644
--- a/innobase/log/log0log.c
+++ b/innobase/log/log0log.c
@@ -1884,7 +1884,16 @@ loop:
 							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);