Skip to content

Commit 8225c82

Browse files
author
Github Actions
committed
Merge 3.3.5-base_patch to 3.3.5-tele_npc_3
2 parents ea8d535 + 78eaa32 commit 8225c82

40 files changed

+37
-14
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.24041_2024_04_10.sql"
12+
#define _FULL_DATABASE "TDB_full_world_335.24081_2024_08_17.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: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
-- MySQL dump 10.13 Distrib 8.0.36, for Linux (x86_64)
1+
-- MySQL dump 10.13 Distrib 8.0.39, for Linux (x86_64)
22
--
33
-- Host: localhost Database: auth
44
-- ------------------------------------------------------
5-
-- Server version 8.0.36-0ubuntu0.22.04.1
5+
-- Server version 8.0.39-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 */;
@@ -2024,7 +2024,8 @@ INSERT INTO `updates` VALUES
20242024
('2024_01_06_02_auth.sql','B14F889C198A4F640A968BAB8A4C262AC61634C7','ARCHIVED','2024-01-06 12:43:47',0),
20252025
('2024_01_06_03_auth.sql','693BFD4326314659BAD9A2C70D9526FF4625B393','ARCHIVED','2024-01-06 12:55:07',0),
20262026
('2024_01_21_00_auth.sql','B45B95D7B608D6ACF1BCBA656718C7DEED8CFF00','ARCHIVED','2024-01-21 11:38:22',0),
2027-
('2024_04_10_00_auth.sql','CE8BD4D6DF6DE85DBF892507B1B18B746FE4A71D','ARCHIVED','2024-04-10 16:07:02',0);
2027+
('2024_04_10_00_auth.sql','CE8BD4D6DF6DE85DBF892507B1B18B746FE4A71D','ARCHIVED','2024-04-10 16:07:02',0),
2028+
('2024_08_17_00_auth.sql','B6D7D00D5573958EE84321B029D869C52793F924','ARCHIVED','2024-08-17 22:26:12',0);
20282029
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
20292030
UNLOCK TABLES;
20302031

@@ -2163,4 +2164,4 @@ SET character_set_client = @saved_cs_client;
21632164
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
21642165
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
21652166

2166-
-- Dump completed on 2024-04-10 16:07:05
2167+
-- Dump completed on 2024-08-17 22:26:14

‎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.36, for Linux (x86_64)
1+
-- MySQL dump 10.13 Distrib 8.0.39, for Linux (x86_64)
22
--
33
-- Host: localhost Database: characters
44
-- ------------------------------------------------------
5-
-- Server version 8.0.36-0ubuntu0.22.04.1
5+
-- Server version 8.0.39-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 */;
@@ -2685,7 +2685,8 @@ INSERT INTO `updates` VALUES
26852685
('2023_09_10_00_characters.sql','5DE09CA31B5168CF3622CB462816B6C598893D96','ARCHIVED','2023-09-10 12:23:34',0),
26862686
('2024_01_21_00_characters.sql','4D27D8DAC9F78795DB6938B54F32502EF8D8AAE6','ARCHIVED','2024-01-21 11:38:22',0),
26872687
('2024_02_05_00_characters.sql','1777CBCA822AD85777DA4A390DF7AAF41AF68EBD','ARCHIVED','2024-02-05 12:17:19',0),
2688-
('2024_04_10_00_characters.sql','E0D6E19ACE6759332402FA27C23B0F7745C49742','ARCHIVED','2024-04-10 16:07:02',0);
2688+
('2024_04_10_00_characters.sql','E0D6E19ACE6759332402FA27C23B0F7745C49742','ARCHIVED','2024-04-10 16:07:02',0),
2689+
('2024_08_17_00_characters.sql','08705FBCB8504E8B1009FDAF955F56D734FAD782','ARCHIVED','2024-08-17 22:26:12',0);
26892690
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
26902691
UNLOCK TABLES;
26912692

@@ -2856,4 +2857,4 @@ UNLOCK TABLES;
28562857
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
28572858
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
28582859

2859-
-- Dump completed on 2024-04-10 16:07:06
2860+
-- Dump completed on 2024-08-17 22:26:14

‎sql/base/dev/world_database.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
-- MySQL dump 10.13 Distrib 8.0.36, for Linux (x86_64)
1+
-- MySQL dump 10.13 Distrib 8.0.39, for Linux (x86_64)
22
--
33
-- Host: localhost Database: world
44
-- ------------------------------------------------------
5-
-- Server version 8.0.36-0ubuntu0.22.04.1
5+
-- Server version 8.0.39-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 */;
@@ -4067,4 +4067,4 @@ CREATE TABLE `waypoints` (
40674067
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
40684068
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
40694069

4070-
-- Dump completed on 2024-04-10 16:07:07
4070+
-- Dump completed on 2024-08-17 22:26:15

‎sql/updates/auth/3.3.5/2024_04_10_00_auth.sql‎ renamed to ‎sql/old/3.3.5a/auth/24041_2024_08_17/2024_04_10_00_auth.sql‎

File renamed without changes.

‎sql/updates/characters/3.3.5/2024_04_10_00_characters.sql‎ renamed to ‎sql/old/3.3.5a/characters/24041_2024_08_17/2024_04_10_00_characters.sql‎

File renamed without changes.

‎sql/updates/world/3.3.5/2024_04_10_00_world.sql‎ renamed to ‎sql/old/3.3.5a/world/24041_2024_08_17/2024_04_10_00_world.sql‎

File renamed without changes.

‎sql/updates/world/3.3.5/2024_04_15_00_world.sql‎ renamed to ‎sql/old/3.3.5a/world/24041_2024_08_17/2024_04_15_00_world.sql‎

File renamed without changes.

‎sql/updates/world/3.3.5/2024_04_21_00_world.sql‎ renamed to ‎sql/old/3.3.5a/world/24041_2024_08_17/2024_04_21_00_world.sql‎

File renamed without changes.

‎sql/updates/world/3.3.5/2024_05_12_00_world.sql‎ renamed to ‎sql/old/3.3.5a/world/24041_2024_08_17/2024_05_12_00_world.sql‎

File renamed without changes.

0 commit comments

Comments
 (0)