diff options
| author | unknown <serg@serg.mysql.com> | 2002-10-25 22:07:04 +0000 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-10-25 22:07:04 +0000 |
| commit | 7962de4cf303e71600f7ff2beebcb5900ef41f71 (patch) | |
| tree | a265b1027bdd9f187cbc41ed6c5c709d6793109e /mysys/my_init.c | |
| parent | d51b72cac30e5d02fde6e9c98c3e91716b19ed04 (diff) | |
| parent | f5563ddad40e8ab84d457b0e9960ddfdc7faec99 (diff) | |
| download | mariadb-git-7962de4cf303e71600f7ff2beebcb5900ef41f71.tar.gz | |
merged
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-skipkeys~888e38cf95239a33:
'Auto converge rename'
Docs/manual.texi:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/ft_nlq_search.c:
Auto merged
myisam/ft_parser.c:
Auto merged
myisam/ftdefs.h:
Auto merged
myisam/mi_create.c:
Auto merged
mysys/my_init.c:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'mysys/my_init.c')
| -rw-r--r-- | mysys/my_init.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index ee39f7201ca..2f5088d5b9e 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -217,6 +217,10 @@ 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 */ + _putenv( "TZ=" ); + _tzset(); + /* apre la chiave HKEY_LOCAL_MACHINES\software\MySQL */ if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,(LPCTSTR)targetKey,0, KEY_READ,&hSoftMysql) != ERROR_SUCCESS) @@ -240,7 +244,7 @@ static void my_win_init(void) /* Inserisce i dati come variabili d'ambiente */ my_env=strdup(EnvString); /* variable for putenv must be allocated ! */ - putenv(EnvString) ; + putenv(my_env) ; dimNameValueBuffer = dimName ; dimDataValueBuffer = dimData ; |