aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2011-08-29 12:36:49 +0200
committerBadlop <badlop@process-one.net>2011-08-29 12:38:42 +0200
commitdbe71153dc7a64df535b1b25ac397d5133d5e0f0 (patch)
tree257aa328918693d87a64ea1aa687e473bb6a4f9d /src
parentAllow multiple entry with same nick to MUC rooms (thanks to Magnus Henoch)(EJ... (diff)
Explicitly skip useless ejabberd 2.0* mnesia tables when restoring backup
Reference: http://www.ejabberd.im/node/4867
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_admin.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl
index 8cbbe2765..5d21b124b 100644
--- a/src/ejabberd_admin.erl
+++ b/src/ejabberd_admin.erl
@@ -446,8 +446,12 @@ restore_mnesia(Path) ->
%% mod_configure/adhoc
restore(Path) ->
mnesia:restore(Path, [{keep_tables,keep_tables()},
+ {skip_tables, skip_tables()},
{default_op, skip_tables}]).
+skip_tables() ->
+ [disco_publish,user_caps,user_caps_resources].
+
%% This function return a list of tables that should be kept from a previous
%% version backup.
%% Obsolete tables or tables created by module who are no longer used are not