summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBen Hood <0x6e6562@gmail.com>2008-08-05 12:49:59 +0100
committerBen Hood <0x6e6562@gmail.com>2008-08-05 12:49:59 +0100
commitb6496b33584ead4477ace12558b6f19176e1e999 (patch)
tree490a1850361ef9b42883cd65a3534ea918f9441c /src
parent0762020478b6b4e196d61b2e9bc03abe33cd02a5 (diff)
parentf47df9fad6ae9dd0713b59871942e378116f956e (diff)
downloadrabbitmq-server-git-b6496b33584ead4477ace12558b6f19176e1e999.tar.gz
Merged default into 18994
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_mnesia.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index b1ab3da241..4ae367ba4b 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -240,7 +240,6 @@ init_db(ClusterNodes) ->
ClusterNodes}})
end;
{ok, [_|_]} ->
- ok = ensure_schema_integrity(),
ok = wait_for_tables(),
ok = create_local_table_copies(
case IsDiskNode of
@@ -324,6 +323,7 @@ create_local_table_copy(Tab, Type) ->
ok.
wait_for_tables() ->
+ ok = ensure_schema_integrity(),
case mnesia:wait_for_tables(table_names(), 30000) of
ok -> ok;
{timeout, BadTabs} ->