database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-7164: innodb.innodb-alter-table-disk-full fails in buildbot on Windows

Browse Source 
Analysis: Test case uses Linux specific error codes.

Fix: Can't run test case with Windows currently because requires
to inject error to system.
This commit is contained in:
Jan Lindström
2014-11-24 15:26:47 +02:00
parent a726dbd634
commit ef1ba3b1e6
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/innodb/t/innodb-alter-table-disk-full.test
View File

@ -1,5 +1,8 @@
# MDEV-6288: Innodb causes server crash after disk full, then can't ALTER TABLE any more # MDEV-6288: Innodb causes server crash after disk full, then can't ALTER TABLE any more
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/not_windows.inc
--source include/not_valgrind.inc
--source include/not_embedded.inc
# DEBUG_SYNC must be compiled in. # DEBUG_SYNC must be compiled in.
--source include/have_debug_sync.inc --source include/have_debug_sync.inc

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

@ -5455,12 +5455,12 @@ consecutive_loop:
aio_slot->offset, total_len); aio_slot->offset, total_len);
} }
DBUG_EXECUTE_IF("ib_os_aio_func_io_failure_28_2", if (aio_slot->type == OS_FILE_WRITE) {
os_has_said_disk_full = FALSE;); DBUG_EXECUTE_IF("ib_os_aio_func_io_failure_28",
DBUG_EXECUTE_IF("ib_os_aio_func_io_failure_28_2", os_has_said_disk_full = FALSE;
ret = 0;); ret = 0;
DBUG_EXECUTE_IF("ib_os_aio_func_io_failure_28_2",
errno = 28;); errno = 28;);
}
srv_set_io_thread_op_info(global_segment, "file i/o done"); srv_set_io_thread_op_info(global_segment, "file i/o done");

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

@ -5597,12 +5597,10 @@ consecutive_loop:
aio_slot->offset, total_len); aio_slot->offset, total_len);
} }
DBUG_EXECUTE_IF("ib_os_aio_func_io_failure_28_2", if (aio_slot->type == OS_FILE_WRITE) {
os_has_said_disk_full = FALSE;); DBUG_EXECUTE_IF("ib_os_aio_func_io_failure_28_2",
DBUG_EXECUTE_IF("ib_os_aio_func_io_failure_28_2", os_has_said_disk_full = FALSE; ret = 0; errno = 28;);
ret = 0;); }
DBUG_EXECUTE_IF("ib_os_aio_func_io_failure_28_2",
errno = 28;);
srv_set_io_thread_op_info(global_segment, "file i/o done"); srv_set_io_thread_op_info(global_segment, "file i/o done");