diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
| commit | 649390ac814ce5ea1e77b833ab5fe92dfcfe86d5 (patch) | |
| tree | ac8b15ac65b08a492c256369b73e372f6568c7a4 /mysys/my_sleep.c | |
| parent | 06b8897e8e9a27b6ffc562af90153ab63f30e63e (diff) | |
| parent | 8df20918d6751dc1eeb47ab722269dbd9d2da297 (diff) | |
| download | mariadb-git-649390ac814ce5ea1e77b833ab5fe92dfcfe86d5.tar.gz | |
Merge of mysql-trunk-bugfixing into mysql-trunk-merge.
Diffstat (limited to 'mysys/my_sleep.c')
| -rw-r--r-- | mysys/my_sleep.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mysys/my_sleep.c b/mysys/my_sleep.c index 87170e4af41..6d1bdd5dc55 100644 --- a/mysys/my_sleep.c +++ b/mysys/my_sleep.c @@ -20,9 +20,7 @@ void my_sleep(ulong m_seconds) { -#ifdef __NETWARE__ - delay(m_seconds/1000+1); -#elif defined(__WIN__) +#if defined(__WIN__) Sleep(m_seconds/1000+1); /* Sleep() has millisecond arg */ #elif defined(HAVE_SELECT) struct timeval t; |