Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

mysys/my_init.c:
  Auto merged

mysys/my_init.c

@@ -246,7 +246,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 ;