Merge r1864 from trunk:

* src/mod_pubsub/mod_pubsub.erl: The table pubsub_node in ejabberd
older than 2.0.2 had indexes for parentid and type. This is not
required since ejabberd 2.0.2, so those indexes can be
deleted. (EJAB-669)

SVN Revision: 1902

diff --git a/ChangeLog b/ChangeLog
index 742e3293009027efa7cd7e7d9517ef985b537493..0e33f88290f556d4a62cbfe0b55966d5b77a9604 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-02-21  Badlop  <badlop@process-one.net>
 
+       * src/mod_pubsub/mod_pubsub.erl: The table pubsub_node in ejabberd
+       older than 2.0.2 had indexes for parentid and type. This is not
+       required since ejabberd 2.0.2, so those indexes can be
+       deleted. (EJAB-669)
+
        * doc/Makefile: In Clean do not remove html. In new Distclean,
        remove also html.
 

diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 21286dd37d9e4ab225649991a5b19f0772ce4850..0721ae65ff7bc94531f14c932b73ee9b65c23e11 100644 (file)
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -235,6 +235,8 @@ init_nodes(Host, ServerHost, ServedHosts) ->
     ok.
 
 update_database(Host) ->
+    mnesia:del_table_index(pubsub_node, type),
+    mnesia:del_table_index(pubsub_node, parentid),
     case catch mnesia:table_info(pubsub_node, attributes) of
        [host_node, host_parent, info] ->
            ?INFO_MSG("upgrade pubsub tables",[]),