Merge pull request #324 from TrinityCore/master

Update 09.24.24
KamiliaBlow · Sep 24, 2024 · 58557db · 58557db
2 parents 1a80fe3 + d3985a0
commit 58557db
Show file tree

Hide file tree

Showing 67 changed files with 327,796 additions and 32 deletions.
diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake
@@ -40,8 +40,8 @@
 
 // Database updater base information
 #define DATABASE_MYSQL_EXECUTABLE   R"(@MYSQL_EXECUTABLE@)"
-#define DATABASE_FULL_DATABASE      "TDB_full_world_1102.24091_2024_09_03.sql"
-#define DATABASE_HOTFIXES_DATABASE  "TDB_full_hotfixes_1102.24091_2024_09_03.sql"
+#define DATABASE_FULL_DATABASE      "TDB_full_world_1102.24092_2024_09_23.sql"
+#define DATABASE_HOTFIXES_DATABASE  "TDB_full_hotfixes_1102.24092_2024_09_23.sql"
 
 // Windows resource defines
 #define VER_COMPANYNAME_STR         "TrinityCore Developers"

diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
@@ -3236,11 +3236,12 @@ INSERT INTO `updates` VALUES
 ('2024_08_31_00_auth.sql','D10F12D25D526A2C5E12FCEA2DEB55C342879F06','ARCHIVED','2024-08-31 10:32:16',0),
 ('2024_08_31_01_auth.sql','3ADC34DAE405697983EDDD32D0F3FC6F122CA819','ARCHIVED','2024-09-01 15:48:43',0),
 ('2024_09_03_00_auth.sql','BF65B550256CA64F0936D98A619E8A2A7E7A9B59','ARCHIVED','2024-09-03 00:47:42',0),
-('2024_09_05_00_auth.sql','9CD84EB94AE50F14A392C216E7CA7BA33E92376E','RELEASED','2024-09-05 13:38:34',0),
-('2024_09_05_01_auth.sql','42D5E703382C57C4ADD862CF215F1166625100E5','RELEASED','2024-09-05 23:42:10',0),
-('2024_09_11_00_auth.sql','8B810B5EB20D769A50A2D01411BBD065732E4EE6','RELEASED','2024-09-11 12:23:18',0),
-('2024_09_18_00_auth.sql','073B6E954B585CD81BFADD58CDAD166E85D2653A','RELEASED','2024-09-18 10:26:42',0),
-('2024_09_18_01_auth.sql','6AE1437E24D4837EB2347ADAA80A4093CA9F6D67','RELEASED','2024-09-18 21:30:31',0);
+('2024_09_05_00_auth.sql','9CD84EB94AE50F14A392C216E7CA7BA33E92376E','ARCHIVED','2024-09-05 13:38:34',0),
+('2024_09_05_01_auth.sql','42D5E703382C57C4ADD862CF215F1166625100E5','ARCHIVED','2024-09-05 23:42:10',0),
+('2024_09_11_00_auth.sql','8B810B5EB20D769A50A2D01411BBD065732E4EE6','ARCHIVED','2024-09-11 12:23:18',0),
+('2024_09_18_00_auth.sql','073B6E954B585CD81BFADD58CDAD166E85D2653A','ARCHIVED','2024-09-18 10:26:42',0),
+('2024_09_18_01_auth.sql','6AE1437E24D4837EB2347ADAA80A4093CA9F6D67','ARCHIVED','2024-09-18 21:30:31',0),
+('2024_09_23_00_auth.sql','CBAB00B40360D8942AD1E4EDBE0F0097F3F6FC9B','ARCHIVED','2024-09-23 22:48:10',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3384,4 +3385,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 2024-09-03  0:47:44
+-- Dump completed on 2024-09-23 22:48:12
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
@@ -3747,7 +3747,8 @@ INSERT INTO `updates` VALUES
 ('2024_08_04_00_characters.sql','7D153C59998416E6EA1455086730A2321AD0F2A8','ARCHIVED','2024-08-04 17:58:59',0),
 ('2024_08_05_00_characters.sql','7E4AE28F9EC370A1B22DBD8DD718EE027A321F33','ARCHIVED','2024-08-05 11:19:40',0),
 ('2024_08_26_00_characters.sql','68EEBE1D639D59B24F5121008C2D103CA67FFC9A','ARCHIVED','2024-08-26 00:49:08',0),
-('2024_09_03_00_characters.sql','71ECC73A3F324EB64DA19B0CC4DF72A85E022BDC','ARCHIVED','2024-09-03 00:47:42',0);
+('2024_09_03_00_characters.sql','71ECC73A3F324EB64DA19B0CC4DF72A85E022BDC','ARCHIVED','2024-09-03 00:47:42',0),
+('2024_09_23_00_characters.sql','D8491BCEE728F40D55D47E3A4BC5A5F083EBD02E','ARCHIVED','2024-09-23 22:48:10',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3875,4 +3876,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2024-09-03  0:47:44
+-- Dump completed on 2024-09-23 22:48:12
diff --git a/sql/base/dev/hotfixes_database.sql b/sql/base/dev/hotfixes_database.sql
@@ -4672,7 +4672,7 @@ DROP TABLE IF EXISTS `item_bonus_tree_node`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `item_bonus_tree_node` (
   `ID` int unsigned NOT NULL DEFAULT '0',
-  `ItemContext` tinyint unsigned NOT NULL DEFAULT '0',
+  `ItemContext` tinyint NOT NULL DEFAULT '0',
   `ChildItemBonusTreeID` smallint unsigned NOT NULL DEFAULT '0',
   `ChildItemBonusListID` smallint unsigned NOT NULL DEFAULT '0',
   `ChildItemLevelSelectorID` smallint unsigned NOT NULL DEFAULT '0',
@@ -9919,8 +9919,8 @@ DROP TABLE IF EXISTS `trait_sub_tree`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `trait_sub_tree` (
-  `Name` text COLLATE utf8mb4_unicode_ci,
-  `Description` text COLLATE utf8mb4_unicode_ci,
+  `Name` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `Description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `ID` int unsigned NOT NULL DEFAULT '0',
   `UiTextureAtlasElementID` int NOT NULL DEFAULT '0',
   `TraitTreeID` int NOT NULL DEFAULT '0',
@@ -9938,9 +9938,9 @@ DROP TABLE IF EXISTS `trait_sub_tree_locale`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `trait_sub_tree_locale` (
   `ID` int unsigned NOT NULL DEFAULT '0',
-  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `Name_lang` text COLLATE utf8mb4_unicode_ci,
-  `Description_lang` text COLLATE utf8mb4_unicode_ci,
+  `locale` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Name_lang` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `Description_lang` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
@@ -10864,4 +10864,4 @@ CREATE TABLE `world_state_expression` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2024-09-03  0:47:48
+-- Dump completed on 2024-09-23 22:48:16
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
@@ -4983,4 +4983,4 @@ CREATE TABLE `world_state` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2024-09-03  0:47:46
+-- Dump completed on 2024-09-23 22:48:14
diff --git a/...pdates/auth/master/2024_09_03_00_auth.sql → ...h/24091_2024_09_23/2024_09_03_00_auth.sql b/...pdates/auth/master/2024_09_03_00_auth.sql → ...h/24091_2024_09_23/2024_09_03_00_auth.sql
diff --git a/...pdates/auth/master/2024_09_05_00_auth.sql → ...h/24091_2024_09_23/2024_09_05_00_auth.sql b/...pdates/auth/master/2024_09_05_00_auth.sql → ...h/24091_2024_09_23/2024_09_05_00_auth.sql
diff --git a/...pdates/auth/master/2024_09_05_01_auth.sql → ...h/24091_2024_09_23/2024_09_05_01_auth.sql b/...pdates/auth/master/2024_09_05_01_auth.sql → ...h/24091_2024_09_23/2024_09_05_01_auth.sql
diff --git a/...pdates/auth/master/2024_09_11_00_auth.sql → ...h/24091_2024_09_23/2024_09_11_00_auth.sql b/...pdates/auth/master/2024_09_11_00_auth.sql → ...h/24091_2024_09_23/2024_09_11_00_auth.sql
diff --git a/...pdates/auth/master/2024_09_18_00_auth.sql → ...h/24091_2024_09_23/2024_09_18_00_auth.sql b/...pdates/auth/master/2024_09_18_00_auth.sql → ...h/24091_2024_09_23/2024_09_18_00_auth.sql
diff --git a/...pdates/auth/master/2024_09_18_01_auth.sql → ...h/24091_2024_09_23/2024_09_18_01_auth.sql b/...pdates/auth/master/2024_09_18_01_auth.sql → ...h/24091_2024_09_23/2024_09_18_01_auth.sql
diff --git a/...cters/master/2024_09_03_00_characters.sql → ...1_2024_09_23/2024_09_03_00_characters.sql b/...cters/master/2024_09_03_00_characters.sql → ...1_2024_09_23/2024_09_03_00_characters.sql
diff --git a/...otfixes/master/2024_09_03_01_hotfixes.sql → ...091_2024_09_23/2024_09_03_01_hotfixes.sql b/...otfixes/master/2024_09_03_01_hotfixes.sql → ...091_2024_09_23/2024_09_03_01_hotfixes.sql
diff --git a/...otfixes/master/2024_09_22_00_hotfixes.sql → ...091_2024_09_23/2024_09_22_00_hotfixes.sql b/...otfixes/master/2024_09_22_00_hotfixes.sql → ...091_2024_09_23/2024_09_22_00_hotfixes.sql