diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake index 4a1c531fcc9..1971ad97ed8 100644 --- a/revision_data.h.in.cmake +++ b/revision_data.h.in.cmake @@ -9,7 +9,7 @@ #define _SOURCE_DIRECTORY R"(@CMAKE_SOURCE_DIR@)" #define _BUILD_DIRECTORY R"(@BUILDDIR@)" #define _MYSQL_EXECUTABLE R"(@MYSQL_EXECUTABLE@)" - #define _FULL_DATABASE "TDB_full_world_335.23061_2023_06_14.sql" + #define _FULL_DATABASE "TDB_full_world_335.24011_2024_01_21.sql" #define VER_COMPANYNAME_STR "TrinityCore Developers" #define VER_LEGALCOPYRIGHT_STR "(c)2008-@rev_year@ TrinityCore" #define VER_FILEVERSION 0,0,0 diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index 37a193899f9..0482d715ac8 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -1,13 +1,13 @@ --- MySQL dump 10.13 Distrib 8.0.33, for Linux (x86_64) +-- MySQL dump 10.13 Distrib 8.0.35, for Linux (x86_64) -- -- Host: localhost Database: auth -- ------------------------------------------------------ --- Server version 8.0.33-0ubuntu0.20.04.2 +-- Server version 8.0.35-0ubuntu0.20.04.1 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!50503 SET NAMES utf8 */; +/*!50503 SET NAMES utf8mb4 */; /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; /*!40103 SET TIME_ZONE='+00:00' */; /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; @@ -2018,11 +2018,12 @@ INSERT INTO `updates` VALUES ('2023_02_05_01_auth.sql','336E62A8850A3E78A1D0BD3E81FFD5769184BDF8','ARCHIVED','2023-02-05 15:58:32',0), ('2023_05_05_00_auth.sql','DEEB1D5533658E3479FC3C988EF4B9816C511BC3','ARCHIVED','2023-05-07 11:52:00',0), ('2023_06_14_00_auth.sql','BB8A7EB214F4F3632C4F54EA596CB7C8FBA305D5','ARCHIVED','2023-06-14 19:34:24',0), -('2023_11_21_00_auth.sql','146E5E6EF94C5DB78343372A8FDB32B062B80040','RELEASED','2023-11-21 11:24:11',0), -('2024_01_06_00_auth.sql','767D697594D5471B67CC0FDF0D7BB15374116A71','RELEASED','2024-01-06 09:53:51',0), -('2024_01_06_01_auth.sql','3D9E0A906A357877DB8E7B72E0797AB38EF884BC','RELEASED','2024-01-06 11:33:07',0), -('2024_01_06_02_auth.sql','B14F889C198A4F640A968BAB8A4C262AC61634C7','RELEASED','2024-01-06 12:43:47',0), -('2024_01_06_03_auth.sql','693BFD4326314659BAD9A2C70D9526FF4625B393','RELEASED','2024-01-06 12:55:07',0); +('2023_11_21_00_auth.sql','146E5E6EF94C5DB78343372A8FDB32B062B80040','ARCHIVED','2023-11-21 11:24:11',0), +('2024_01_06_00_auth.sql','767D697594D5471B67CC0FDF0D7BB15374116A71','ARCHIVED','2024-01-06 09:53:51',0), +('2024_01_06_01_auth.sql','3D9E0A906A357877DB8E7B72E0797AB38EF884BC','ARCHIVED','2024-01-06 11:33:07',0), +('2024_01_06_02_auth.sql','B14F889C198A4F640A968BAB8A4C262AC61634C7','ARCHIVED','2024-01-06 12:43:47',0), +('2024_01_06_03_auth.sql','693BFD4326314659BAD9A2C70D9526FF4625B393','ARCHIVED','2024-01-06 12:55:07',0), +('2024_01_21_00_auth.sql','B45B95D7B608D6ACF1BCBA656718C7DEED8CFF00','ARCHIVED','2024-01-21 11:38:22',0); /*!40000 ALTER TABLE `updates` ENABLE KEYS */; UNLOCK TABLES; @@ -2087,7 +2088,7 @@ DROP TABLE IF EXISTS `vw_log_history`; /*!50001 DROP VIEW IF EXISTS `vw_log_history`*/; SET @saved_cs_client = @@character_set_client; /*!50503 SET character_set_client = utf8mb4 */; -/*!50001 CREATE VIEW `vw_log_history` AS SELECT +/*!50001 CREATE VIEW `vw_log_history` AS SELECT 1 AS `First Logged`, 1 AS `Last Logged`, 1 AS `Occurrences`, @@ -2105,7 +2106,7 @@ DROP TABLE IF EXISTS `vw_rbac`; /*!50001 DROP VIEW IF EXISTS `vw_rbac`*/; SET @saved_cs_client = @@character_set_client; /*!50503 SET character_set_client = utf8mb4 */; -/*!50001 CREATE VIEW `vw_rbac` AS SELECT +/*!50001 CREATE VIEW `vw_rbac` AS SELECT 1 AS `Permission ID`, 1 AS `Permission Group`, 1 AS `Security Level`, @@ -2161,4 +2162,4 @@ SET character_set_client = @saved_cs_client; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2023-06-14 19:34:37 +-- Dump completed on 2024-01-21 11:38:23 diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index 42411ef0c95..5ad3440ed67 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -1,13 +1,13 @@ --- MySQL dump 10.13 Distrib 8.0.33, for Linux (x86_64) +-- MySQL dump 10.13 Distrib 8.0.35, for Linux (x86_64) -- -- Host: localhost Database: characters -- ------------------------------------------------------ --- Server version 8.0.33-0ubuntu0.20.04.2 +-- Server version 8.0.35-0ubuntu0.20.04.1 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!50503 SET NAMES utf8 */; +/*!50503 SET NAMES utf8mb4 */; /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; /*!40103 SET TIME_ZONE='+00:00' */; /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; @@ -2682,7 +2682,8 @@ INSERT INTO `updates` VALUES ('2023_02_05_01_characters.sql','336E62A8850A3E78A1D0BD3E81FFD5769184BDF8','ARCHIVED','2023-02-05 15:58:32',0), ('2023_05_19_00_characters.sql','5E0C9338554BAA481566EDFF3FE2FCEFF1B67DA9','ARCHIVED','2023-05-19 18:40:42',0), ('2023_06_14_00_characters.sql','0595B21DCFC0A04F2D8DF1F7BC018C758895DBE5','ARCHIVED','2023-06-14 19:34:24',0), -('2023_09_10_00_characters.sql','5DE09CA31B5168CF3622CB462816B6C598893D96','RELEASED','2023-09-10 12:23:34',0); +('2023_09_10_00_characters.sql','5DE09CA31B5168CF3622CB462816B6C598893D96','ARCHIVED','2023-09-10 12:23:34',0), +('2024_01_21_00_characters.sql','4D27D8DAC9F78795DB6938B54F32502EF8D8AAE6','ARCHIVED','2024-01-21 11:38:22',0); /*!40000 ALTER TABLE `updates` ENABLE KEYS */; UNLOCK TABLES; @@ -2853,4 +2854,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2023-06-14 19:34:37 +-- Dump completed on 2024-01-21 11:38:24 diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql index 15f9e206042..739d6d19126 100644 --- a/sql/base/dev/world_database.sql +++ b/sql/base/dev/world_database.sql @@ -1,13 +1,13 @@ --- MySQL dump 10.13 Distrib 8.0.33, for Linux (x86_64) +-- MySQL dump 10.13 Distrib 8.0.35, for Linux (x86_64) -- -- Host: localhost Database: world -- ------------------------------------------------------ --- Server version 8.0.33-0ubuntu0.20.04.2 +-- Server version 8.0.35-0ubuntu0.20.04.1 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!50503 SET NAMES utf8 */; +/*!50503 SET NAMES utf8mb4 */; /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; /*!40103 SET TIME_ZONE='+00:00' */; /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; @@ -4067,4 +4067,4 @@ CREATE TABLE `waypoints` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2023-06-14 19:34:39 +-- Dump completed on 2024-01-21 11:38:25 diff --git a/sql/updates/auth/3.3.5/2023_06_14_00_auth.sql b/sql/old/3.3.5a/auth/23061_2024_01_21/2023_06_14_00_auth.sql similarity index 100% rename from sql/updates/auth/3.3.5/2023_06_14_00_auth.sql rename to sql/old/3.3.5a/auth/23061_2024_01_21/2023_06_14_00_auth.sql diff --git a/sql/updates/auth/3.3.5/2023_11_21_00_auth.sql b/sql/old/3.3.5a/auth/23061_2024_01_21/2023_11_21_00_auth.sql similarity index 100% rename from sql/updates/auth/3.3.5/2023_11_21_00_auth.sql rename to sql/old/3.3.5a/auth/23061_2024_01_21/2023_11_21_00_auth.sql diff --git a/sql/updates/auth/3.3.5/2024_01_06_00_auth.sql b/sql/old/3.3.5a/auth/23061_2024_01_21/2024_01_06_00_auth.sql similarity index 100% rename from sql/updates/auth/3.3.5/2024_01_06_00_auth.sql rename to sql/old/3.3.5a/auth/23061_2024_01_21/2024_01_06_00_auth.sql diff --git a/sql/updates/auth/3.3.5/2024_01_06_01_auth.sql b/sql/old/3.3.5a/auth/23061_2024_01_21/2024_01_06_01_auth.sql similarity index 100% rename from sql/updates/auth/3.3.5/2024_01_06_01_auth.sql rename to sql/old/3.3.5a/auth/23061_2024_01_21/2024_01_06_01_auth.sql diff --git a/sql/updates/auth/3.3.5/2024_01_06_02_auth.sql b/sql/old/3.3.5a/auth/23061_2024_01_21/2024_01_06_02_auth.sql similarity index 100% rename from sql/updates/auth/3.3.5/2024_01_06_02_auth.sql rename to sql/old/3.3.5a/auth/23061_2024_01_21/2024_01_06_02_auth.sql diff --git a/sql/updates/auth/3.3.5/2024_01_06_03_auth.sql b/sql/old/3.3.5a/auth/23061_2024_01_21/2024_01_06_03_auth.sql similarity index 100% rename from sql/updates/auth/3.3.5/2024_01_06_03_auth.sql rename to sql/old/3.3.5a/auth/23061_2024_01_21/2024_01_06_03_auth.sql diff --git a/sql/updates/characters/3.3.5/2023_05_19_00_characters.sql b/sql/old/3.3.5a/characters/23061_2024_01_21/2023_05_19_00_characters.sql similarity index 100% rename from sql/updates/characters/3.3.5/2023_05_19_00_characters.sql rename to sql/old/3.3.5a/characters/23061_2024_01_21/2023_05_19_00_characters.sql diff --git a/sql/updates/characters/3.3.5/2023_06_14_00_characters.sql b/sql/old/3.3.5a/characters/23061_2024_01_21/2023_06_14_00_characters.sql similarity index 100% rename from sql/updates/characters/3.3.5/2023_06_14_00_characters.sql rename to sql/old/3.3.5a/characters/23061_2024_01_21/2023_06_14_00_characters.sql diff --git a/sql/updates/characters/3.3.5/2023_09_10_00_characters.sql b/sql/old/3.3.5a/characters/23061_2024_01_21/2023_09_10_00_characters.sql similarity index 100% rename from sql/updates/characters/3.3.5/2023_09_10_00_characters.sql rename to sql/old/3.3.5a/characters/23061_2024_01_21/2023_09_10_00_characters.sql diff --git a/sql/updates/world/3.3.5/2023_06_14_00_world.sql b/sql/old/3.3.5a/world/23061_2024_01_21/2023_06_14_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2023_06_14_00_world.sql rename to sql/old/3.3.5a/world/23061_2024_01_21/2023_06_14_00_world.sql diff --git a/sql/updates/world/3.3.5/2023_06_21_00_world.sql b/sql/old/3.3.5a/world/23061_2024_01_21/2023_06_21_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2023_06_21_00_world.sql rename to sql/old/3.3.5a/world/23061_2024_01_21/2023_06_21_00_world.sql diff --git a/sql/updates/world/3.3.5/2023_08_15_00_world_2023_05_13_00_world.sql b/sql/old/3.3.5a/world/23061_2024_01_21/2023_08_15_00_world_2023_05_13_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2023_08_15_00_world_2023_05_13_00_world.sql rename to sql/old/3.3.5a/world/23061_2024_01_21/2023_08_15_00_world_2023_05_13_00_world.sql diff --git a/sql/updates/world/3.3.5/2023_09_10_00_world.sql b/sql/old/3.3.5a/world/23061_2024_01_21/2023_09_10_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2023_09_10_00_world.sql rename to sql/old/3.3.5a/world/23061_2024_01_21/2023_09_10_00_world.sql diff --git a/sql/updates/world/3.3.5/2023_09_10_01_world.sql b/sql/old/3.3.5a/world/23061_2024_01_21/2023_09_10_01_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2023_09_10_01_world.sql rename to sql/old/3.3.5a/world/23061_2024_01_21/2023_09_10_01_world.sql diff --git a/sql/updates/world/3.3.5/2023_11_11_00_world.sql b/sql/old/3.3.5a/world/23061_2024_01_21/2023_11_11_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2023_11_11_00_world.sql rename to sql/old/3.3.5a/world/23061_2024_01_21/2023_11_11_00_world.sql diff --git a/sql/updates/world/3.3.5/2023_11_29_00_world.sql b/sql/old/3.3.5a/world/23061_2024_01_21/2023_11_29_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2023_11_29_00_world.sql rename to sql/old/3.3.5a/world/23061_2024_01_21/2023_11_29_00_world.sql diff --git a/sql/updates/world/3.3.5/2023_11_30_00_world.sql b/sql/old/3.3.5a/world/23061_2024_01_21/2023_11_30_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2023_11_30_00_world.sql rename to sql/old/3.3.5a/world/23061_2024_01_21/2023_11_30_00_world.sql diff --git a/sql/updates/world/3.3.5/2023_12_03_00_world.sql b/sql/old/3.3.5a/world/23061_2024_01_21/2023_12_03_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2023_12_03_00_world.sql rename to sql/old/3.3.5a/world/23061_2024_01_21/2023_12_03_00_world.sql diff --git a/sql/updates/world/3.3.5/2024_01_06_00_world.sql b/sql/old/3.3.5a/world/23061_2024_01_21/2024_01_06_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2024_01_06_00_world.sql rename to sql/old/3.3.5a/world/23061_2024_01_21/2024_01_06_00_world.sql diff --git a/sql/updates/world/3.3.5/2024_01_08_00_world.sql b/sql/old/3.3.5a/world/23061_2024_01_21/2024_01_08_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2024_01_08_00_world.sql rename to sql/old/3.3.5a/world/23061_2024_01_21/2024_01_08_00_world.sql diff --git a/sql/updates/world/3.3.5/2024_01_13_00_world.sql b/sql/old/3.3.5a/world/23061_2024_01_21/2024_01_13_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2024_01_13_00_world.sql rename to sql/old/3.3.5a/world/23061_2024_01_21/2024_01_13_00_world.sql diff --git a/sql/old/3.3.5a/world/23061_2024_01_21/2024_01_20_00_world.sql b/sql/old/3.3.5a/world/23061_2024_01_21/2024_01_20_00_world.sql new file mode 100644 index 00000000000..8ea65df590f --- /dev/null +++ b/sql/old/3.3.5a/world/23061_2024_01_21/2024_01_20_00_world.sql @@ -0,0 +1,4 @@ +-- Delete two cata texts from db +DELETE FROM `npc_text` WHERE `ID` IN (18268,17425); +DELETE FROM `broadcast_text` WHERE `ID` IN (52965,48369); +DELETE FROM `broadcast_text_locale` WHERE `ID` IN (52965,48369); diff --git a/sql/updates/auth/3.3.5/2024_01_21_00_auth.sql b/sql/updates/auth/3.3.5/2024_01_21_00_auth.sql new file mode 100644 index 00000000000..3f9344918bf --- /dev/null +++ b/sql/updates/auth/3.3.5/2024_01_21_00_auth.sql @@ -0,0 +1,2 @@ +-- TDB 335.24011 auth +UPDATE `updates` SET `state`='ARCHIVED'; diff --git a/sql/updates/characters/3.3.5/2024_01_21_00_characters.sql b/sql/updates/characters/3.3.5/2024_01_21_00_characters.sql new file mode 100644 index 00000000000..12285238d73 --- /dev/null +++ b/sql/updates/characters/3.3.5/2024_01_21_00_characters.sql @@ -0,0 +1,2 @@ +-- TDB 335.24011 characters +UPDATE `updates` SET `state`='ARCHIVED'; diff --git a/sql/updates/world/3.3.5/2024_01_21_00_world.sql b/sql/updates/world/3.3.5/2024_01_21_00_world.sql new file mode 100644 index 00000000000..0735c4ab383 --- /dev/null +++ b/sql/updates/world/3.3.5/2024_01_21_00_world.sql @@ -0,0 +1,3 @@ +-- TDB 335.24011 world +UPDATE `version` SET `db_version`='TDB 335.24011', `cache_id`=24011 LIMIT 1; +UPDATE `updates` SET `state`='ARCHIVED';