Bug 417 - Removed Frames id index, not used.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2254 e3e1d417-86f3-4887-817a-d78f3d33393f
nereocystis · Dec 9, 2007 · 412d286 · 412d286
1 parent b7b2dea
commit 412d286
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
@@ -237,15 +237,13 @@ CREATE TABLE `Filters` (
 
 DROP TABLE IF EXISTS `Frames`;
 CREATE TABLE `Frames` (
-  `Id` int(10) unsigned NOT NULL auto_increment,
   `EventId` int(10) unsigned NOT NULL default '0',
   `FrameId` int(10) unsigned NOT NULL default '0',
   `Type` enum('Normal','Bulk','Alarm') NOT NULL default 'Normal',
   `TimeStamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   `Delta` decimal(8,2) NOT NULL default '0.00',
   `Score` smallint(5) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`Id`),
-  KEY `EventId` (`EventId`),
+  PRIMARY KEY (`EventId`,`FrameId`),
   KEY `Type` (`Type`),
   KEY `TimeStamp` (`TimeStamp`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;

diff --git a/db/zm_update-1.22.3.sql b/db/zm_update-1.22.3.sql
@@ -55,6 +55,9 @@ alter table Zones drop index `UC_Id`;
 alter table Events drop primary key;
 alter table Events add primary key ( `Id`, `MonitorId` );
 alter table Events drop index `Id`;
+alter table Frames drop column `Id`;
+alter table Frames drop index `EventId`;
+alter table Frames add primary key ( `EventId`, `FrameId` );
 
 --
 -- These are optional, but we might as well do it now