Skip to content

Commit

Permalink
Merge TrinityCore 3.3.5 to ElunaTrinityWotlk [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
Rochet2 committed Nov 23, 2024
2 parents 784493e + c354f25 commit daa3309
Show file tree
Hide file tree
Showing 86 changed files with 30 additions and 17 deletions.
2 changes: 1 addition & 1 deletion revision_data.h.in.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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.24081_2024_08_17.sql"
#define _FULL_DATABASE "TDB_full_world_335.24111_2024_11_22.sql"
#define VER_COMPANYNAME_STR "TrinityCore Developers"
#define VER_LEGALCOPYRIGHT_STR "(c)2008-@rev_year@ TrinityCore"
#define VER_FILEVERSION 0,0,0
Expand Down
13 changes: 7 additions & 6 deletions sql/base/auth_database.sql
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
-- MySQL dump 10.13 Distrib 8.0.39, for Linux (x86_64)
-- MySQL dump 10.13 Distrib 8.0.40, for Linux (x86_64)
--
-- Host: localhost Database: auth
-- ------------------------------------------------------
-- Server version 8.0.39-0ubuntu0.22.04.1
-- Server version 8.0.40-0ubuntu0.22.04.1

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

Expand Down Expand Up @@ -2669,4 +2670,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-08-17 22:26:14
-- Dump completed on 2024-11-22 23:18:17
9 changes: 5 additions & 4 deletions sql/base/characters_database.sql
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
-- MySQL dump 10.13 Distrib 8.0.39, for Linux (x86_64)
-- MySQL dump 10.13 Distrib 8.0.40, for Linux (x86_64)
--
-- Host: localhost Database: characters
-- ------------------------------------------------------
-- Server version 8.0.39-0ubuntu0.22.04.1
-- Server version 8.0.40-0ubuntu0.22.04.1

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

Expand Down Expand Up @@ -2858,4 +2859,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

-- Dump completed on 2024-08-17 22:26:14
-- Dump completed on 2024-11-22 23:18:18
16 changes: 10 additions & 6 deletions sql/base/dev/world_database.sql

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions sql/updates/auth/3.3.5/2024_11_22_00_auth.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- TDB 335.24111 auth
UPDATE `updates` SET `state`='ARCHIVED';
2 changes: 2 additions & 0 deletions sql/updates/characters/3.3.5/2024_11_22_00_characters.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- TDB 335.24111 characters
UPDATE `updates` SET `state`='ARCHIVED';
3 changes: 3 additions & 0 deletions sql/updates/world/3.3.5/2024_11_22_01_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- TDB 335.24111 world
UPDATE `version` SET `db_version`='TDB 335.24111', `cache_id`=24111 LIMIT 1;
UPDATE `updates` SET `state`='ARCHIVED';

0 comments on commit daa3309

Please sign in to comment.