diff options
| author | unknown <monty@mysql.com> | 2004-05-11 12:21:38 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-11 12:21:38 +0300 |
| commit | 19f41e6e0df2d875cff2404f9bbbab30d81b72b1 (patch) | |
| tree | 0752eb9dfe0f1e306cf9a542e09d9cc646c11a0f /mysys/my_init.c | |
| parent | cb24e8b9b29f1aa3edfc4d7a61a9d842cb48ca69 (diff) | |
| parent | f3d691a970627f34ed825a9cf7b84520dcdd43b3 (diff) | |
| download | mariadb-git-19f41e6e0df2d875cff2404f9bbbab30d81b72b1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql-bench/limits/mysql-4.0.cfg:
Auto merged
Diffstat (limited to 'mysys/my_init.c')
| -rw-r--r-- | mysys/my_init.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index d68af1400c5..fc178b0308b 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -19,10 +19,6 @@ #include "mysys_err.h" #include <m_string.h> #include <m_ctype.h> -#ifdef HAVE_GETRUSAGE -#include <sys/resource.h> -/* extern int getrusage(int, struct rusage *); */ -#endif #include <signal.h> #ifdef VMS #include <my_static.c> @@ -242,8 +238,13 @@ static void my_win_init(void) setlocale(LC_CTYPE, ""); /* To get right sortorder */ - /* Clear the OS system variable TZ and avoid the 100% CPU usage */ +#if defined(_MSC_VER) && (_MSC_VER < 1300) + /* + Clear the OS system variable TZ and avoid the 100% CPU usage + Only for old versions of Visual C++ + */ _putenv( "TZ=" ); +#endif _tzset(); /* apre la chiave HKEY_LOCAL_MACHINES\software\MySQL */ |