merge v1_5 into default

1 files changed, 46 insertions, 29 deletions

diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 0c573073..575ecb0a 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -101,33 +101,50 @@ force_reset() -> reset(true).
 %%--------------------------------------------------------------------
 
 table_definitions() ->
-    [{user, [{disc_copies, [node()]},
-             {attributes, record_info(fields, user)}]},
-     {user_vhost, [{type, bag},
-                   {disc_copies, [node()]},
-                   {attributes, record_info(fields, user_vhost)},
-                   {index, [virtual_host]}]},
-     {vhost, [{disc_copies, [node()]},
-              {attributes, record_info(fields, vhost)}]},
-     {rabbit_config, [{disc_copies, [node()]}]},
-     {listener, [{type, bag},
-                 {attributes, record_info(fields, listener)}]},
-     {durable_routes, [{disc_copies, [node()]},
-                       {record_name, route},
-                       {attributes, record_info(fields, route)}]},
-     {route, [{type, ordered_set},
-              {attributes, record_info(fields, route)}]},
-     {reverse_route, [{type, ordered_set}, 
-                      {attributes, record_info(fields, reverse_route)}]},
-     {durable_exchanges, [{disc_copies, [node()]},
-                          {record_name, exchange},
-                          {attributes, record_info(fields, exchange)}]},
-     {exchange, [{attributes, record_info(fields, exchange)}]},
-     {durable_queues, [{disc_copies, [node()]},
-                       {record_name, amqqueue},
-                       {attributes, record_info(fields, amqqueue)}]},
-     {amqqueue, [{attributes, record_info(fields, amqqueue)},
-                 {index, [pid]}]}].
+    [{rabbit_user,
+      [{record_name, user},
+       {attributes, record_info(fields, user)},
+       {disc_copies, [node()]}]},
+     {rabbit_user_permission,
+      [{record_name, user_permission},
+       {attributes, record_info(fields, user_permission)},
+       {disc_copies, [node()]}]},
+     {rabbit_vhost,
+      [{record_name, vhost},
+       {attributes, record_info(fields, vhost)},
+       {disc_copies, [node()]}]},
+     {rabbit_config,
+      [{disc_copies, [node()]}]},
+     {rabbit_listener,
+      [{record_name, listener},
+       {attributes, record_info(fields, listener)},
+       {type, bag}]},
+     {rabbit_durable_route,
+      [{record_name, route},
+       {attributes, record_info(fields, route)},
+       {disc_copies, [node()]}]},
+     {rabbit_route,
+      [{record_name, route},
+       {attributes, record_info(fields, route)},
+       {type, ordered_set}]},
+     {rabbit_reverse_route,
+      [{record_name, reverse_route},
+       {attributes, record_info(fields, reverse_route)},
+       {type, ordered_set}]},
+     {rabbit_durable_exchange,
+      [{record_name, exchange},
+       {attributes, record_info(fields, exchange)},
+       {disc_copies, [node()]}]},
+     {rabbit_exchange,
+      [{record_name, exchange},
+       {attributes, record_info(fields, exchange)}]},
+     {rabbit_durable_queue,
+      [{record_name, amqqueue},
+       {attributes, record_info(fields, amqqueue)},
+       {disc_copies, [node()]}]},
+     {rabbit_queue,
+      [{record_name, amqqueue},
+       {attributes, record_info(fields, amqqueue)}]}].
 
 table_names() ->
     [Tab || {Tab, _} <- table_definitions()].
@@ -246,8 +263,8 @@ init_db(ClusterNodes) ->
                             %% NB: we cannot use rabbit_log here since
                             %% it may not have been started yet
                             error_logger:warning_msg(
-                              "schema integrity check failed: ~p~n" ++
-                              "moving database to backup location " ++
+                              "schema integrity check failed: ~p~n"
+                              "moving database to backup location "
                               "and recreating schema from scratch~n",
                               [Reason]),
                             ok = move_db(),