From a01d7e3a97dac456a8980d6d49e03d8aadfe8478 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Mon, 22 Nov 2021 17:35:50 +0000
Subject: [PATCH] mysql remove old Timeout option, clarify timezone options

---
 storage/mysql/68-mysql.html               | 3 ++-
 storage/mysql/68-mysql.js                 | 1 -
 storage/mysql/locales/en-US/68-mysql.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/storage/mysql/68-mysql.html b/storage/mysql/68-mysql.html
index 1bfaf30b..ac437e31 100644
--- a/storage/mysql/68-mysql.html
+++ b/storage/mysql/68-mysql.html
@@ -22,7 +22,7 @@
     </div>
     <div class="form-row">
         <label for="node-config-input-tz"><i class="fa fa-clock-o"></i> <span data-i18n="mysql.label.timezone"></span></label>
-        <input type="text" id="node-config-input-tz">
+        <input type="text" id="node-config-input-tz" placeholder="&#177;hh:mm">
     </div>
     <div class="form-row">
         <label for="node-config-input-charset"><i class="fa fa-language"></i> <span data-i18n="mysql.label.charset"></span></label>
@@ -32,6 +32,7 @@
         <label for="node-config-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
         <input type="text" id="node-config-input-name" data-i18n="[placeholder]node-red:common.label.name">
     </div>
+    <div class="form-tips"><span data-i18n="[html]mysql.tip"></span></div>
 </script>
 
 <script type="text/javascript">
diff --git a/storage/mysql/68-mysql.js b/storage/mysql/68-mysql.js
index 13a5aae1..8cac776b 100644
--- a/storage/mysql/68-mysql.js
+++ b/storage/mysql/68-mysql.js
@@ -42,7 +42,6 @@ module.exports = function(RED) {
                     insecureAuth: true,
                     multipleStatements: true,
                     connectionLimit: 50,
-                    timeout: 30000,
                     connectTimeout: 30000,
                     charset: node.charset,
                     decimalNumbers: true
diff --git a/storage/mysql/locales/en-US/68-mysql.json b/storage/mysql/locales/en-US/68-mysql.json
index 9edd17ba..df3ac023 100644
--- a/storage/mysql/locales/en-US/68-mysql.json
+++ b/storage/mysql/locales/en-US/68-mysql.json
@@ -19,6 +19,7 @@
             "notstring": "the query is not defined as a string",
             "notconnected": "Database not connected",
             "notconfigured": "MySQL database not configured"
-        }
+        },
+        "tip": "Tip: The timezone should be specified as &#177;hh:mm or leave blank for 'local'."
     }
 }
\ No newline at end of file