summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2008-07-28 10:49:26 +0100
committerMatthias Radestock <matthias@lshift.net>2008-07-28 10:49:26 +0100
commit13befdbd5d0ed940a4b5640bbdff3ffff8922230 (patch)
tree73def9bb9a900db23b4d0e8d6804460c15550872
parentd1417acf6ae4253c8656ae417d9ca0fdcd8fbcec (diff)
parent4690fed45284c889258e19aaaa186a6a32143a0a (diff)
downloadrabbitmq-server-git-13befdbd5d0ed940a4b5640bbdff3ffff8922230.tar.gz
merge bug19069 into default
-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 18df11fee1..b8b437b0fb 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -263,7 +263,6 @@ init_db(ClusterNodes) ->
ClusterNodes}})
end;
{ok, [_|_]} ->
- ok = ensure_schema_integrity(),
ok = wait_for_tables(),
ok = create_local_table_copies(
case IsDiskNode of
@@ -347,6 +346,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} ->