Remove default of NOW from UpdatedOn in Monitor_Status field because …

…old mysql can't handle it. Explicilty set it in zmc. Fixes #4155
ZoneMinder · Sep 27, 2024 · 7cc4ac2 · 7cc4ac2
1 parent fdf1869
commit 7cc4ac2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/db/zm_update-1.36.34.sql b/db/zm_update-1.36.34.sql
@@ -4,7 +4,7 @@ SET @s = (SELECT IF(
      AND column_name = 'UpdatedOn'
     ) > 0,
 "SELECT 'Column UpdatedOn already exists in Monitor_Status'",
-"ALTER TABLE `Monitor_Status` ADD `UpdatedOn`     datetime NOT NULL default NOW() AFTER CaptureBandwidth"
+"ALTER TABLE `Monitor_Status` ADD `UpdatedOn`     datetime NOT NULL AFTER CaptureBandwidth"
 ));
 
 PREPARE stmt FROM @s;

diff --git a/src/zmc.cpp b/src/zmc.cpp
@@ -247,8 +247,8 @@ int main(int argc, char *argv[]) {
       monitor->setHeartbeatTime(now);
 
       snprintf(sql, sizeof(sql), 
-          "INSERT INTO Monitor_Status (MonitorId,Status,CaptureFPS,AnalysisFPS)"
-          " VALUES (%u, 'Running',0,0) ON DUPLICATE KEY UPDATE Status='Running',CaptureFPS=0,AnalysisFPS=0,CaptureBandwidth=0",
+          "INSERT INTO Monitor_Status (MonitorId,Status,CaptureFPS,AnalysisFPS,UpdatedOn)"
+          " VALUES (%u, 'Running',0,0,NOW()) ON DUPLICATE KEY UPDATE Status='Running',CaptureFPS=0,AnalysisFPS=0,CaptureBandwidth=0,UpdatedOn=NOW()",
           monitor->Id());
       zmDbDo(sql);
 
@@ -268,7 +268,7 @@ int main(int argc, char *argv[]) {
       if (zm_terminate) break;
 
       snprintf(sql, sizeof(sql),
-          "INSERT INTO Monitor_Status (MonitorId,Status) VALUES (%u, 'Connected') ON DUPLICATE KEY UPDATE Status='Connected'",
+          "INSERT INTO Monitor_Status (MonitorId,Status,UpdatedOn) VALUES (%u, 'Connected', NOW()) ON DUPLICATE KEY UPDATE Status='Connected',UpdatedOn=NOW()",
                monitor->Id());
       zmDbDo(sql);
     }  // end foreach monitor
@@ -373,7 +373,7 @@ int main(int argc, char *argv[]) {
   for (std::shared_ptr<Monitor> &monitor : monitors) {
     static char sql[ZM_SQL_SML_BUFSIZ];
     snprintf(sql, sizeof(sql),
-        "INSERT INTO Monitor_Status (MonitorId,Status) VALUES (%u, 'NotRunning') ON DUPLICATE KEY UPDATE Status='NotRunning',CaptureFPS=0,AnalysisFPS=0,CaptureBandwidth=0", 
+        "INSERT INTO Monitor_Status (MonitorId,Status,UpdatedOn) VALUES (%u, 'NotRunning') ON DUPLICATE KEY UPDATE Status='NotRunning',CaptureFPS=0,AnalysisFPS=0,CaptureBandwidth=0,NOW()", 
         monitor->Id());
     zmDbDo(sql);
   }