diff options
| author | serg@serg.mylan <> | 2005-03-09 14:09:06 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-03-09 14:09:06 +0100 |
| commit | 956682de1a15d974e6ad034218bb14fa1d17a370 (patch) | |
| tree | 4625d7f51e27bb495a5f571cfcad95a20d34e4a9 /innobase/os | |
| parent | c49928447df13564ad8c657bf01d8010c9732d0c (diff) | |
| parent | c64b47fc0e4e834b0d7a449f6f948893e790e902 (diff) | |
| download | mariadb-git-956682de1a15d974e6ad034218bb14fa1d17a370.tar.gz | |
merged
Diffstat (limited to 'innobase/os')
| -rw-r--r-- | innobase/os/os0file.c | 22 | ||||
| -rw-r--r-- | innobase/os/os0sync.c | 4 | ||||
| -rw-r--r-- | innobase/os/os0thread.c | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index 969f7aee859..eeba98a8ab2 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -2053,8 +2053,8 @@ try_again: ut_ad(buf); ut_ad(n > 0); - low = offset; - high = offset_high; + low = (DWORD) offset; + high = (DWORD) offset_high; /* Protect the seek / read operation with a mutex */ i = ((ulint) file) % OS_FILE_N_SEEK_MUTEXES; @@ -2072,7 +2072,7 @@ try_again: os_n_pending_reads++; - ret = ReadFile(file, buf, n, &len, NULL); + ret = ReadFile(file, buf, (DWORD) n, &len, NULL); os_n_pending_reads--; @@ -2164,8 +2164,8 @@ try_again: ut_ad(buf); ut_ad(n > 0); - low = offset; - high = offset_high; + low = (DWORD) offset; + high = (DWORD) offset_high; /* Protect the seek / read operation with a mutex */ i = ((ulint) file) % OS_FILE_N_SEEK_MUTEXES; @@ -2183,7 +2183,7 @@ try_again: os_n_pending_reads++; - ret = ReadFile(file, buf, n, &len, NULL); + ret = ReadFile(file, buf, (DWORD) n, &len, NULL); os_n_pending_reads--; @@ -2258,8 +2258,8 @@ os_file_write( ut_ad(buf); ut_ad(n > 0); retry: - low = offset; - high = offset_high; + low = (DWORD) offset; + high = (DWORD) offset_high; /* Protect the seek / write operation with a mutex */ i = ((ulint) file) % OS_FILE_N_SEEK_MUTEXES; @@ -2288,7 +2288,7 @@ retry: os_n_pending_writes++; - ret = WriteFile(file, buf, n, &len, NULL); + ret = WriteFile(file, buf, (DWORD) n, &len, NULL); os_n_pending_writes--; @@ -3279,7 +3279,7 @@ os_aio( #ifdef WIN_ASYNC_IO ibool retval; BOOL ret = TRUE; - DWORD len = n; + DWORD len = (DWORD) n; void* dummy_mess1; void* dummy_mess2; ulint dummy_type; @@ -4126,7 +4126,7 @@ loop: if (os_n_file_reads == os_n_file_reads_old) { avg_bytes_read = 0.0; } else { - avg_bytes_read = os_bytes_read_since_printout / + avg_bytes_read = (double) os_bytes_read_since_printout / (os_n_file_reads - os_n_file_reads_old); } diff --git a/innobase/os/os0sync.c b/innobase/os/os0sync.c index c48c44a4c70..18d92af5054 100644 --- a/innobase/os/os0sync.c +++ b/innobase/os/os0sync.c @@ -361,7 +361,7 @@ os_event_wait_time( ut_a(event); if (time != OS_SYNC_INFINITE_TIME) { - err = WaitForSingleObject(event->handle, time / 1000); + err = WaitForSingleObject(event->handle, (DWORD) time / 1000); } else { err = WaitForSingleObject(event->handle, INFINITE); } @@ -408,7 +408,7 @@ os_event_wait_multiple( ut_a(native_event_array); ut_a(n > 0); - index = WaitForMultipleObjects(n, native_event_array, + index = WaitForMultipleObjects((DWORD) n, native_event_array, FALSE, /* Wait for any 1 event */ INFINITE); /* Infinite wait time limit */ diff --git a/innobase/os/os0thread.c b/innobase/os/os0thread.c index 91061bc8459..847d0ee1cc7 100644 --- a/innobase/os/os0thread.c +++ b/innobase/os/os0thread.c @@ -100,7 +100,7 @@ os_thread_create( { #ifdef __WIN__ os_thread_t thread; - ulint win_thread_id; + DWORD win_thread_id; os_mutex_enter(os_sync_mutex); os_thread_count++; @@ -253,7 +253,7 @@ os_thread_sleep( ulint tm) /* in: time in microseconds */ { #ifdef __WIN__ - Sleep(tm / 1000); + Sleep((DWORD) tm / 1000); #elif defined(__NETWARE__) delay(tm / 1000); #else |