Commit d854a254 authored by Sergei Golubchik's avatar Sergei Golubchik

remove incorrect asserts in innodb/xtradb. 0 is a valid file handle value.

parent 919443f7
...@@ -1999,8 +1999,6 @@ os_file_close_func( ...@@ -1999,8 +1999,6 @@ os_file_close_func(
#ifdef __WIN__ #ifdef __WIN__
BOOL ret; BOOL ret;
ut_a(file);
ret = CloseHandle(file); ret = CloseHandle(file);
if (ret) { if (ret) {
...@@ -2038,8 +2036,6 @@ os_file_close_no_error_handling( ...@@ -2038,8 +2036,6 @@ os_file_close_no_error_handling(
#ifdef __WIN__ #ifdef __WIN__
BOOL ret; BOOL ret;
ut_a(file);
ret = CloseHandle(file); ret = CloseHandle(file);
if (ret) { if (ret) {
...@@ -2266,8 +2262,6 @@ os_file_flush_func( ...@@ -2266,8 +2262,6 @@ os_file_flush_func(
#ifdef __WIN__ #ifdef __WIN__
BOOL ret; BOOL ret;
ut_a(file);
os_n_fsyncs++; os_n_fsyncs++;
ret = FlushFileBuffers(file); ret = FlushFileBuffers(file);
...@@ -2598,7 +2592,6 @@ os_file_read_func( ...@@ -2598,7 +2592,6 @@ os_file_read_func(
os_bytes_read_since_printout += n; os_bytes_read_since_printout += n;
try_again: try_again:
ut_ad(file);
ut_ad(buf); ut_ad(buf);
ut_ad(n > 0); ut_ad(n > 0);
...@@ -2725,7 +2718,6 @@ os_file_read_no_error_handling_func( ...@@ -2725,7 +2718,6 @@ os_file_read_no_error_handling_func(
os_bytes_read_since_printout += n; os_bytes_read_since_printout += n;
try_again: try_again:
ut_ad(file);
ut_ad(buf); ut_ad(buf);
ut_ad(n > 0); ut_ad(n > 0);
...@@ -2861,7 +2853,6 @@ os_file_write_func( ...@@ -2861,7 +2853,6 @@ os_file_write_func(
os_n_file_writes++; os_n_file_writes++;
ut_ad(file);
ut_ad(buf); ut_ad(buf);
ut_ad(n > 0); ut_ad(n > 0);
retry: retry:
...@@ -4581,7 +4572,6 @@ os_aio_func( ...@@ -4581,7 +4572,6 @@ os_aio_func(
#endif /* WIN_ASYNC_IO */ #endif /* WIN_ASYNC_IO */
ulint wake_later; ulint wake_later;
ut_ad(file);
ut_ad(buf); ut_ad(buf);
ut_ad(n > 0); ut_ad(n > 0);
ut_ad(n % OS_FILE_LOG_BLOCK_SIZE == 0); ut_ad(n % OS_FILE_LOG_BLOCK_SIZE == 0);
......
...@@ -2163,8 +2163,6 @@ os_file_close_func( ...@@ -2163,8 +2163,6 @@ os_file_close_func(
#ifdef __WIN__ #ifdef __WIN__
BOOL ret; BOOL ret;
ut_a(file);
ret = CloseHandle(file); ret = CloseHandle(file);
if (ret) { if (ret) {
...@@ -2201,8 +2199,6 @@ os_file_close_no_error_handling( ...@@ -2201,8 +2199,6 @@ os_file_close_no_error_handling(
#ifdef __WIN__ #ifdef __WIN__
BOOL ret; BOOL ret;
ut_a(file);
ret = CloseHandle(file); ret = CloseHandle(file);
if (ret) { if (ret) {
...@@ -2452,8 +2448,6 @@ os_file_flush_func( ...@@ -2452,8 +2448,6 @@ os_file_flush_func(
#ifdef __WIN__ #ifdef __WIN__
BOOL ret; BOOL ret;
ut_a(file);
os_n_fsyncs++; os_n_fsyncs++;
ret = FlushFileBuffers(file); ret = FlushFileBuffers(file);
...@@ -2856,7 +2850,6 @@ os_file_read_func( ...@@ -2856,7 +2850,6 @@ os_file_read_func(
os_bytes_read_since_printout += n; os_bytes_read_since_printout += n;
try_again: try_again:
ut_ad(file);
ut_ad(buf); ut_ad(buf);
ut_ad(n > 0); ut_ad(n > 0);
...@@ -2956,7 +2949,6 @@ os_file_read_no_error_handling_func( ...@@ -2956,7 +2949,6 @@ os_file_read_no_error_handling_func(
os_bytes_read_since_printout += n; os_bytes_read_since_printout += n;
try_again: try_again:
ut_ad(file);
ut_ad(buf); ut_ad(buf);
ut_ad(n > 0); ut_ad(n > 0);
...@@ -3062,7 +3054,6 @@ os_file_write_func( ...@@ -3062,7 +3054,6 @@ os_file_write_func(
os_n_file_writes++; os_n_file_writes++;
ut_ad(file);
ut_ad(buf); ut_ad(buf);
ut_ad(n > 0); ut_ad(n > 0);
retry: retry:
...@@ -4731,7 +4722,6 @@ os_aio_func( ...@@ -4731,7 +4722,6 @@ os_aio_func(
#endif #endif
ulint wake_later; ulint wake_later;
ut_ad(file);
ut_ad(buf); ut_ad(buf);
ut_ad(n > 0); ut_ad(n > 0);
ut_ad(n % OS_MIN_LOG_BLOCK_SIZE == 0); ut_ad(n % OS_MIN_LOG_BLOCK_SIZE == 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment