Merge branch 'master' into dist/eole/2.6.2/master
This commit is contained in:
commit
5c7bbbde79
|
@ -97,9 +97,6 @@
|
|||
<variable name="dbMaxAllowedPacket" type='number' description="Taille maximum d'un paquet (en Mo)">
|
||||
<value>32</value>
|
||||
</variable>
|
||||
<variable name='dbWaitTimeout' type='number' description="Nombre de secondes d'attente avant de fermer la connection">
|
||||
<value>28800</value>
|
||||
</variable>
|
||||
<variable name='dbInteractiveTimeout' type='number' description="Nombre de secondes d'attente avant de fermer la connection en mode interactif">
|
||||
<value>28800</value>
|
||||
</variable>
|
||||
|
|
|
@ -17,7 +17,7 @@ tmp_table_size = %%dbTmpTableSize
|
|||
max_heap_table_size = %%dbTmpTableSize
|
||||
max_allowed_packet = %%{dbMaxAllowedPacket}M
|
||||
|
||||
wait_timeout = %%{dbWaitTimeout}
|
||||
wait_timeout = %%dbWaitTimeout
|
||||
interactive_timeout = %%{dbInteractiveTimeout}
|
||||
|
||||
%if %%dbEnableSlowQueryLogs == "oui"
|
||||
|
@ -26,5 +26,4 @@ slow-query-log-file = %%getVar('dbSlowQueryLogFile')
|
|||
long_query_time = %%getVar('dbSlowQueryLogTime')
|
||||
%end if
|
||||
|
||||
wait_timeout = %%dbWaitTimeout
|
||||
|
||||
|
|
Loading…
Reference in New Issue