diff options
| author | serg@serg.mysql.com <> | 2002-10-25 22:07:04 +0000 |
|---|---|---|
| committer | serg@serg.mysql.com <> | 2002-10-25 22:07:04 +0000 |
| commit | 1a1cafce63831cc81ea5e99d4ba82d48bd455236 (patch) | |
| tree | a265b1027bdd9f187cbc41ed6c5c709d6793109e /mysys/my_init.c | |
| parent | 3c570209df399cc24d1e5e454a8bc152ca284a81 (diff) | |
| parent | dede6634f675a213de62560f539f7af2e103b9f3 (diff) | |
| download | mariadb-git-1a1cafce63831cc81ea5e99d4ba82d48bd455236.tar.gz | |
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 ; |