diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2015-01-19 16:30:32 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2015-01-19 16:30:32 +0100 |
| commit | d854a254b84595b3a8f3a4d8083a2b997d59912e (patch) | |
| tree | 111066e8bb40894d6ab7fba552aa0d4851556af4 | |
| parent | 919443f7a553534de38d40a5cdf50cd3660ace1a (diff) | |
| download | mariadb-git-d854a254b84595b3a8f3a4d8083a2b997d59912e.tar.gz | |
remove incorrect asserts in innodb/xtradb. 0 is a valid file handle value.
| -rw-r--r-- | storage/innobase/os/os0file.cc | 10 | ||||
| -rw-r--r-- | storage/xtradb/os/os0file.cc | 10 |
2 files changed, 0 insertions, 20 deletions
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index f94d6353431..e835c1b4e92 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -1999,8 +1999,6 @@ os_file_close_func( #ifdef __WIN__ BOOL ret; - ut_a(file); - ret = CloseHandle(file); if (ret) { @@ -2038,8 +2036,6 @@ os_file_close_no_error_handling( #ifdef __WIN__ BOOL ret; - ut_a(file); - ret = CloseHandle(file); if (ret) { @@ -2266,8 +2262,6 @@ os_file_flush_func( #ifdef __WIN__ BOOL ret; - ut_a(file); - os_n_fsyncs++; ret = FlushFileBuffers(file); @@ -2598,7 +2592,6 @@ os_file_read_func( os_bytes_read_since_printout += n; try_again: - ut_ad(file); ut_ad(buf); ut_ad(n > 0); @@ -2725,7 +2718,6 @@ os_file_read_no_error_handling_func( os_bytes_read_since_printout += n; try_again: - ut_ad(file); ut_ad(buf); ut_ad(n > 0); @@ -2861,7 +2853,6 @@ os_file_write_func( os_n_file_writes++; - ut_ad(file); ut_ad(buf); ut_ad(n > 0); retry: @@ -4581,7 +4572,6 @@ os_aio_func( #endif /* WIN_ASYNC_IO */ ulint wake_later; - ut_ad(file); ut_ad(buf); ut_ad(n > 0); ut_ad(n % OS_FILE_LOG_BLOCK_SIZE == 0); diff --git a/storage/xtradb/os/os0file.cc b/storage/xtradb/os/os0file.cc index d1724c378bd..691054a7e47 100644 --- a/storage/xtradb/os/os0file.cc +++ b/storage/xtradb/os/os0file.cc @@ -2163,8 +2163,6 @@ os_file_close_func( #ifdef __WIN__ BOOL ret; - ut_a(file); - ret = CloseHandle(file); if (ret) { @@ -2201,8 +2199,6 @@ os_file_close_no_error_handling( #ifdef __WIN__ BOOL ret; - ut_a(file); - ret = CloseHandle(file); if (ret) { @@ -2452,8 +2448,6 @@ os_file_flush_func( #ifdef __WIN__ BOOL ret; - ut_a(file); - os_n_fsyncs++; ret = FlushFileBuffers(file); @@ -2856,7 +2850,6 @@ os_file_read_func( os_bytes_read_since_printout += n; try_again: - ut_ad(file); ut_ad(buf); ut_ad(n > 0); @@ -2956,7 +2949,6 @@ os_file_read_no_error_handling_func( os_bytes_read_since_printout += n; try_again: - ut_ad(file); ut_ad(buf); ut_ad(n > 0); @@ -3062,7 +3054,6 @@ os_file_write_func( os_n_file_writes++; - ut_ad(file); ut_ad(buf); ut_ad(n > 0); retry: @@ -4731,7 +4722,6 @@ os_aio_func( #endif ulint wake_later; - ut_ad(file); ut_ad(buf); ut_ad(n > 0); ut_ad(n % OS_MIN_LOG_BLOCK_SIZE == 0); |