mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 15:25:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Sergei Golubchik 2015-01-19 16:30:32 +01:00
commit d854a254b8
2 changed files with 0 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
storage/innobase/os/os0file.cc
View file

@ -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);

10
storage/xtradb/os/os0file.cc
View file

@ -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);