diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-03-07 15:28:11 +0200 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-03-07 15:28:11 +0200 |
| commit | 9396ef5b2d063edd1d4705d05b2844895e50c084 (patch) | |
| tree | 6c158362702b96a577b58a1df5f2b9426b175ddb /innobase/os/os0thread.c | |
| parent | 309b4721d50ba42bc0c286a4be5a95d49649af28 (diff) | |
| parent | 9c6cc47f749d37fb0cc9d5ff48818237bacd5012 (diff) | |
| download | mariadb-git-9396ef5b2d063edd1d4705d05b2844895e50c084.tar.gz | |
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
Diffstat (limited to 'innobase/os/os0thread.c')
| -rw-r--r-- | innobase/os/os0thread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/innobase/os/os0thread.c b/innobase/os/os0thread.c index 12a8abf3069..0278e3b2b66 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 |