diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 3aaf113e679484543631e07a8bace0ceaf730386..cc5235b58c2f8303f8b478ec7c1d45768d952869 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -675,7 +675,7 @@ begin
//installDir et version de php
StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
- StringChangeEx (srcContents, 'WAMPMYSQLVERSION', myport, True);
+ StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
SaveStringToFile(destFile,srcContents, False);
end
diff --git a/build/exe/doliwamp/httpd.conf.install b/build/exe/doliwamp/httpd.conf.install
index 6519fdd779543b00ddda44f3b295eb7c9f2ce77f..96bf688b1d5200bb7ac5c2788d0025c57487191e 100644
--- a/build/exe/doliwamp/httpd.conf.install
+++ b/build/exe/doliwamp/httpd.conf.install
@@ -72,7 +72,6 @@ LoadModule auth_basic_module modules/mod_auth_basic.so
#LoadModule auth_digest_module modules/mod_auth_digest.so
#LoadModule authn_anon_module modules/mod_authn_anon.so
#LoadModule authn_dbm_module modules/mod_authn_dbm.so
-#LoadModule authn_default_module modules/mod_authn_default.so
LoadModule authn_file_module modules/mod_authn_file.so
LoadModule authz_core_module modules/mod_authz_core.so
#LoadModule authz_dbm_module modules/mod_authz_dbm.so
@@ -412,7 +411,7 @@ LogLevel warn
# keep browsers from trying to display binary files as though they are
# text.
#
-DefaultType text/plain
+#DefaultType text/plain
<IfModule mime_module>
#
diff --git a/build/exe/doliwamp/my.ini.install b/build/exe/doliwamp/my.ini.install
index c855cc27a66a0da64e9aebd73468f68549707ce4..885660f648bb4c02063e190dc901d5dcf89749a5 100644
--- a/build/exe/doliwamp/my.ini.install
+++ b/build/exe/doliwamp/my.ini.install
@@ -77,10 +77,6 @@ log-error=WAMPROOT/logs/mysql.log
#Path to the database root
datadir=WAMPROOT/bin/mysql/data
-# The default character set that will be used when a new schema or table is
-# created and no character set is defined
-default-character-set=latin1
-
# The default storage engine that will be used when create new tables when
default-storage-engine=INNODB
@@ -101,13 +97,6 @@ max_connections=255
# slowdown instead of a performance improvement.
query_cache_size=8M
-# The number of open tables for all threads. Increasing this value
-# increases the number of file descriptors that mysqld requires.
-# Therefore you have to make sure to set the amount of open files
-# allowed to at least 4096 in the variable "open-files-limit" in
-# section [mysqld_safe]
-table_cache=510
-
# Maximum size for internal (in-memory) temporary tables. If a table
# grows larger than this value, it is automatically converted to disk
# based table This limitation is for a single table. There can be many
@@ -125,18 +114,6 @@ thread_cache_size=12
#*** MyISAM Specific options
-# The maximum size of the temporary file MySQL is allowed to use while
-# recreating the index (during REPAIR, ALTER TABLE or LOAD DATA INFILE.
-# If the file-size would be bigger than this, the index will be created
-# through the key cache (which is slower).
-myisam_max_sort_file_size=100G
-
-# If the temporary file used for fast index creation would be bigger
-# than using the key cache by the amount specified here, then prefer the
-# key cache method. This is mainly used to force long character keys in
-# large tables to use the slower key cache method to create the index.
-myisam_max_extra_sort_file_size=100G
-
# If the temporary file used for fast index creation would be bigger
# than using the key cache by the amount specified here, then prefer the
# key cache method. This is mainly used to force long character keys in
@@ -170,13 +147,6 @@ sort_buffer_size=203K
# and speed up some things.
#skip-innodb
-# Additional memory pool that is used by InnoDB to store metadata
-# information. If InnoDB requires more memory for this purpose it will
-# start to allocate it from the OS. As this is fast enough on most
-# recent operating systems, you normally do not need to change this
-# value. SHOW INNODB STATUS will display the current amount used.
-innodb_additional_mem_pool_size=2M
-
# If set to 1, InnoDB will flush (fsync) the transaction logs to the
# disk at each commit, which offers full ACID behavior. If you are
# willing to compromise this safety, and you are running small
@@ -234,10 +204,6 @@ log-error=WAMPROOT/logs/mysql.log
#Path to the database root
datadir=WAMPROOT/bin/mysql/data
-# The default character set that will be used when a new schema or table is
-# created and no character set is defined
-default-character-set=latin1
-
# The default storage engine that will be used when create new tables when
default-storage-engine=INNODB
@@ -258,13 +224,6 @@ max_connections=255
# slowdown instead of a performance improvement.
query_cache_size=8M
-# The number of open tables for all threads. Increasing this value
-# increases the number of file descriptors that mysqld requires.
-# Therefore you have to make sure to set the amount of open files
-# allowed to at least 4096 in the variable "open-files-limit" in
-# section [mysqld_safe]
-table_cache=510
-
# Maximum size for internal (in-memory) temporary tables. If a table
# grows larger than this value, it is automatically converted to disk
# based table This limitation is for a single table. There can be many
@@ -282,18 +241,6 @@ thread_cache_size=12
#*** MyISAM Specific options
-# The maximum size of the temporary file MySQL is allowed to use while
-# recreating the index (during REPAIR, ALTER TABLE or LOAD DATA INFILE.
-# If the file-size would be bigger than this, the index will be created
-# through the key cache (which is slower).
-myisam_max_sort_file_size=100G
-
-# If the temporary file used for fast index creation would be bigger
-# than using the key cache by the amount specified here, then prefer the
-# key cache method. This is mainly used to force long character keys in
-# large tables to use the slower key cache method to create the index.
-myisam_max_extra_sort_file_size=100G
-
# If the temporary file used for fast index creation would be bigger
# than using the key cache by the amount specified here, then prefer the
# key cache method. This is mainly used to force long character keys in
@@ -327,13 +274,6 @@ sort_buffer_size=203K
# and speed up some things.
#skip-innodb
-# Additional memory pool that is used by InnoDB to store metadata
-# information. If InnoDB requires more memory for this purpose it will
-# start to allocate it from the OS. As this is fast enough on most
-# recent operating systems, you normally do not need to change this
-# value. SHOW INNODB STATUS will display the current amount used.
-innodb_additional_mem_pool_size=2M
-
# If set to 1, InnoDB will flush (fsync) the transaction logs to the
# disk at each commit, which offers full ACID behavior. If you are
# willing to compromise this safety, and you are running small
diff --git a/build/exe/doliwamp/startdoliwamp.bat b/build/exe/doliwamp/startdoliwamp.bat
index d6842c560107c5559e2094fe5a75370d349c07e7..6e1d6f2641d2a7b96e21292125acc265d2dfe022 100644
--- a/build/exe/doliwamp/startdoliwamp.bat
+++ b/build/exe/doliwamp/startdoliwamp.bat
@@ -10,9 +10,11 @@ NET START doliwampapache >> doliwamp.log 2>>&1
echo NET START doliwampmysqld >> doliwamp.log 2>>&1
NET START doliwampmysqld >> doliwamp.log 2>>&1
+REM You can also check logs into c:/dolibarr/logs if start fails
+
echo Please wait...
echo ---- End script >> doliwamp.log 2>>&1
REM sleep is not a Windows commande
-REM sleep 1
-ping 1.1.1.1 -n 1 -w 1000 > nul
\ No newline at end of file
+REM sleep 2
+ping 127.0.0.1 -n 2 -w 1000 > nul
diff --git a/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install b/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install
index 751302c0633695d1f1c9e1956bfce3429e0492e1..540f8bc9fbc9823029eba795c7f10786b95445ce 100644
--- a/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install
+++ b/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install
@@ -12,6 +12,7 @@ start WAMPROOT\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -f conf\httpd.co
echo
echo Running Mysql as user process (this process does not return so we use "start")
-start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console
+REM start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console
+start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console
pause
\ No newline at end of file
diff --git a/build/exe/doliwamp/stopdoliwamp.bat b/build/exe/doliwamp/stopdoliwamp.bat
index e4d2ce07c294356edd190fa26ec32f198e6ba704..e7f8caefb7718fbf90a91edde361e11a8c48d61d 100644
--- a/build/exe/doliwamp/stopdoliwamp.bat
+++ b/build/exe/doliwamp/stopdoliwamp.bat
@@ -15,4 +15,6 @@ echo ---- End script >> doliwamp.log 2>>&1
REM sleep is not a Windows command
REM sleep 1
-ping 1.1.1.1 -n 1 -w 1000 > nul
\ No newline at end of file
+ping 1.1.1.1 -n 1 -w 1000 > nul
+
+REM pause