diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-08 20:27:46 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-08 20:27:46 +0100 |
| commit | e8be55aa8b3facd776303a34acf6048f50dcfa51 (patch) | |
| tree | db95abc0bd54a7693025306c3b435d672da00800 /sql/updates/auth | |
| parent | 214d0822ce41fb326a9763ae7507923fdfa659f1 (diff) | |
| parent | 5c15e88da9037af885c40a55aeea581c520148d7 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AI/CoreAI/TotemAI.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Movement/Spline/MoveSplineInit.cpp
src/server/game/Movement/Spline/MovementPacketBuilder.cpp
src/server/game/Movement/Spline/MovementPacketBuilder.h
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
Diffstat (limited to 'sql/updates/auth')
| -rw-r--r-- | sql/updates/auth/2013_11_11_00_auth_logs.sql | 2 | ||||
| -rw-r--r-- | sql/updates/auth/2013_12_01_00_auth_rbac_permissions.sql | 1 | ||||
| -rw-r--r-- | sql/updates/auth/2013_12_01_01_auth_rbac_permissions.sql | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/sql/updates/auth/2013_11_11_00_auth_logs.sql b/sql/updates/auth/2013_11_11_00_auth_logs.sql new file mode 100644 index 00000000000..4e4daa10e4b --- /dev/null +++ b/sql/updates/auth/2013_11_11_00_auth_logs.sql @@ -0,0 +1,2 @@ +ALTER TABLE `logs` CHANGE `type` `type` varchar(250); + diff --git a/sql/updates/auth/2013_12_01_00_auth_rbac_permissions.sql b/sql/updates/auth/2013_12_01_00_auth_rbac_permissions.sql new file mode 100644 index 00000000000..c18e9d62d74 --- /dev/null +++ b/sql/updates/auth/2013_12_01_00_auth_rbac_permissions.sql @@ -0,0 +1 @@ +DELETE FROM `rbac_permissions` WHERE `id`=614; diff --git a/sql/updates/auth/2013_12_01_01_auth_rbac_permissions.sql b/sql/updates/auth/2013_12_01_01_auth_rbac_permissions.sql new file mode 100644 index 00000000000..b07b8a6d6b1 --- /dev/null +++ b/sql/updates/auth/2013_12_01_01_auth_rbac_permissions.sql @@ -0,0 +1 @@ +DELETE FROM `rbac_permissions` WHERE `id` IN (631,632); |