Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/wax/mysql/mysql-4.1

Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1
67677dcb · wax@mysql.com · e9315f98 · f38b08af · 67677dcb
Commit 67677dcb authored Feb 17, 2004 by wax@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

mysys/my_init.c mysys/my_init.c +6 -1

No files found.
--- 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 */