diff options
| author | monty@mysql.com <> | 2004-03-18 00:16:04 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-03-18 00:16:04 +0200 |
| commit | 53c810cda446a060d4b9f41040f9227313c24ba1 (patch) | |
| tree | 2bd46f92f467b68e9b652a280b512a9cf0413ca2 /innobase/os | |
| parent | 43706715daf1039a772c2d2aaceae0ef93ffe037 (diff) | |
| parent | f34a642d6e492fa527e09593aa695e67d3867263 (diff) | |
| download | mariadb-git-53c810cda446a060d4b9f41040f9227313c24ba1.tar.gz | |
merge fixes (use old code)
Diffstat (limited to 'innobase/os')
| -rw-r--r-- | innobase/os/os0file.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index 048fd29b318..1f70cf883e7 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -1088,7 +1088,7 @@ try_again: } else if (type == OS_DATA_FILE) { type_str = "DATA"; } else { - ut_a(0); + ut_error; } if (purpose == OS_FILE_AIO) { @@ -1096,7 +1096,7 @@ try_again: } else if (purpose == OS_FILE_NORMAL) { purpose_str = "NORMAL"; } else { - ut_a(0); + ut_error; } /* printf("Opening file %s, mode %s, type %s, purpose %s\n", @@ -1578,7 +1578,7 @@ os_file_flush( /* It is a fatal error if a file flush does not succeed, because then the database can get corrupt on disk */ - ut_a(0); + ut_error; return(FALSE); #else @@ -1613,7 +1613,7 @@ os_file_flush( /* It is a fatal error if a file flush does not succeed, because then the database can get corrupt on disk */ - ut_a(0); + ut_error; return(FALSE); #endif @@ -2629,7 +2629,7 @@ os_aio_get_array_no( return(3); } else { - ut_a(0); + ut_error; return(0); } @@ -2656,7 +2656,7 @@ os_aio_get_array_from_no( return(os_aio_write_array); } else { - ut_a(0); + ut_error; return(NULL); } @@ -3246,7 +3246,7 @@ os_aio_posix_handle( if (sig != SIGRTMIN + 1 + array_no) { - ut_a(0); + ut_error; return(FALSE); } @@ -3511,7 +3511,7 @@ consecutive_loop: slot->name, (ulong) slot->offset_high, (ulong) slot->offset, (ulong) total_len); - ut_a(0); + ut_error; } /* Do a 'last millisecond' check that the page end |