From e80180bd0409216c28d891ec8381dc11c3bd98e4 Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Thu, 21 Jun 2018 15:27:37 +0200
Subject: [PATCH] Fixing double definition of dbWaitTimeout

---
 dicos/25_bdd_server.xml | 3 ---
 tmpl/tunning.cnf        | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/dicos/25_bdd_server.xml b/dicos/25_bdd_server.xml
index 70aaa6d..c4b2678 100644
--- a/dicos/25_bdd_server.xml
+++ b/dicos/25_bdd_server.xml
@@ -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>
diff --git a/tmpl/tunning.cnf b/tmpl/tunning.cnf
index fb78c78..70113f5 100644
--- a/tmpl/tunning.cnf
+++ b/tmpl/tunning.cnf
@@ -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