1 files changed, 7 insertions, 12 deletions
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 673e4cd75..36cd2539b 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -644,7 +644,6 @@ CREATE TABLE IF NOT EXISTS `item` (
   `item_pending_remove` tinyint(1) NOT NULL DEFAULT 0 ,
   `item_blocked` tinyint(1) NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`id`),
-  KEY `uid` (`uid`),
   KEY `parent` (`parent`),
   KEY `created` (`created`),
   KEY `edited` (`edited`),
@@ -652,6 +651,12 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `uid_commented` (`uid`, `commented`),
   KEY `uid_created` (`uid`, `created`),
   KEY `uid_item_unseen` (`uid`, `item_unseen`),
+  KEY `uid_item_type` (`uid`, `item_type`),
+  KEY `uid_item_thread_top` (`uid`, `item_thread_top`),
+  KEY `uid_item_blocked` (`uid`, `item_blocked`),
+  KEY `uid_item_wall` (`uid`, `item_wall`),
+  KEY `uid_item_starred` (`uid`, `item_starred`),
+  KEY `uid_item_retained` (`uid`, `item_retained`),
   KEY `aid` (`aid`),
   KEY `owner_xchan` (`owner_xchan`),
   KEY `author_xchan` (`author_xchan`),
@@ -677,10 +682,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `changed` (`changed`),
   KEY `item_origin` (`item_origin`),
   KEY `item_unseen` (`item_unseen`),
-  KEY `item_starred` (`item_starred`),
   KEY `item_uplink` (`item_uplink`),
-  KEY `item_wall` (`item_wall`),
-  KEY `item_thread_top` (`item_thread_top`),
   KEY `item_notshown` (`item_notshown`),
   KEY `item_nsfw` (`item_nsfw`),
   KEY `item_relay` (`item_relay`),
@@ -688,16 +690,9 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `item_nocomment` (`item_nocomment`),
   KEY `item_obscured` (`item_obscured`),
   KEY `item_verified` (`item_verified`),
-  KEY `item_retained` (`item_retained`),
   KEY `item_rss` (`item_rss`),
-  KEY `item_deleted` (`item_deleted`),
-  KEY `item_type` (`item_type`),
-  KEY `item_hidden` (`item_hidden`),
   KEY `item_consensus` (`item_consensus`),
-  KEY `item_unpublished` (`item_unpublished`),
-  KEY `item_delayed` (`item_delayed`),
-  KEY `item_pending_remove` (`item_pending_remove`),
-  KEY `item_blocked` (`item_blocked`)
+  KEY `item_deleted_pending_remove_changed` (`item_deleted`, `item_pending_remove`, `changed`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `item_id` (