From 118e53f1b84fca238a6f1039471351afa61bd6c4 Mon Sep 17 00:00:00 2001
From: treeston <treeston.mmoc@gmail.com>
Date: Wed, 28 Jun 2017 17:25:49 +0200
Subject: Combat/threat rewrite prep - merge RBAC/DB changes.

(cherry picked from commit e35092c6a164e929f9684b350093b2beefee5d86)
---
 sql/base/auth_database.sql | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'sql/base/auth_database.sql')

diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 65a8d7b95d9..2f4949daa8f 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1579,7 +1579,7 @@ INSERT INTO `rbac_permissions` VALUES
 (304,'Command: debug bg'),
 (305,'Command: debug entervehicle'),
 (306,'Command: debug getitemstate'),
-(309,'Command: debug hostil'),
+(309,'Command: debug combat'),
 (310,'Command: debug itemexpire'),
 (311,'Command: debug lootrecipient'),
 (312,'Command: debug los'),
@@ -2301,7 +2301,8 @@ INSERT INTO `updates` VALUES
 ('2017_06_15_00_auth.sql','DD71F25C1E61FD5F836931B02703BE3BD1B4F156','ARCHIVED','2017-06-15 15:20:50',0),
 ('2017_06_18_00_auth.sql','7200968BFC2D76499149937B19F2153FD2ABC397','ARCHIVED','2017-06-18 22:13:37',0),
 ('2017_06_25_00_auth.sql','A2DA6A64D4217992EF766915DEBD517DB0834E01','ARCHIVED','2017-06-25 00:54:10',0),
-('2017_06_28_00_auth.sql','6E58300D4D4DAAEE89107ECB3CB7DA8529DA738F','ARCHIVED','2017-06-28 19:11:09',0),
+('2017_06_28_00_auth_master.sql','6E58300D4D4DAAEE89107ECB3CB7DA8529DA738F','ARCHIVED','2017-06-28 19:11:09',0),
+('2017_06_28_00_auth_rbac.sql','D32EF80F57F629C23395D80F06E91D7E40719F83','ARCHIVED','2017-06-28 00:00:00',0),
 ('2017_06_30_00_auth.sql','C73BD277D211DBE1BB86BB1B443CA8F292D8ADEE','ARCHIVED','2017-06-30 16:18:51',0),
 ('2017_08_04_00_auth.sql','2E994A704C64FECE3CE0883ED0CAC5E5A0E3A36C','ARCHIVED','2017-08-04 23:46:32',0),
 ('2017_08_13_00_auth_2016_09_22_00_auth.sql','70047954E3556BFA430ADD5680EF8797F74A4B9E','ARCHIVED','2017-08-13 12:00:00',0),
-- 
cgit v1.2.3

