Skip to content

Commit 2df6a7a

Browse files
author
Github Actions
committed
Merge 3.3.5 to 3.3.5-skip-dk
2 parents f8fb085 + 31f5866 commit 2df6a7a

File tree

112 files changed

+269
-390
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+269
-390
lines changed

‎revision_data.h.in.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define _SOURCE_DIRECTORY R"(@CMAKE_SOURCE_DIR@)"
1010
#define _BUILD_DIRECTORY R"(@BUILDDIR@)"
1111
#define _MYSQL_EXECUTABLE R"(@MYSQL_EXECUTABLE@)"
12-
#define _FULL_DATABASE "TDB_full_world_335.24081_2024_08_17.sql"
12+
#define _FULL_DATABASE "TDB_full_world_335.24111_2024_11_22.sql"
1313
#define VER_COMPANYNAME_STR "TrinityCore Developers"
1414
#define VER_LEGALCOPYRIGHT_STR "(c)2008-@rev_year@ TrinityCore"
1515
#define VER_FILEVERSION 0,0,0

‎sql/base/auth_database.sql‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
-- MySQL dump 10.13 Distrib 8.0.39, for Linux (x86_64)
1+
-- MySQL dump 10.13 Distrib 8.0.40, for Linux (x86_64)
22
--
33
-- Host: localhost Database: auth
44
-- ------------------------------------------------------
5-
-- Server version 8.0.39-0ubuntu0.22.04.1
5+
-- Server version 8.0.40-0ubuntu0.22.04.1
66

77
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
88
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2528,9 +2528,10 @@ INSERT INTO `updates` VALUES
25282528
('2024_01_21_00_auth.sql','B45B95D7B608D6ACF1BCBA656718C7DEED8CFF00','ARCHIVED','2024-01-21 11:38:22',0),
25292529
('2024_04_10_00_auth.sql','CE8BD4D6DF6DE85DBF892507B1B18B746FE4A71D','ARCHIVED','2024-04-10 16:07:02',0),
25302530
('2024_08_17_00_auth.sql','B6D7D00D5573958EE84321B029D869C52793F924','ARCHIVED','2024-08-17 22:26:12',0),
2531-
('2024_08_28_01_auth.sql','BC5D74553AF2D92606F55C1C462D2700FE73BD34','RELEASED','2024-08-28 14:55:05',0),
2532-
('2024_08_30_00_auth.sql','BD76942F1C29AAA2450E051E7CA552672B5E331B','RELEASED','2024-08-30 19:24:30',0),
2533-
('2024_09_26_00_auth.sql','E37C3997FD7851EA360774AC568912846C448272','RELEASED','2024-09-26 18:27:26',0);
2531+
('2024_08_28_01_auth.sql','BC5D74553AF2D92606F55C1C462D2700FE73BD34','ARCHIVED','2024-08-28 14:55:05',0),
2532+
('2024_08_30_00_auth.sql','BD76942F1C29AAA2450E051E7CA552672B5E331B','ARCHIVED','2024-08-30 19:24:30',0),
2533+
('2024_09_26_00_auth.sql','E37C3997FD7851EA360774AC568912846C448272','ARCHIVED','2024-09-26 18:27:26',0),
2534+
('2024_11_22_00_auth.sql','F2C1D1572A3968E9E9D778EF7DC82778DF3EF887','ARCHIVED','2024-11-22 23:18:14',0);
25342535
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
25352536
UNLOCK TABLES;
25362537

@@ -2669,4 +2670,4 @@ SET character_set_client = @saved_cs_client;
26692670
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
26702671
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
26712672

2672-
-- Dump completed on 2024-08-17 22:26:14
2673+
-- Dump completed on 2024-11-22 23:18:17

‎sql/base/characters_database.sql‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
-- MySQL dump 10.13 Distrib 8.0.39, for Linux (x86_64)
1+
-- MySQL dump 10.13 Distrib 8.0.40, for Linux (x86_64)
22
--
33
-- Host: localhost Database: characters
44
-- ------------------------------------------------------
5-
-- Server version 8.0.39-0ubuntu0.22.04.1
5+
-- Server version 8.0.40-0ubuntu0.22.04.1
66

77
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
88
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2687,7 +2687,8 @@ INSERT INTO `updates` VALUES
26872687
('2024_02_05_00_characters.sql','1777CBCA822AD85777DA4A390DF7AAF41AF68EBD','ARCHIVED','2024-02-05 12:17:19',0),
26882688
('2024_04_10_00_characters.sql','E0D6E19ACE6759332402FA27C23B0F7745C49742','ARCHIVED','2024-04-10 16:07:02',0),
26892689
('2024_08_17_00_characters.sql','08705FBCB8504E8B1009FDAF955F56D734FAD782','ARCHIVED','2024-08-17 22:26:12',0),
2690-
('2024_10_03_00_characters.sql','408249A6992999A36EB94089D184972E8E0767A3','RELEASED','2024-10-03 11:10:18',0);
2690+
('2024_10_03_00_characters.sql','408249A6992999A36EB94089D184972E8E0767A3','ARCHIVED','2024-10-03 11:10:18',0),
2691+
('2024_11_22_00_characters.sql','9EA2A4F88036D1D5F47EE8A6B634D52D0014986E','ARCHIVED','2024-11-22 23:18:14',0);
26912692
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
26922693
UNLOCK TABLES;
26932694

@@ -2858,4 +2859,4 @@ UNLOCK TABLES;
28582859
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
28592860
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
28602861

2861-
-- Dump completed on 2024-08-17 22:26:14
2862+
-- Dump completed on 2024-11-22 23:18:18

‎sql/base/dev/world_database.sql‎

Lines changed: 10 additions & 6 deletions
Large diffs are not rendered by default.

‎sql/updates/auth/3.3.5/2024_08_17_00_auth.sql‎ renamed to ‎sql/old/3.3.5a/auth/24081_2024_11_22/2024_08_17_00_auth.sql‎

File renamed without changes.

‎sql/updates/auth/3.3.5/2024_08_28_01_auth.sql‎ renamed to ‎sql/old/3.3.5a/auth/24081_2024_11_22/2024_08_28_01_auth.sql‎

File renamed without changes.

‎sql/updates/auth/3.3.5/2024_08_30_00_auth.sql‎ renamed to ‎sql/old/3.3.5a/auth/24081_2024_11_22/2024_08_30_00_auth.sql‎

File renamed without changes.

‎sql/updates/auth/3.3.5/2024_09_26_00_auth.sql‎ renamed to ‎sql/old/3.3.5a/auth/24081_2024_11_22/2024_09_26_00_auth.sql‎

File renamed without changes.

‎sql/updates/characters/3.3.5/2024_08_17_00_characters.sql‎ renamed to ‎sql/old/3.3.5a/characters/24081_2024_11_22/2024_08_17_00_characters.sql‎

File renamed without changes.

‎sql/updates/characters/3.3.5/2024_10_03_00_characters.sql‎ renamed to ‎sql/old/3.3.5a/characters/24081_2024_11_22/2024_10_03_00_characters.sql‎

File renamed without changes.

0 commit comments

Comments
 (0)