TDB 910.21081 - 2021/08/18TDB910.21081

79 files changed, 126 insertions, 72 deletions

diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake
index ebc8d2eb499..513e2d0aefd 100644
--- a/revision_data.h.in.cmake
+++ b/revision_data.h.in.cmake
@@ -9,8 +9,8 @@
  #define _SOURCE_DIRECTORY          R"(@CMAKE_SOURCE_DIR@)"
  #define _BUILD_DIRECTORY           R"(@BUILDDIR@)"
  #define _MYSQL_EXECUTABLE          R"(@MYSQL_EXECUTABLE@)"
- #define _FULL_DATABASE             "TDB_full_world_905.21071_2021_07_04.sql"
- #define _HOTFIXES_DATABASE         "TDB_full_hotfixes_905.21071_2021_07_04.sql"
+ #define _FULL_DATABASE             "TDB_full_world_910.21081_2021_08_18.sql"
+ #define _HOTFIXES_DATABASE         "TDB_full_hotfixes_910.21081_2021_08_18.sql"
  #define VER_COMPANYNAME_STR        "TrinityCore Developers"
  #define VER_LEGALCOPYRIGHT_STR     "(c)2008-2019 TrinityCore"
  #define VER_FILEVERSION            0,0,0
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index c76dca66ede..4d3fa2badce 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.34, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.35, for Linux (x86_64)
 --
 -- Host: localhost    Database: auth
 -- ------------------------------------------------------
--- Server version	5.7.34
+-- Server version	5.7.35
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2413,7 +2413,8 @@ INSERT INTO `updates` VALUES
 ('2021_04_10_00_auth.sql','7B92AC4F76507940EF2257897F25304CF0F306EB','ARCHIVED','2021-04-10 19:42:42',0),
 ('2021_05_12_00_auth.sql','7F37DAD1777D62FDB00C19C0DF5E7DB742CCD5AD','ARCHIVED','2021-05-12 01:08:42',0),
 ('2021_07_04_00_auth.sql','3CF056F8F04E49C1E236060202AA8DA7E186B590','ARCHIVED','2021-07-04 22:23:24',0),
-('2021_08_07_00_auth.sql','D615C2CACC999FF8804AEF56BAAA08D02217D671','RELEASED','2021-08-07 23:18:57',0);
+('2021_08_07_00_auth.sql','D615C2CACC999FF8804AEF56BAAA08D02217D671','ARCHIVED','2021-08-07 23:18:57',0),
+('2021_08_18_00_auth.sql','162590897AC0020E68EB6845637901C3EB6509B4','ARCHIVED','2021-08-18 15:14:17',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2486,4 +2487,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-07-04 22:23:25
+-- Dump completed on 2021-08-18 15:14:18
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 5d65c138b5d..e1ea55f1a03 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.34, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.35, for Linux (x86_64)
 --
 -- Host: localhost    Database: characters
 -- ------------------------------------------------------
--- Server version	5.7.34
+-- Server version	5.7.35
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -3717,7 +3717,8 @@ INSERT INTO `updates` VALUES
 ('2021_05_10_00_characters.sql','0A406242BC18BDA5A65CDE3E2AFEE760D79F819F','ARCHIVED','2021-05-10 23:30:34',0),
 ('2021_05_11_00_characters.sql','C3F0337CE8363F970AB4FDB9D23BBB7C650A0B0E','ARCHIVED','2021-05-11 15:39:26',0),
 ('2021_07_04_00_characters.sql','E0E7AD664DDB553E96B457DD9ED8976665E94007','ARCHIVED','2021-07-04 22:23:24',0),
-('2021_08_11_00_characters.sql','2137A52A45B045104B97D39626CE3C0214625B17','RELEASED','2021-08-11 21:48:57',0);
+('2021_08_11_00_characters.sql','2137A52A45B045104B97D39626CE3C0214625B17','ARCHIVED','2021-08-11 21:48:57',0),
+('2021_08_18_00_characters.sql','5BA1326EE8EC907CDE82E6E8BCB38EA2E661F10A','ARCHIVED','2021-08-18 15:14:17',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3816,4 +3817,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-07-04 22:23:26
+-- Dump completed on 2021-08-18 15:14:18
diff --git a/sql/base/dev/hotfixes_database.sql b/sql/base/dev/hotfixes_database.sql
index 08d014c7bfd..917a38e1065 100644
--- a/sql/base/dev/hotfixes_database.sql
+++ b/sql/base/dev/hotfixes_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.34, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.35, for Linux (x86_64)
 --
 -- Host: localhost    Database: hotfixes
 -- ------------------------------------------------------
--- Server version	5.7.34
+-- Server version	5.7.35
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -787,9 +787,9 @@ DROP TABLE IF EXISTS `azerite_essence`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `azerite_essence` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text COLLATE utf8mb4_unicode_ci,
   `Description` text COLLATE utf8mb4_unicode_ci,
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `SpecSetID` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
@@ -1068,9 +1068,9 @@ DROP TABLE IF EXISTS `barber_shop_style`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `barber_shop_style` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `DisplayName` text COLLATE utf8mb4_unicode_ci,
   `Description` text COLLATE utf8mb4_unicode_ci,
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `CostModifier` float NOT NULL DEFAULT '0',
   `Race` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -1119,7 +1119,7 @@ DROP TABLE IF EXISTS `battle_pet_breed_quality`;
 CREATE TABLE `battle_pet_breed_quality` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `StateMultiplier` float NOT NULL DEFAULT '0',
-  `QualityEnum` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `QualityEnum` tinyint(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -1156,7 +1156,7 @@ CREATE TABLE `battle_pet_species` (
   `CreatureID` int(11) NOT NULL DEFAULT '0',
   `SummonSpellID` int(11) NOT NULL DEFAULT '0',
   `IconFileDataID` int(11) NOT NULL DEFAULT '0',
-  `PetTypeEnum` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PetTypeEnum` tinyint(11) NOT NULL DEFAULT '0',
   `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SourceTypeEnum` tinyint(4) NOT NULL DEFAULT '0',
   `CardUIModelSceneID` int(11) NOT NULL DEFAULT '0',
@@ -1418,10 +1418,11 @@ DROP TABLE IF EXISTS `character_loadout`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `character_loadout` (
-  `RaceMask` bigint(20) NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `RaceMask` bigint(20) NOT NULL DEFAULT '0',
   `ChrClassID` tinyint(4) NOT NULL DEFAULT '0',
   `Purpose` tinyint(4) NOT NULL DEFAULT '0',
+  `Unused910` tinyint(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -1451,9 +1452,9 @@ DROP TABLE IF EXISTS `chat_channels`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `chat_channels` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text COLLATE utf8mb4_unicode_ci,
   `Shortcut` text COLLATE utf8mb4_unicode_ci,
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` int(11) NOT NULL DEFAULT '0',
   `FactionGroup` tinyint(4) NOT NULL DEFAULT '0',
   `Ruleset` int(11) NOT NULL DEFAULT '0',
@@ -1622,10 +1623,10 @@ CREATE TABLE `chr_customization_choice` (
   `ChrCustomizationOptionID` int(11) NOT NULL DEFAULT '0',
   `ChrCustomizationReqID` int(11) NOT NULL DEFAULT '0',
   `SortOrder` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `SwatchColor1` int(11) NOT NULL DEFAULT '0',
-  `SwatchColor2` int(11) NOT NULL DEFAULT '0',
   `UiOrderIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Flags` int(11) NOT NULL DEFAULT '0',
+  `SwatchColor1` int(11) NOT NULL DEFAULT '0',
+  `SwatchColor2` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -1813,6 +1814,7 @@ CREATE TABLE `chr_model` (
   `CustomizeFacing` float NOT NULL DEFAULT '0',
   `CameraDistanceOffset` float NOT NULL DEFAULT '0',
   `BarberShopCameraOffsetScale` float NOT NULL DEFAULT '0',
+  `BarberShopCameraHeightOffsetScale` float NOT NULL DEFAULT '0',
   `BarberShopCameraRotationOffset` float NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
@@ -1843,6 +1845,7 @@ DROP TABLE IF EXISTS `chr_races`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `chr_races` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `ClientPrefix` text COLLATE utf8mb4_unicode_ci,
   `ClientFileString` text COLLATE utf8mb4_unicode_ci,
   `Name` text COLLATE utf8mb4_unicode_ci,
@@ -1858,47 +1861,52 @@ CREATE TABLE `chr_races` (
   `NameFemaleL` text COLLATE utf8mb4_unicode_ci,
   `NameLowercaseL` text COLLATE utf8mb4_unicode_ci,
   `NameFemaleLowercaseL` text COLLATE utf8mb4_unicode_ci,
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` int(11) NOT NULL DEFAULT '0',
-  `BaseLanguage` int(11) NOT NULL DEFAULT '0',
+  `FactionID` int(11) NOT NULL DEFAULT '0',
+  `CinematicSequenceID` int(11) NOT NULL DEFAULT '0',
   `ResSicknessSpellID` int(11) NOT NULL DEFAULT '0',
   `SplashSoundID` int(11) NOT NULL DEFAULT '0',
+  `Alliance` int(11) NOT NULL DEFAULT '0',
+  `RaceRelated` int(11) NOT NULL DEFAULT '0',
+  `UnalteredVisualRaceID` int(11) NOT NULL DEFAULT '0',
+  `DefaultClassID` int(11) NOT NULL DEFAULT '0',
   `CreateScreenFileDataID` int(11) NOT NULL DEFAULT '0',
   `SelectScreenFileDataID` int(11) NOT NULL DEFAULT '0',
+  `NeutralRaceID` int(11) NOT NULL DEFAULT '0',
   `LowResScreenFileDataID` int(11) NOT NULL DEFAULT '0',
-  `AlteredFormStartVisualKitID1` int(10) unsigned NOT NULL DEFAULT '0',
-  `AlteredFormStartVisualKitID2` int(10) unsigned NOT NULL DEFAULT '0',
-  `AlteredFormStartVisualKitID3` int(10) unsigned NOT NULL DEFAULT '0',
-  `AlteredFormFinishVisualKitID1` int(10) unsigned NOT NULL DEFAULT '0',
-  `AlteredFormFinishVisualKitID2` int(10) unsigned NOT NULL DEFAULT '0',
-  `AlteredFormFinishVisualKitID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `AlteredFormStartVisualKitID1` int(11) NOT NULL DEFAULT '0',
+  `AlteredFormStartVisualKitID2` int(11) NOT NULL DEFAULT '0',
+  `AlteredFormStartVisualKitID3` int(11) NOT NULL DEFAULT '0',
+  `AlteredFormFinishVisualKitID1` int(11) NOT NULL DEFAULT '0',
+  `AlteredFormFinishVisualKitID2` int(11) NOT NULL DEFAULT '0',
+  `AlteredFormFinishVisualKitID3` int(11) NOT NULL DEFAULT '0',
   `HeritageArmorAchievementID` int(11) NOT NULL DEFAULT '0',
   `StartingLevel` int(11) NOT NULL DEFAULT '0',
   `UiDisplayOrder` int(11) NOT NULL DEFAULT '0',
+  `MaleModelFallbackRaceID` int(11) NOT NULL DEFAULT '0',
+  `FemaleModelFallbackRaceID` int(11) NOT NULL DEFAULT '0',
+  `MaleTextureFallbackRaceID` int(11) NOT NULL DEFAULT '0',
+  `FemaleTextureFallbackRaceID` int(11) NOT NULL DEFAULT '0',
   `PlayableRaceBit` int(11) NOT NULL DEFAULT '0',
   `HelmetAnimScalingRaceID` int(11) NOT NULL DEFAULT '0',
   `TransmogrifyDisabledSlotMask` int(11) NOT NULL DEFAULT '0',
+  `UnalteredVisualCustomizationRaceID` int(11) NOT NULL DEFAULT '0',
   `AlteredFormCustomizeOffsetFallback1` float NOT NULL DEFAULT '0',
   `AlteredFormCustomizeOffsetFallback2` float NOT NULL DEFAULT '0',
   `AlteredFormCustomizeOffsetFallback3` float NOT NULL DEFAULT '0',
   `AlteredFormCustomizeRotationFallback` float NOT NULL DEFAULT '0',
-  `FactionID` smallint(6) NOT NULL DEFAULT '0',
-  `CinematicSequenceID` smallint(6) NOT NULL DEFAULT '0',
+  `Unknown910_11` float NOT NULL DEFAULT '0',
+  `Unknown910_12` float NOT NULL DEFAULT '0',
+  `Unknown910_13` float NOT NULL DEFAULT '0',
+  `Unknown910_21` float NOT NULL DEFAULT '0',
+  `Unknown910_22` float NOT NULL DEFAULT '0',
+  `Unknown910_23` float NOT NULL DEFAULT '0',
+  `BaseLanguage` tinyint(11) NOT NULL DEFAULT '0',
   `CreatureType` tinyint(4) NOT NULL DEFAULT '0',
-  `Alliance` tinyint(4) NOT NULL DEFAULT '0',
-  `RaceRelated` tinyint(4) NOT NULL DEFAULT '0',
-  `UnalteredVisualRaceID` tinyint(4) NOT NULL DEFAULT '0',
-  `DefaultClassID` tinyint(4) NOT NULL DEFAULT '0',
-  `NeutralRaceID` tinyint(4) NOT NULL DEFAULT '0',
-  `MaleModelFallbackRaceID` tinyint(4) NOT NULL DEFAULT '0',
   `MaleModelFallbackSex` tinyint(4) NOT NULL DEFAULT '0',
-  `FemaleModelFallbackRaceID` tinyint(4) NOT NULL DEFAULT '0',
   `FemaleModelFallbackSex` tinyint(4) NOT NULL DEFAULT '0',
-  `MaleTextureFallbackRaceID` tinyint(4) NOT NULL DEFAULT '0',
   `MaleTextureFallbackSex` tinyint(4) NOT NULL DEFAULT '0',
-  `FemaleTextureFallbackRaceID` tinyint(4) NOT NULL DEFAULT '0',
   `FemaleTextureFallbackSex` tinyint(4) NOT NULL DEFAULT '0',
-  `UnalteredVisualCustomizationRaceID` tinyint(3) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -2077,7 +2085,8 @@ DROP TABLE IF EXISTS `content_tuning_x_expected`;
 CREATE TABLE `content_tuning_x_expected` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `ExpectedStatModID` int(11) NOT NULL DEFAULT '0',
-  `MythicPlusSeasonID` int(11) NOT NULL DEFAULT '0',
+  `MinMythicPlusSeasonID` int(11) NOT NULL DEFAULT '0',
+  `MaxMythicPlusSeasonID` int(11) NOT NULL DEFAULT '0',
   `ContentTuningID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
@@ -2662,7 +2671,7 @@ CREATE TABLE `dungeon_encounter` (
   `CompleteWorldStateID` int(11) NOT NULL DEFAULT '0',
   `Bit` tinyint(4) NOT NULL DEFAULT '0',
   `CreatureDisplayID` int(11) NOT NULL DEFAULT '0',
-  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(11) NOT NULL DEFAULT '0',
   `SpellIconFileID` int(11) NOT NULL DEFAULT '0',
   `Faction` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
@@ -2869,13 +2878,13 @@ DROP TABLE IF EXISTS `faction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `faction` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `ReputationRaceMask1` bigint(20) NOT NULL DEFAULT '0',
   `ReputationRaceMask2` bigint(20) NOT NULL DEFAULT '0',
   `ReputationRaceMask3` bigint(20) NOT NULL DEFAULT '0',
   `ReputationRaceMask4` bigint(20) NOT NULL DEFAULT '0',
   `Name` text COLLATE utf8mb4_unicode_ci,
   `Description` text COLLATE utf8mb4_unicode_ci,
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `ReputationIndex` smallint(6) NOT NULL DEFAULT '0',
   `ParentFactionID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Expansion` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -3151,9 +3160,9 @@ DROP TABLE IF EXISTS `garr_ability`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `garr_ability` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text COLLATE utf8mb4_unicode_ci,
   `Description` text COLLATE utf8mb4_unicode_ci,
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `GarrAbilityCategoryID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `GarrFollowerTypeID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `IconFileDataID` int(11) NOT NULL DEFAULT '0',
@@ -3287,10 +3296,10 @@ DROP TABLE IF EXISTS `garr_class_spec`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `garr_class_spec` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `ClassSpec` text COLLATE utf8mb4_unicode_ci,
   `ClassSpecMale` text COLLATE utf8mb4_unicode_ci,
   `ClassSpecFemale` text COLLATE utf8mb4_unicode_ci,
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `UiTextureAtlasMemberID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `GarrFollItemSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `FollowerClassLimit` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -3337,10 +3346,10 @@ DROP TABLE IF EXISTS `garr_follower`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `garr_follower` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `HordeSourceText` text COLLATE utf8mb4_unicode_ci,
   `AllianceSourceText` text COLLATE utf8mb4_unicode_ci,
   `TitleName` text COLLATE utf8mb4_unicode_ci,
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `GarrTypeID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `GarrFollowerTypeID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `HordeCreatureID` int(11) NOT NULL DEFAULT '0',
@@ -4336,7 +4345,6 @@ CREATE TABLE `item_effect` (
   `SpellCategoryID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SpellID` int(11) NOT NULL DEFAULT '0',
   `ChrSpecializationID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `ParentItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -4599,11 +4607,11 @@ DROP TABLE IF EXISTS `item_search_name`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_search_name` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `AllowableRace` bigint(20) NOT NULL DEFAULT '0',
   `Display` text COLLATE utf8mb4_unicode_ci,
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `OverallQualityID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `ExpansionID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ExpansionID` int(11) NOT NULL DEFAULT '0',
   `MinFactionID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MinReputation` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `AllowableClass` int(11) NOT NULL DEFAULT '0',
@@ -4743,7 +4751,9 @@ CREATE TABLE `item_sparse` (
   `Display2` text COLLATE utf8mb4_unicode_ci,
   `Display1` text COLLATE utf8mb4_unicode_ci,
   `Display` text COLLATE utf8mb4_unicode_ci,
+  `ExpansionID` int(11) NOT NULL DEFAULT '0',
   `DmgVariance` float NOT NULL DEFAULT '0',
+  `InstanceBound` int(11) NOT NULL DEFAULT '0',
   `DurationInInventory` int(10) unsigned NOT NULL DEFAULT '0',
   `QualityModifier` float NOT NULL DEFAULT '0',
   `BagFamily` int(10) unsigned NOT NULL DEFAULT '0',
@@ -4791,7 +4801,6 @@ CREATE TABLE `item_sparse` (
   `GemProperties` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SocketMatchEnchantmentId` smallint(5) unsigned NOT NULL DEFAULT '0',
   `TotemCategoryID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `InstanceBound` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ZoneBound1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ZoneBound2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ItemSet` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -4804,7 +4813,6 @@ CREATE TABLE `item_sparse` (
   `RequiredSkill` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
   `AllowableClass` smallint(6) NOT NULL DEFAULT '0',
-  `ExpansionID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ArtifactID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SpellWeight` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SpellWeightCategory` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -4923,6 +4931,22 @@ CREATE TABLE `item_x_bonus_tree` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `item_x_item_effect`
+--
+
+DROP TABLE IF EXISTS `item_x_item_effect`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_x_item_effect` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemEffectID` int(11) NOT NULL DEFAULT '0',
+  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`VerifiedBuild`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `keychain`
 --
 
@@ -4992,8 +5016,8 @@ DROP TABLE IF EXISTS `languages`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `languages` (
-  `Name` text COLLATE utf8mb4_unicode_ci,
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -5295,7 +5319,6 @@ CREATE TABLE `map` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Directory` text COLLATE utf8mb4_unicode_ci,
   `MapName` text COLLATE utf8mb4_unicode_ci,
-  `InternalName` text COLLATE utf8mb4_unicode_ci,
   `MapDescription0` text COLLATE utf8mb4_unicode_ci,
   `MapDescription1` text COLLATE utf8mb4_unicode_ci,
   `PvpShortDescription` text COLLATE utf8mb4_unicode_ci,
@@ -5466,7 +5489,7 @@ CREATE TABLE `modifier_tree` (
   `Type` int(11) NOT NULL DEFAULT '0',
   `Asset` int(11) NOT NULL DEFAULT '0',
   `SecondaryAsset` int(11) NOT NULL DEFAULT '0',
-  `TertiaryAsset` tinyint(4) NOT NULL DEFAULT '0',
+  `TertiaryAsset` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -5717,7 +5740,7 @@ DROP TABLE IF EXISTS `paragon_reputation`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `paragon_reputation` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `FactionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `FactionID` int(11) NOT NULL DEFAULT '0',
   `LevelThreshold` int(11) NOT NULL DEFAULT '0',
   `QuestID` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
@@ -5764,9 +5787,9 @@ DROP TABLE IF EXISTS `player_condition`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `player_condition` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `RaceMask` bigint(20) NOT NULL DEFAULT '0',
   `FailureDescription` text COLLATE utf8mb4_unicode_ci,
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `ClassMask` int(11) NOT NULL DEFAULT '0',
   `SkillLogic` int(10) unsigned NOT NULL DEFAULT '0',
   `LanguageID` int(11) NOT NULL DEFAULT '0',
@@ -6427,11 +6450,6 @@ CREATE TABLE `rand_prop_points` (
   `EpicF3` float NOT NULL DEFAULT '0',
   `EpicF4` float NOT NULL DEFAULT '0',
   `EpicF5` float NOT NULL DEFAULT '0',
-  `Epic1` int(10) unsigned NOT NULL DEFAULT '0',
-  `Epic2` int(10) unsigned NOT NULL DEFAULT '0',
-  `Epic3` int(10) unsigned NOT NULL DEFAULT '0',
-  `Epic4` int(10) unsigned NOT NULL DEFAULT '0',
-  `Epic5` int(10) unsigned NOT NULL DEFAULT '0',
   `SuperiorF1` float NOT NULL DEFAULT '0',
   `SuperiorF2` float NOT NULL DEFAULT '0',
   `SuperiorF3` float NOT NULL DEFAULT '0',
@@ -6442,6 +6460,11 @@ CREATE TABLE `rand_prop_points` (
   `GoodF3` float NOT NULL DEFAULT '0',
   `GoodF4` float NOT NULL DEFAULT '0',
   `GoodF5` float NOT NULL DEFAULT '0',
+  `Epic1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Epic2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Epic3` int(10) unsigned NOT NULL DEFAULT '0',
+  `Epic4` int(10) unsigned NOT NULL DEFAULT '0',
+  `Epic5` int(10) unsigned NOT NULL DEFAULT '0',
   `Superior1` int(10) unsigned NOT NULL DEFAULT '0',
   `Superior2` int(10) unsigned NOT NULL DEFAULT '0',
   `Superior3` int(10) unsigned NOT NULL DEFAULT '0',
@@ -7111,6 +7134,7 @@ CREATE TABLE `spell_effect` (
   `ResourceCoefficient` float NOT NULL DEFAULT '0',
   `GroupSizeBasePointsCoefficient` float NOT NULL DEFAULT '0',
   `EffectBasePoints` float NOT NULL DEFAULT '0',
+  `ScalingClass` int(11) NOT NULL DEFAULT '0',
   `EffectMiscValue1` int(11) NOT NULL DEFAULT '0',
   `EffectMiscValue2` int(11) NOT NULL DEFAULT '0',
   `EffectRadiusIndex1` int(10) unsigned NOT NULL DEFAULT '0',
@@ -7216,9 +7240,9 @@ DROP TABLE IF EXISTS `spell_item_enchantment`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_item_enchantment` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text COLLATE utf8mb4_unicode_ci,
   `HordeName` text COLLATE utf8mb4_unicode_ci,
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectArg1` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectArg2` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectArg3` int(10) unsigned NOT NULL DEFAULT '0',
@@ -7226,10 +7250,10 @@ CREATE TABLE `spell_item_enchantment` (
   `EffectScalingPoints2` float NOT NULL DEFAULT '0',
   `EffectScalingPoints3` float NOT NULL DEFAULT '0',
   `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
-  `TransmogCost` int(10) unsigned NOT NULL DEFAULT '0',
   `MinItemLevel` int(11) NOT NULL DEFAULT '0',
   `MaxItemLevel` int(11) NOT NULL DEFAULT '0',
   `TransmogUseConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `TransmogCost` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectPointsMin1` smallint(6) NOT NULL DEFAULT '0',
   `EffectPointsMin2` smallint(6) NOT NULL DEFAULT '0',
   `EffectPointsMin3` smallint(6) NOT NULL DEFAULT '0',
@@ -7648,7 +7672,6 @@ DROP TABLE IF EXISTS `spell_scaling`;
 CREATE TABLE `spell_scaling` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellID` int(11) NOT NULL DEFAULT '0',
-  `Class` int(11) NOT NULL DEFAULT '0',
   `MinScalingLevel` int(10) unsigned NOT NULL DEFAULT '0',
   `MaxScalingLevel` int(10) unsigned NOT NULL DEFAULT '0',
   `ScalesFromItemLevel` smallint(6) NOT NULL DEFAULT '0',
@@ -7811,7 +7834,7 @@ CREATE TABLE `spell_x_spell_visual` (
   `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SpellVisualID` int(10) unsigned NOT NULL DEFAULT '0',
   `Probability` float NOT NULL DEFAULT '0',
-  `Priority` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Priority` int(11) NOT NULL DEFAULT '0',
   `SpellIconFileID` int(11) NOT NULL DEFAULT '0',
   `ActiveIconFileID` int(11) NOT NULL DEFAULT '0',
   `ViewerUnitConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -8181,8 +8204,8 @@ DROP TABLE IF EXISTS `transmog_set_group`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `transmog_set_group` (
-  `Name` text COLLATE utf8mb4_unicode_ci,
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -8776,4 +8799,4 @@ CREATE TABLE `world_state_expression` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-07-04 22:23:28
+-- Dump completed on 2021-08-18 15:14:20
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index a22e0044097..ee2d8694807 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.34, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.35, for Linux (x86_64)
 --
 -- Host: localhost    Database: world
 -- ------------------------------------------------------
--- Server version	5.7.34
+-- Server version	5.7.35
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -792,6 +792,7 @@ CREATE TABLE `creature_template` (
   `ExperienceModifier` float NOT NULL DEFAULT '1',
   `RacialLeader` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `movementId` int(11) unsigned NOT NULL DEFAULT '0',
+  `CreatureDifficultyID` int(11) NOT NULL DEFAULT '0',
   `WidgetSetID` int(11) NOT NULL DEFAULT '0',
   `WidgetSetUnitConditionID` int(11) NOT NULL DEFAULT '0',
   `RegenHealth` tinyint(3) unsigned NOT NULL DEFAULT '1',
@@ -874,8 +875,6 @@ DROP TABLE IF EXISTS `creature_template_scaling`;
 CREATE TABLE `creature_template_scaling` (
   `Entry` mediumint(8) unsigned NOT NULL,
   `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `LevelScalingMin` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `LevelScalingMax` smallint(5) unsigned NOT NULL DEFAULT '0',
   `LevelScalingDeltaMin` smallint(5) NOT NULL DEFAULT '0',
   `LevelScalingDeltaMax` smallint(5) NOT NULL DEFAULT '0',
   `ContentTuningID` int(10) NOT NULL DEFAULT '0',
@@ -1420,6 +1419,21 @@ CREATE TABLE `gameobject_loot_template` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `gameobject_overrides`
+--
+
+DROP TABLE IF EXISTS `gameobject_overrides`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `gameobject_overrides` (
+  `spawnId` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `faction` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `flags` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`spawnId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `gameobject_questender`
 --
 
@@ -2611,6 +2625,7 @@ CREATE TABLE `points_of_interest` (
   `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `PositionX` float NOT NULL DEFAULT '0',
   `PositionY` float NOT NULL DEFAULT '0',
+  `PositionZ` float NOT NULL DEFAULT '0',
   `Icon` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `Flags` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `Importance` mediumint(8) unsigned NOT NULL DEFAULT '0',
@@ -3092,6 +3107,7 @@ CREATE TABLE `quest_template` (
   `RewardNumSkillUps` int(10) unsigned NOT NULL DEFAULT '0',
   `PortraitGiver` int(10) unsigned NOT NULL DEFAULT '0',
   `PortraitGiverMount` int(11) NOT NULL DEFAULT '0',
+  `PortraitGiverModelSceneID` int(11) NOT NULL DEFAULT '0',
   `PortraitTurnIn` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardFactionID1` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardFactionValue1` int(11) NOT NULL DEFAULT '0',
@@ -4434,4 +4450,4 @@ CREATE TABLE `world_safe_locs` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-07-04 22:23:27
+-- Dump completed on 2021-08-18 15:14:19
diff --git a/sql/updates/auth/master/2021_07_04_00_auth.sql b/sql/old/9.x/auth/21071_2021_08_18/2021_07_04_00_auth.sql
index ab0782353e8..ab0782353e8 100644
--- a/sql/updates/auth/master/2021_07_04_00_auth.sql
+++ b/sql/old/9.x/auth/21071_2021_08_18/2021_07_04_00_auth.sql
diff --git a/sql/updates/auth/master/2021_08_07_00_auth.sql b/sql/old/9.x/auth/21071_2021_08_18/2021_08_07_00_auth.sql
index 171759a11d5..171759a11d5 100644
--- a/sql/updates/auth/master/2021_08_07_00_auth.sql
+++ b/sql/old/9.x/auth/21071_2021_08_18/2021_08_07_00_auth.sql
diff --git a/sql/updates/characters/master/2021_07_04_00_characters.sql b/sql/old/9.x/characters/21071_2021_08_18/2021_07_04_00_characters.sql
index 58b6234e08c..58b6234e08c 100644
--- a/sql/updates/characters/master/2021_07_04_00_characters.sql
+++ b/sql/old/9.x/characters/21071_2021_08_18/2021_07_04_00_characters.sql
diff --git a/sql/updates/characters/master/2021_08_11_00_characters.sql b/sql/old/9.x/characters/21071_2021_08_18/2021_08_11_00_characters.sql
index dd9b840a333..dd9b840a333 100644
--- a/sql/updates/characters/master/2021_08_11_00_characters.sql
+++ b/sql/old/9.x/characters/21071_2021_08_18/2021_08_11_00_characters.sql
diff --git a/sql/updates/hotfixes/master/2021_07_04_00_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_07_04_00_hotfixes.sql
index 7441eb81f59..7441eb81f59 100644
--- a/sql/updates/hotfixes/master/2021_07_04_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_07_04_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_07_00_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_07_00_hotfixes.sql
index 2ed9cf3f329..2ed9cf3f329 100644
--- a/sql/updates/hotfixes/master/2021_08_07_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_07_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_08_00_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_08_00_hotfixes.sql
index fbb25d5e7da..fbb25d5e7da 100644
--- a/sql/updates/hotfixes/master/2021_08_08_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_08_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_12_00_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_12_00_hotfixes.sql
index adbc9bf6d1b..adbc9bf6d1b 100644
--- a/sql/updates/hotfixes/master/2021_08_12_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_12_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_12_01_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_12_01_hotfixes.sql
index 318a352f088..318a352f088 100644
--- a/sql/updates/hotfixes/master/2021_08_12_01_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_12_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_12_02_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_12_02_hotfixes.sql
index 748d8665b5e..748d8665b5e 100644
--- a/sql/updates/hotfixes/master/2021_08_12_02_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_12_02_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_16_00_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_16_00_hotfixes.sql
index 93812cd4d0e..93812cd4d0e 100644
--- a/sql/updates/hotfixes/master/2021_08_16_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_16_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_16_01_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_16_01_hotfixes.sql
index beee7e454a9..beee7e454a9 100644
--- a/sql/updates/hotfixes/master/2021_08_16_01_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_16_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_17_00_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_00_hotfixes.sql
index f5f2a62cba1..f5f2a62cba1 100644
--- a/sql/updates/hotfixes/master/2021_08_17_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_17_01_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_01_hotfixes.sql
index 390ec280b48..390ec280b48 100644
--- a/sql/updates/hotfixes/master/2021_08_17_01_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_17_02_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_02_hotfixes.sql
index f1f620d2135..f1f620d2135 100644
--- a/sql/updates/hotfixes/master/2021_08_17_02_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_02_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_17_03_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_03_hotfixes.sql
index 5fca2aa5fdb..5fca2aa5fdb 100644
--- a/sql/updates/hotfixes/master/2021_08_17_03_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_03_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_17_04_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_04_hotfixes.sql
index 3e9036c8ee3..3e9036c8ee3 100644
--- a/sql/updates/hotfixes/master/2021_08_17_04_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_04_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_17_05_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_05_hotfixes.sql
index 0525f017ef2..0525f017ef2 100644
--- a/sql/updates/hotfixes/master/2021_08_17_05_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_05_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_17_06_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_06_hotfixes.sql
index eada81e748a..eada81e748a 100644
--- a/sql/updates/hotfixes/master/2021_08_17_06_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_06_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_17_07_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_07_hotfixes.sql
index 5439433c20e..5439433c20e 100644
--- a/sql/updates/hotfixes/master/2021_08_17_07_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_07_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_17_08_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_08_hotfixes.sql
index 577e980862c..577e980862c 100644
--- a/sql/updates/hotfixes/master/2021_08_17_08_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_08_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_17_09_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_09_hotfixes.sql
index e8465292eef..e8465292eef 100644
--- a/sql/updates/hotfixes/master/2021_08_17_09_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_17_09_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_18_00_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_18_00_hotfixes.sql
index 985b8dc9d67..985b8dc9d67 100644
--- a/sql/updates/hotfixes/master/2021_08_18_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_18_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_18_01_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_18_01_hotfixes.sql
index e0a58f86155..e0a58f86155 100644
--- a/sql/updates/hotfixes/master/2021_08_18_01_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_18_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_18_02_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_18_02_hotfixes.sql
index 23370bf0127..23370bf0127 100644
--- a/sql/updates/hotfixes/master/2021_08_18_02_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_18_02_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_18_03_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_18_03_hotfixes.sql
index 3f3f4b26849..3f3f4b26849 100644
--- a/sql/updates/hotfixes/master/2021_08_18_03_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_18_03_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_18_04_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_18_04_hotfixes.sql
index 2f25a450d5a..2f25a450d5a 100644
--- a/sql/updates/hotfixes/master/2021_08_18_04_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_18_04_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_08_18_05_hotfixes.sql b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_18_05_hotfixes.sql
index cf37ed1a79e..cf37ed1a79e 100644
--- a/sql/updates/hotfixes/master/2021_08_18_05_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/21071_2021_08_18/2021_08_18_05_hotfixes.sql
diff --git a/sql/updates/world/master/2021_07_01_00_world_2018_02_17_00_world_335.sql b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_00_world_2018_02_17_00_world_335.sql
index 9611d2d7072..9611d2d7072 100644
--- a/sql/updates/world/master/2021_07_01_00_world_2018_02_17_00_world_335.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_00_world_2018_02_17_00_world_335.sql
diff --git a/sql/updates/world/master/2021_07_01_01_world_2018_02_17_01_world_335.sql b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_01_world_2018_02_17_01_world_335.sql
index a9f15371781..a9f15371781 100644
--- a/sql/updates/world/master/2021_07_01_01_world_2018_02_17_01_world_335.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_01_world_2018_02_17_01_world_335.sql
diff --git a/sql/updates/world/master/2021_07_01_02_world_2018_02_17_03_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_02_world_2018_02_17_03_world.sql
index e06a0818321..e06a0818321 100644
--- a/sql/updates/world/master/2021_07_01_02_world_2018_02_17_03_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_02_world_2018_02_17_03_world.sql
diff --git a/sql/updates/world/master/2021_07_01_03_world_2018_02_17_04_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_03_world_2018_02_17_04_world.sql
index bd8643534ec..bd8643534ec 100644
--- a/sql/updates/world/master/2021_07_01_03_world_2018_02_17_04_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_03_world_2018_02_17_04_world.sql
diff --git a/sql/updates/world/master/2021_07_01_04_world_2018_02_17_05_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_04_world_2018_02_17_05_world.sql
index bcf0b3fc68b..bcf0b3fc68b 100644
--- a/sql/updates/world/master/2021_07_01_04_world_2018_02_17_05_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_04_world_2018_02_17_05_world.sql
diff --git a/sql/updates/world/master/2021_07_01_05_world_2018_02_17_06_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_05_world_2018_02_17_06_world.sql
index 34de419964c..34de419964c 100644
--- a/sql/updates/world/master/2021_07_01_05_world_2018_02_17_06_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_05_world_2018_02_17_06_world.sql
diff --git a/sql/updates/world/master/2021_07_01_06_world_2018_02_19_18_world_335.sql b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_06_world_2018_02_19_18_world_335.sql
index 129ad218fd3..129ad218fd3 100644
--- a/sql/updates/world/master/2021_07_01_06_world_2018_02_19_18_world_335.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_06_world_2018_02_19_18_world_335.sql
diff --git a/sql/updates/world/master/2021_07_01_07_world_2018_02_21_01_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_07_world_2018_02_21_01_world.sql
index e29c989981b..e29c989981b 100644
--- a/sql/updates/world/master/2021_07_01_07_world_2018_02_21_01_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_07_world_2018_02_21_01_world.sql
diff --git a/sql/updates/world/master/2021_07_01_08_world_2018_02_24_00_world_335.sql b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_08_world_2018_02_24_00_world_335.sql
index 9d87518b782..9d87518b782 100644
--- a/sql/updates/world/master/2021_07_01_08_world_2018_02_24_00_world_335.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_08_world_2018_02_24_00_world_335.sql
diff --git a/sql/updates/world/master/2021_07_01_09_world_2018_02_24_02_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_09_world_2018_02_24_02_world.sql
index d2a4cdd79d4..d2a4cdd79d4 100644
--- a/sql/updates/world/master/2021_07_01_09_world_2018_02_24_02_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_09_world_2018_02_24_02_world.sql
diff --git a/sql/updates/world/master/2021_07_01_10_world_2018_02_24_03_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_10_world_2018_02_24_03_world.sql
index 294be6a9c8f..294be6a9c8f 100644
--- a/sql/updates/world/master/2021_07_01_10_world_2018_02_24_03_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_10_world_2018_02_24_03_world.sql
diff --git a/sql/updates/world/master/2021_07_01_11_world_2018_02_24_04_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_11_world_2018_02_24_04_world.sql
index 167b959156d..167b959156d 100644
--- a/sql/updates/world/master/2021_07_01_11_world_2018_02_24_04_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_11_world_2018_02_24_04_world.sql
diff --git a/sql/updates/world/master/2021_07_01_12_world_2018_02_24_05_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_12_world_2018_02_24_05_world.sql
index 0ff76b9a900..0ff76b9a900 100644
--- a/sql/updates/world/master/2021_07_01_12_world_2018_02_24_05_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_12_world_2018_02_24_05_world.sql
diff --git a/sql/updates/world/master/2021_07_01_13_world_2018_02_24_06_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_13_world_2018_02_24_06_world.sql
index b330e6ec8ed..b330e6ec8ed 100644
--- a/sql/updates/world/master/2021_07_01_13_world_2018_02_24_06_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_13_world_2018_02_24_06_world.sql
diff --git a/sql/updates/world/master/2021_07_01_14_world_2018_02_25_00_world_335.sql b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_14_world_2018_02_25_00_world_335.sql
index 239bfd90a9c..239bfd90a9c 100644
--- a/sql/updates/world/master/2021_07_01_14_world_2018_02_25_00_world_335.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_07_01_14_world_2018_02_25_00_world_335.sql
diff --git a/sql/updates/world/master/2021_07_04_00_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_07_04_00_world.sql
index dfbf7d77dcf..dfbf7d77dcf 100644
--- a/sql/updates/world/master/2021_07_04_00_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_07_04_00_world.sql
diff --git a/sql/updates/world/master/2021_07_27_00_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_07_27_00_world.sql
index 7f8bd41344d..7f8bd41344d 100644
--- a/sql/updates/world/master/2021_07_27_00_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_07_27_00_world.sql
diff --git a/sql/updates/world/master/2021_08_08_00_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_08_00_world.sql
index e9d2d569bef..e9d2d569bef 100644
--- a/sql/updates/world/master/2021_08_08_00_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_08_00_world.sql
diff --git a/sql/updates/world/master/2021_08_08_01_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_08_01_world.sql
index 9eb2834406c..9eb2834406c 100644
--- a/sql/updates/world/master/2021_08_08_01_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_08_01_world.sql
diff --git a/sql/updates/world/master/2021_08_12_00_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_12_00_world.sql
index 7610d82b72a..7610d82b72a 100644
--- a/sql/updates/world/master/2021_08_12_00_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_12_00_world.sql
diff --git a/sql/updates/world/master/2021_08_12_01_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_12_01_world.sql
index f56cf370771..f56cf370771 100644
--- a/sql/updates/world/master/2021_08_12_01_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_12_01_world.sql
diff --git a/sql/updates/world/master/2021_08_12_02_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_12_02_world.sql
index a5ef00c9133..a5ef00c9133 100644
--- a/sql/updates/world/master/2021_08_12_02_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_12_02_world.sql
diff --git a/sql/updates/world/master/2021_08_12_03_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_12_03_world.sql
index 99c9a377872..99c9a377872 100644
--- a/sql/updates/world/master/2021_08_12_03_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_12_03_world.sql
diff --git a/sql/updates/world/master/2021_08_12_04_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_12_04_world.sql
index 944c3c2724c..944c3c2724c 100644
--- a/sql/updates/world/master/2021_08_12_04_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_12_04_world.sql
diff --git a/sql/updates/world/master/2021_08_16_00_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_16_00_world.sql
index fa4aecf56d4..fa4aecf56d4 100644
--- a/sql/updates/world/master/2021_08_16_00_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_16_00_world.sql
diff --git a/sql/updates/world/master/2021_08_16_01_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_16_01_world.sql
index c1925076955..c1925076955 100644
--- a/sql/updates/world/master/2021_08_16_01_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_16_01_world.sql
diff --git a/sql/updates/world/master/2021_08_17_00_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_00_world.sql
index 3c3b9135cb4..3c3b9135cb4 100644
--- a/sql/updates/world/master/2021_08_17_00_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_00_world.sql
diff --git a/sql/updates/world/master/2021_08_17_01_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_01_world.sql
index eb744a0cdc5..eb744a0cdc5 100644
--- a/sql/updates/world/master/2021_08_17_01_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_01_world.sql
diff --git a/sql/updates/world/master/2021_08_17_02_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_02_world.sql
index 93b2b8c956d..93b2b8c956d 100644
--- a/sql/updates/world/master/2021_08_17_02_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_02_world.sql
diff --git a/sql/updates/world/master/2021_08_17_03_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_03_world.sql
index 12a31e0c3e1..12a31e0c3e1 100644
--- a/sql/updates/world/master/2021_08_17_03_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_03_world.sql
diff --git a/sql/updates/world/master/2021_08_17_04_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_04_world.sql
index d440803e377..d440803e377 100644
--- a/sql/updates/world/master/2021_08_17_04_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_04_world.sql
diff --git a/sql/updates/world/master/2021_08_17_05_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_05_world.sql
index 7ed36a619d0..7ed36a619d0 100644
--- a/sql/updates/world/master/2021_08_17_05_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_05_world.sql
diff --git a/sql/updates/world/master/2021_08_17_06_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_06_world.sql
index 64c5af6ba32..64c5af6ba32 100644
--- a/sql/updates/world/master/2021_08_17_06_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_06_world.sql
diff --git a/sql/updates/world/master/2021_08_17_07_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_07_world.sql
index 956918cc7a7..956918cc7a7 100644
--- a/sql/updates/world/master/2021_08_17_07_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_07_world.sql
diff --git a/sql/updates/world/master/2021_08_17_08_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_08_world.sql
index 48b180f3861..48b180f3861 100644
--- a/sql/updates/world/master/2021_08_17_08_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_08_world.sql
diff --git a/sql/updates/world/master/2021_08_17_09_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_09_world.sql
index 21e1c1cdd76..21e1c1cdd76 100644
--- a/sql/updates/world/master/2021_08_17_09_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_17_09_world.sql
diff --git a/sql/updates/world/master/2021_08_18_00_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_18_00_world.sql
index 5266d3cf9cc..5266d3cf9cc 100644
--- a/sql/updates/world/master/2021_08_18_00_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_18_00_world.sql
diff --git a/sql/updates/world/master/2021_08_18_01_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_18_01_world.sql
index 7824b3a66f3..7824b3a66f3 100644
--- a/sql/updates/world/master/2021_08_18_01_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_18_01_world.sql
diff --git a/sql/updates/world/master/2021_08_18_02_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_18_02_world.sql
index d9f4e3eda90..d9f4e3eda90 100644
--- a/sql/updates/world/master/2021_08_18_02_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_18_02_world.sql
diff --git a/sql/updates/world/master/2021_08_18_03_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_18_03_world.sql
index 01efb408476..01efb408476 100644
--- a/sql/updates/world/master/2021_08_18_03_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_18_03_world.sql
diff --git a/sql/updates/world/master/2021_08_18_04_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_18_04_world.sql
index b72fe34b8f1..b72fe34b8f1 100644
--- a/sql/updates/world/master/2021_08_18_04_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_18_04_world.sql
diff --git a/sql/updates/world/master/2021_08_18_05_world.sql b/sql/old/9.x/world/21071_2021_08_18/2021_08_18_05_world.sql
index 2210d2d8b8a..2210d2d8b8a 100644
--- a/sql/updates/world/master/2021_08_18_05_world.sql
+++ b/sql/old/9.x/world/21071_2021_08_18/2021_08_18_05_world.sql
diff --git a/sql/updates/auth/master/2021_08_18_00_auth.sql b/sql/updates/auth/master/2021_08_18_00_auth.sql
new file mode 100644
index 00000000000..075b853b378
--- /dev/null
+++ b/sql/updates/auth/master/2021_08_18_00_auth.sql
@@ -0,0 +1,3 @@
+-- TDB 910.21081 auth
+UPDATE `updates` SET `state`='ARCHIVED',`speed`=0;
+REPLACE INTO `updates_include` (`path`, `state`) VALUES ('$/sql/old/9.x/auth', 'ARCHIVED');
diff --git a/sql/updates/characters/master/2021_08_18_00_characters.sql b/sql/updates/characters/master/2021_08_18_00_characters.sql
new file mode 100644
index 00000000000..3b9d8c7e476
--- /dev/null
+++ b/sql/updates/characters/master/2021_08_18_00_characters.sql
@@ -0,0 +1,3 @@
+-- TDB 910.21081 characters
+UPDATE `updates` SET `state`='ARCHIVED',`speed`=0;
+REPLACE INTO `updates_include` (`path`, `state`) VALUES ('$/sql/old/9.x/characters', 'ARCHIVED');
diff --git a/sql/updates/hotfixes/master/2021_08_18_06_hotfixes.sql b/sql/updates/hotfixes/master/2021_08_18_06_hotfixes.sql
new file mode 100644
index 00000000000..e52470a2ed8
--- /dev/null
+++ b/sql/updates/hotfixes/master/2021_08_18_06_hotfixes.sql
@@ -0,0 +1,3 @@
+-- TDB 910.21081 hotfixes
+UPDATE `updates` SET `state`='ARCHIVED',`speed`=0;
+REPLACE INTO `updates_include` (`path`, `state`) VALUES ('$/sql/old/9.x/hotfixes', 'ARCHIVED');
diff --git a/sql/updates/world/master/2021_08_18_06_world.sql b/sql/updates/world/master/2021_08_18_06_world.sql
new file mode 100644
index 00000000000..658862513b8
--- /dev/null
+++ b/sql/updates/world/master/2021_08_18_06_world.sql
@@ -0,0 +1,4 @@
+-- TDB 910.21081 world
+UPDATE `version` SET `db_version`='TDB 910.21081', `cache_id`=21081 LIMIT 1;
+UPDATE `updates` SET `state`='ARCHIVED',`speed`=0;
+REPLACE INTO `updates_include` (`path`, `state`) VALUES ('$/sql/old/9.x/world', 'ARCHIVED');