diff options
| author | wax@mysql.com <> | 2004-02-17 05:15:10 +0500 |
|---|---|---|
| committer | wax@mysql.com <> | 2004-02-17 05:15:10 +0500 |
| commit | 67677dcba83eed79d5232731ed250546e37b51f6 (patch) | |
| tree | beb4448b9e27ef8d865858060bd81c64d1311dd3 /mysys | |
| parent | e9315f984d9224044e771b5c483050a81b03b947 (diff) | |
| parent | f38b08af9155cac52007c1ee1053a467f8054a4b (diff) | |
| download | mariadb-git-67677dcba83eed79d5232731ed250546e37b51f6.tar.gz | |
Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_init.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index d68af1400c5..a7899c20442 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -242,8 +242,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 */ |