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 Aug 18, 2024
2 parents 89e0c92 + 8938f38 commit 729c445
Show file tree
Hide file tree
Showing 38 changed files with 21 additions and 12 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.24041_2024_04_10.sql"
#define _FULL_DATABASE "TDB_full_world_335.24081_2024_08_17.sql"
#define VER_COMPANYNAME_STR "TrinityCore Developers"
#define VER_LEGALCOPYRIGHT_STR "(c)2008-@rev_year@ TrinityCore"
#define VER_FILEVERSION 0,0,0
Expand Down
9 changes: 5 additions & 4 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.36, for Linux (x86_64)
-- MySQL dump 10.13 Distrib 8.0.39, for Linux (x86_64)
--
-- Host: localhost Database: auth
-- ------------------------------------------------------
-- Server version 8.0.36-0ubuntu0.22.04.1
-- Server version 8.0.39-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 @@ -2024,7 +2024,8 @@ INSERT INTO `updates` VALUES
('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),
('2024_04_10_00_auth.sql','CE8BD4D6DF6DE85DBF892507B1B18B746FE4A71D','ARCHIVED','2024-04-10 16:07:02',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);
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
UNLOCK TABLES;

Expand Down Expand Up @@ -2163,4 +2164,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-04-10 16:07:05
-- Dump completed on 2024-08-17 22:26:14
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.36, for Linux (x86_64)
-- MySQL dump 10.13 Distrib 8.0.39, for Linux (x86_64)
--
-- Host: localhost Database: characters
-- ------------------------------------------------------
-- Server version 8.0.36-0ubuntu0.22.04.1
-- Server version 8.0.39-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 @@ -2685,7 +2685,8 @@ INSERT INTO `updates` VALUES
('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),
('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_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);
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
UNLOCK TABLES;

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

-- Dump completed on 2024-04-10 16:07:06
-- Dump completed on 2024-08-17 22:26:14
6 changes: 3 additions & 3 deletions sql/base/dev/world_database.sql
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
-- MySQL dump 10.13 Distrib 8.0.36, for Linux (x86_64)
-- MySQL dump 10.13 Distrib 8.0.39, for Linux (x86_64)
--
-- Host: localhost Database: world
-- ------------------------------------------------------
-- Server version 8.0.36-0ubuntu0.22.04.1
-- Server version 8.0.39-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 @@ -4067,4 +4067,4 @@ CREATE TABLE `waypoints` (
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

-- Dump completed on 2024-04-10 16:07:07
-- Dump completed on 2024-08-17 22:26:15
2 changes: 2 additions & 0 deletions sql/updates/auth/3.3.5/2024_08_17_00_auth.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- TDB 335.24081 auth
UPDATE `updates` SET `state`='ARCHIVED';
2 changes: 2 additions & 0 deletions sql/updates/characters/3.3.5/2024_08_17_00_characters.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- TDB 335.24081 characters
UPDATE `updates` SET `state`='ARCHIVED';
3 changes: 3 additions & 0 deletions sql/updates/world/3.3.5/2024_08_17_00_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- TDB 335.24081 world
UPDATE `version` SET `db_version`='TDB 335.24081', `cache_id`=24081 LIMIT 1;
UPDATE `updates` SET `state`='ARCHIVED';

0 comments on commit 729c445

Please sign in to comment.