diff options
| author | Intel <chemicstry@gmail.com> | 2014-12-07 23:20:52 +0200 |
|---|---|---|
| committer | Intel <chemicstry@gmail.com> | 2014-12-07 23:20:52 +0200 |
| commit | 4825832c85f5ae824c0e099ed5defa516333e00f (patch) | |
| tree | 9c6b12a3646b632c5761a7cfb8cf57fef973f65e /sql/base/auth_database.sql | |
| parent | 4b8493d4b2e492cd4a0cda9719cdad187ec0673b (diff) | |
| parent | 88ca8b95e0e1a31bd561e741da96b582d16c984a (diff) | |
Merge branch '6.x' into Spells
Conflicts:
src/server/game/DataStores/DBCStores.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Server/Protocol/Opcodes.cpp
src/server/scripts/Spells/spell_druid.cpp
Diffstat (limited to 'sql/base/auth_database.sql')
| -rw-r--r-- | sql/base/auth_database.sql | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index 8d71b47fcab..35abaa2611c 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -1,8 +1,8 @@ --- MySQL dump 10.15 Distrib 10.0.13-MariaDB, for Win64 (x86) +-- MySQL dump 10.15 Distrib 10.0.14-MariaDB, for Win64 (x86) -- --- Host: localhost Database: auth_4x +-- Host: localhost Database: auth -- ------------------------------------------------------ --- Server version 10.0.13-MariaDB +-- Server version 10.0.14-MariaDB /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -252,7 +252,7 @@ CREATE TABLE `battlenet_components` ( LOCK TABLES `battlenet_components` WRITE; /*!40000 ALTER TABLE `battlenet_components` DISABLE KEYS */; -INSERT INTO `battlenet_components` VALUES ('Bnet','Mc64',37165),('Bnet','Win',37165),('Bnet','Wn64',37165),('WoW','base',19057),('WoW','deDE',0),('WoW','enGB',0),('WoW','enUS',0),('WoW','esES',0),('WoW','esMX',0),('WoW','frFR',0),('WoW','koKR',0),('WoW','Mc64',19116),('WoW','ruRU',0),('WoW','Win',19116),('WoW','Wn64',19116),('WoW','zhCN',0),('WoW','zhTW',0); +INSERT INTO `battlenet_components` VALUES ('Bnet','Mc64',37165),('Bnet','Win',37165),('Bnet','Wn64',37165),('WoW','base',19057),('WoW','deDE',0),('WoW','enGB',0),('WoW','enUS',0),('WoW','esES',0),('WoW','esMX',0),('WoW','frFR',0),('WoW','koKR',0),('WoW','Mc64',19243),('WoW','ruRU',0),('WoW','Win',19243),('WoW','Wn64',19243),('WoW','zhCN',0),('WoW','zhTW',0); /*!40000 ALTER TABLE `battlenet_components` ENABLE KEYS */; UNLOCK TABLES; @@ -467,7 +467,7 @@ CREATE TABLE `rbac_default_permissions` ( LOCK TABLES `rbac_default_permissions` WRITE; /*!40000 ALTER TABLE `rbac_default_permissions` DISABLE KEYS */; -INSERT INTO `rbac_default_permissions` VALUES (3,192),(2,193),(1,194),(0,195); +INSERT INTO `rbac_default_permissions` VALUES (0,195),(1,194),(2,193),(3,192); /*!40000 ALTER TABLE `rbac_default_permissions` ENABLE KEYS */; UNLOCK TABLES; @@ -620,4 +620,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2014-11-11 0:57:33 +-- Dump completed on 2014-12-05 22:49:59 |