From 3eae356ed79a4372b8b8bc992b35dc8ea8524b2f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 30 Sep 2020 09:39:31 -0400
Subject: [PATCH] Bump to 1.35.8.  Change table engine to InnoDb for
 Monitor_Status.

---
 db/zm_create.sql.in            |  2 +-
 db/zm_update-1.35.8.sql        | 12 ++++++++++++
 distros/redhat/zoneminder.spec |  2 +-
 version                        |  2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 db/zm_update-1.35.8.sql

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index cd4622df1..a0ab83c80 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -551,7 +551,7 @@ CREATE TABLE `Monitor_Status` (
   `AnalysisFPS`  DECIMAL(5,2) NOT NULL default 0,
   `CaptureBandwidth`  INT NOT NULL default 0,
   PRIMARY KEY (`MonitorId`)
-) ENGINE=MEMORY;
+) ENGINE=@ZM_MYSQL_ENGINE@;
 --
 -- Table structure for table `States`
 -- PP - Added IsActive to track custom run states
diff --git a/db/zm_update-1.35.8.sql b/db/zm_update-1.35.8.sql
new file mode 100644
index 000000000..1549903ab
--- /dev/null
+++ b/db/zm_update-1.35.8.sql
@@ -0,0 +1,12 @@
+/* The MEMORY TABLE TYPE IS BAD! Switch to regular InnoDB */
+
+DROP TABLE IF EXISTS `Monitor_Status`;
+CREATE TABLE `Monitor_Status` (
+  `MonitorId` int(10) unsigned NOT NULL,
+  `Status`  enum('Unknown','NotRunning','Running','Connected','Signal') NOT NULL default 'Unknown',
+  `CaptureFPS`  DECIMAL(10,2) NOT NULL default 0,
+  `AnalysisFPS`  DECIMAL(5,2) NOT NULL default 0,
+  `CaptureBandwidth`  INT NOT NULL default 0,
+  PRIMARY KEY (`MonitorId`)
+) ENGINE=InnoDB;
+
diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index b594c2de2..594da469d 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -28,7 +28,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.35.7
+Version: 1.35.8
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
diff --git a/version b/version
index 96eced874..39db50cf2 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.35.7
+1.35.8