Index: branches/RC/core/install/install_schema.sql
===================================================================
diff -u -N -r11600 -r11610
--- branches/RC/core/install/install_schema.sql	(.../install_schema.sql)	(revision 11600)
+++ branches/RC/core/install/install_schema.sql	(.../install_schema.sql)	(revision 11610)
@@ -409,8 +409,7 @@
   PopItem int(11) NOT NULL default '2',
   Modified int(11) NOT NULL default '0',
   ModifiedById int(11) NOT NULL default '0',
-  CategoryTemplate varchar(255) NOT NULL default '',
-  CachedCategoryTemplate varchar(255) NOT NULL default '',
+  CachedTemplate varchar(255) NOT NULL,
   Template varchar(255) default NULL,
   UseExternalUrl tinyint(3) unsigned NOT NULL default '0',
   ExternalUrl varchar(255) NOT NULL default '',
@@ -480,15 +479,16 @@
 );
 
 CREATE TABLE CategoryItems (
-  `CategoryId` int(11) NOT NULL default '0',
-  `ItemResourceId` int(11) NOT NULL default '0',
-  `PrimaryCat` tinyint(4) NOT NULL default '0',
-  `ItemPrefix` varchar(50) NOT NULL default '',
-  `Filename` varchar(255) NOT NULL default '',
-  UNIQUE KEY `CategoryId` (`CategoryId`,`ItemResourceId`),
-  KEY `PrimaryCat` (`PrimaryCat`),
-  KEY `ItemPrefix` (`ItemPrefix`),
-  KEY `Filename` (`Filename`(4))
+  CategoryId int(11) NOT NULL default '0',
+  ItemResourceId int(11) NOT NULL default '0',
+  PrimaryCat tinyint(4) NOT NULL default '0',
+  ItemPrefix varchar(50) NOT NULL default '',
+  Filename varchar(255) NOT NULL default '',
+  UNIQUE KEY CategoryId (CategoryId,ItemResourceId),
+  KEY PrimaryCat (PrimaryCat),
+  KEY ItemPrefix (ItemPrefix),
+  KEY ItemResourceId (ItemResourceId),
+  KEY Filename (Filename)
 );
 
 CREATE TABLE PermCache (