Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
	lib/util.php

1 files changed, 9 insertions, 0 deletions

diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index 197fcabfd..004c77b36 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -48,3 +48,12 @@ create table login_token (
     constraint primary key (user_id)
 );
 
+alter table fave
+    drop index fave_user_id_idx,
+    add index fave_user_id_idx using btree(user_id,modified);
+
+alter table subscription
+    drop index subscription_subscriber_idx,
+    add index subscription_subscriber_idx using btree(subscriber,created),
+    drop index subscription_subscribed_idx,
+    add index subscription_subscribed_idx using btree(subscribed,created);