diff options
| author | unknown <heikki@donna.mysql.fi> | 2001-05-15 19:53:35 +0300 |
|---|---|---|
| committer | unknown <heikki@donna.mysql.fi> | 2001-05-15 19:53:35 +0300 |
| commit | 1609fcd3b9cd8d32842f2355a4333ef2bb6c4fb4 (patch) | |
| tree | 3f9454aa3733fd64cab8abaff1294b30460b0921 /innobase | |
| parent | c23dbe674d9cba45aa3ce0b87e50f83f3d2e9d52 (diff) | |
| download | mariadb-git-1609fcd3b9cd8d32842f2355a4333ef2bb6c4fb4.tar.gz | |
os0file.c More precise error message number
ut0dbg.h Changed Innobase->InnoDB
os0file.c InnoDB prints now the number of OS error in a file operation
innobase/include/ut0dbg.h:
Changed Innobase->InnoDB
innobase/os/os0file.c:
More precise error message number
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/include/ut0dbg.h | 6 | ||||
| -rw-r--r-- | innobase/os/os0file.c | 14 |
2 files changed, 15 insertions, 5 deletions
diff --git a/innobase/include/ut0dbg.h b/innobase/include/ut0dbg.h index 751609b244e..657d1bf95b2 100644 --- a/innobase/include/ut0dbg.h +++ b/innobase/include/ut0dbg.h @@ -27,12 +27,12 @@ extern ulint* ut_dbg_null_ptr; \ if (!((ulint)(EXPR) + ut_dbg_zero)) {\ fprintf(stderr,\ - "Innobase: Assertion failure in thread %lu in file %s line %lu\n",\ + "InnoDB: Assertion failure in thread %lu in file %s line %lu\n",\ os_thread_get_curr_id(), IB__FILE__, (ulint)__LINE__);\ fprintf(stderr,\ - "Innobase: we intentionally generate a memory trap.\n");\ + "InnoDB: We intentionally generate a memory trap.\n");\ fprintf(stderr,\ - "Innobase: Send a bug report to mysql@lists.mysql.com\n");\ + "InnoDB: Send a detailed bug report to mysql@lists.mysql.com\n");\ ut_dbg_stop_threads = TRUE;\ dbg_i = *(ut_dbg_null_ptr);\ if (dbg_i) {\ diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index 065d9b6f553..50e75c56c18 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -120,6 +120,10 @@ os_file_get_last_error(void) err = (ulint) GetLastError(); + fprintf(stderr, + "InnoDB: operating system error number %li in a file operation.\n", + (long) err); + if (err == ERROR_FILE_NOT_FOUND) { return(OS_FILE_NOT_FOUND); } else if (err == ERROR_DISK_FULL) { @@ -130,6 +134,10 @@ os_file_get_last_error(void) return(100 + err); } #else + fprintf(stderr, + "InnoDB: operating system error number %i in a file operation.\n", + errno); + err = (ulint) errno; if (err == ENOSPC ) { @@ -173,7 +181,7 @@ os_file_handle_error( "InnoDB: Encountered a problem with file %s.\n", name); } - fprintf(stderr, + fprintf(stderr, "InnoDB: Cannot continue operation.\n" "InnoDB: Disk is full. Try to clean the disk to free space.\n" "InnoDB: Delete possible created file and restart.\n"); @@ -184,7 +192,9 @@ os_file_handle_error( return(TRUE); } else { - ut_error; + fprintf(stderr, "InnoDB: Cannot continue operation.\n"); + + exit(1); } return(FALSE); |