152 files changed, 416 insertions, 345 deletions

diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 1f5ccf9f069..e29c804468c 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -24,31 +24,31 @@ DROP TABLE IF EXISTS `account`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `account` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Identifier',
-  `username` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `username` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `salt` binary(32) DEFAULT NULL,
   `verifier` binary(32) DEFAULT NULL,
   `session_key_auth` binary(40) DEFAULT NULL,
   `session_key_bnet` varbinary(64) DEFAULT NULL,
-  `sha_pass_hash` varchar(40) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `v` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'dummy value, use `verifier` instead',
-  `s` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'dummy value, use `salt` instead',
+  `sha_pass_hash` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `v` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'dummy value, use `verifier` instead',
+  `s` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'dummy value, use `salt` instead',
   `totp_secret` varbinary(128) DEFAULT NULL,
-  `email` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `reg_mail` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `email` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `reg_mail` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `joindate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `last_ip` varchar(15) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '127.0.0.1',
-  `last_attempt_ip` varchar(15) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '127.0.0.1',
+  `last_ip` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '127.0.0.1',
+  `last_attempt_ip` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '127.0.0.1',
   `failed_logins` int unsigned NOT NULL DEFAULT '0',
   `locked` tinyint unsigned NOT NULL DEFAULT '0',
-  `lock_country` varchar(2) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '00',
+  `lock_country` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '00',
   `last_login` timestamp NULL DEFAULT NULL,
   `online` tinyint unsigned NOT NULL DEFAULT '0',
   `expansion` tinyint unsigned NOT NULL DEFAULT '8',
   `mutetime` bigint NOT NULL DEFAULT '0',
-  `mutereason` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `muteby` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `mutereason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `muteby` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `locale` tinyint unsigned NOT NULL DEFAULT '0',
-  `os` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `os` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `recruiter` int unsigned NOT NULL DEFAULT '0',
   `battlenet_account` int unsigned DEFAULT NULL,
   `battlenet_index` tinyint unsigned DEFAULT NULL,
@@ -79,7 +79,7 @@ CREATE TABLE `account_access` (
   `AccountID` int unsigned NOT NULL,
   `SecurityLevel` tinyint unsigned NOT NULL,
   `RealmID` int NOT NULL DEFAULT '-1',
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`AccountID`,`RealmID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -104,8 +104,8 @@ CREATE TABLE `account_banned` (
   `id` int unsigned NOT NULL DEFAULT '0' COMMENT 'Account id',
   `bandate` int unsigned NOT NULL DEFAULT '0',
   `unbandate` int unsigned NOT NULL DEFAULT '0',
-  `bannedby` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `banreason` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `bannedby` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `banreason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `active` tinyint unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`,`bandate`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Ban List';
@@ -132,7 +132,7 @@ CREATE TABLE `account_last_played_character` (
   `region` tinyint unsigned NOT NULL,
   `battlegroup` tinyint unsigned NOT NULL,
   `realmId` int unsigned DEFAULT NULL,
-  `characterName` varchar(12) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `characterName` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `characterGUID` bigint unsigned DEFAULT NULL,
   `lastPlayedTime` int unsigned DEFAULT NULL,
   PRIMARY KEY (`accountId`,`region`,`battlegroup`)
@@ -159,8 +159,8 @@ CREATE TABLE `account_muted` (
   `guid` int unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
   `mutedate` int unsigned NOT NULL DEFAULT '0',
   `mutetime` int unsigned NOT NULL DEFAULT '0',
-  `mutedby` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `mutereason` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `mutedby` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `mutereason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`guid`,`mutedate`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='mute List';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -185,7 +185,7 @@ CREATE TABLE `autobroadcast` (
   `realmid` int NOT NULL DEFAULT '-1',
   `id` tinyint unsigned NOT NULL AUTO_INCREMENT,
   `weight` tinyint unsigned DEFAULT '1',
-  `text` longtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `text` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`id`,`realmid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -208,11 +208,11 @@ DROP TABLE IF EXISTS `battle_pet_declinedname`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `battle_pet_declinedname` (
   `guid` bigint NOT NULL,
-  `genitive` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `dative` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `accusative` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `instrumental` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `prepositional` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `genitive` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `dative` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `accusative` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `instrumental` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `prepositional` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   PRIMARY KEY (`guid`),
   CONSTRAINT `fk_battle_pet__battle_pet_declinedname` FOREIGN KEY (`guid`) REFERENCES `battle_pets` (`guid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -270,7 +270,7 @@ CREATE TABLE `battle_pets` (
   `health` int NOT NULL DEFAULT '1',
   `quality` tinyint NOT NULL DEFAULT '0',
   `flags` smallint NOT NULL DEFAULT '0',
-  `name` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `name` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `nameTimestamp` bigint NOT NULL DEFAULT '0',
   `owner` bigint DEFAULT NULL,
   `ownerRealmId` int DEFAULT NULL,
@@ -298,8 +298,8 @@ CREATE TABLE `battlenet_account_bans` (
   `id` int unsigned NOT NULL DEFAULT '0' COMMENT 'Account id',
   `bandate` int unsigned NOT NULL DEFAULT '0',
   `unbandate` int unsigned NOT NULL DEFAULT '0',
-  `bannedby` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `banreason` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `bannedby` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `banreason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`id`,`bandate`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Ban List';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -395,19 +395,19 @@ DROP TABLE IF EXISTS `battlenet_accounts`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `battlenet_accounts` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Identifier',
-  `email` varchar(320) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `sha_pass_hash` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `email` varchar(320) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `sha_pass_hash` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `joindate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `last_ip` varchar(15) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '127.0.0.1',
+  `last_ip` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '127.0.0.1',
   `failed_logins` int unsigned NOT NULL DEFAULT '0',
   `locked` tinyint unsigned NOT NULL DEFAULT '0',
-  `lock_country` varchar(2) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '00',
+  `lock_country` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '00',
   `last_login` timestamp NULL DEFAULT NULL,
   `online` tinyint unsigned NOT NULL DEFAULT '0',
   `locale` tinyint unsigned NOT NULL DEFAULT '0',
-  `os` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `os` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `LastCharacterUndelete` int unsigned NOT NULL DEFAULT '0',
-  `LoginTicket` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `LoginTicket` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `LoginTicketExpiry` int unsigned DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Account System';
@@ -483,12 +483,12 @@ CREATE TABLE `build_info` (
   `majorVersion` int DEFAULT NULL,
   `minorVersion` int DEFAULT NULL,
   `bugfixVersion` int DEFAULT NULL,
-  `hotfixVersion` char(3) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `winAuthSeed` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `win64AuthSeed` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `mac64AuthSeed` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `winChecksumSeed` varchar(40) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `macChecksumSeed` varchar(40) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `hotfixVersion` char(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `winAuthSeed` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `win64AuthSeed` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `mac64AuthSeed` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `winChecksumSeed` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `macChecksumSeed` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`build`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -635,11 +635,11 @@ DROP TABLE IF EXISTS `ip_banned`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `ip_banned` (
-  `ip` varchar(15) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '127.0.0.1',
+  `ip` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '127.0.0.1',
   `bandate` int unsigned NOT NULL,
   `unbandate` int unsigned NOT NULL,
-  `bannedby` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '[Console]',
-  `banreason` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'no reason',
+  `bannedby` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '[Console]',
+  `banreason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'no reason',
   PRIMARY KEY (`ip`,`bandate`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Banned IPs';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -663,7 +663,7 @@ DROP TABLE IF EXISTS `logs`;
 CREATE TABLE `logs` (
   `time` int unsigned NOT NULL,
   `realm` int unsigned NOT NULL,
-  `type` varchar(250) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `type` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `level` tinyint unsigned NOT NULL DEFAULT '0',
   `string` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -691,11 +691,11 @@ CREATE TABLE `logs_ip_actions` (
   `character_guid` bigint unsigned NOT NULL COMMENT 'Character Guid',
   `realm_id` int unsigned NOT NULL DEFAULT '0' COMMENT 'Realm ID',
   `type` tinyint unsigned NOT NULL,
-  `ip` varchar(15) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '127.0.0.1',
-  `systemnote` text COLLATE utf8mb4_unicode_ci COMMENT 'Notes inserted by system',
+  `ip` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '127.0.0.1',
+  `systemnote` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT 'Notes inserted by system',
   `unixtime` int unsigned NOT NULL COMMENT 'Unixtime',
   `time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Timestamp',
-  `comment` text COLLATE utf8mb4_unicode_ci COMMENT 'Allows users to add a comment',
+  `comment` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT 'Allows users to add a comment',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Used to log ips of individual actions';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1476,7 +1476,7 @@ DROP TABLE IF EXISTS `rbac_permissions`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `rbac_permissions` (
   `id` int unsigned NOT NULL DEFAULT '0' COMMENT 'Permission id',
-  `name` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Permission name',
+  `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Permission name',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Permission List';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2217,10 +2217,10 @@ DROP TABLE IF EXISTS `realmlist`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `realmlist` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `address` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '127.0.0.1',
-  `localAddress` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '127.0.0.1',
-  `localSubnetMask` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '255.255.255.0',
+  `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '127.0.0.1',
+  `localAddress` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '127.0.0.1',
+  `localSubnetMask` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '255.255.255.0',
   `port` smallint unsigned NOT NULL DEFAULT '8085',
   `icon` tinyint unsigned NOT NULL DEFAULT '0',
   `flag` tinyint unsigned NOT NULL DEFAULT '2',
@@ -2255,7 +2255,7 @@ DROP TABLE IF EXISTS `secret_digest`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `secret_digest` (
   `id` int unsigned NOT NULL,
-  `digest` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `digest` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2277,9 +2277,9 @@ DROP TABLE IF EXISTS `updates`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `updates` (
-  `name` varchar(200) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'filename with extension of the update.',
-  `hash` char(40) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT 'sha1 hash of the sql file.',
-  `state` enum('RELEASED','ARCHIVED') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
+  `name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'filename with extension of the update.',
+  `hash` char(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT 'sha1 hash of the sql file.',
+  `state` enum('RELEASED','ARCHIVED') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
   `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
   `speed` int unsigned NOT NULL DEFAULT '0' COMMENT 'time the query takes to apply in ms.',
   PRIMARY KEY (`name`)
@@ -2528,7 +2528,8 @@ INSERT INTO `updates` VALUES
 ('2021_12_31_00_auth.sql','16AA1CFB93CC42DC9CC7C0C787C64D3CE9662EE5','ARCHIVED','2022-01-02 21:18:52',0),
 ('2021_12_31_01_auth.sql','336E62A8850A3E78A1D0BD3E81FFD5769184BDF8','ARCHIVED','2021-12-31 15:58:32',0),
 ('2022_01_02_00_auth.sql','F0AF198C5F7529508A5DB1F29D153256368AD1B4','ARCHIVED','2022-01-02 21:22:35',0),
-('2022_01_08_00_auth.sql','460BF77FB1751EB6B914FBA90637C8F266CCDF4D','ARCHIVED','2022-01-08 03:41:46',0);
+('2022_01_08_00_auth.sql','3C9853058A77817DD62943D0332418D84CA6BDA1','ARCHIVED','2022-01-15 23:21:37',0),
+('2022_01_15_00_auth.sql','11552D29BEDF73626FB8D932AB4362882964B4F0','ARCHIVED','2022-01-15 23:24:57',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2540,8 +2541,8 @@ DROP TABLE IF EXISTS `updates_include`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `updates_include` (
-  `path` varchar(200) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
-  `state` enum('RELEASED','ARCHIVED') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
+  `path` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
+  `state` enum('RELEASED','ARCHIVED') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
   PRIMARY KEY (`path`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='List of directories where we want to include sql updates.';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2574,7 +2575,7 @@ CREATE TABLE `uptime` (
   `starttime` int unsigned NOT NULL DEFAULT '0',
   `uptime` int unsigned NOT NULL DEFAULT '0',
   `maxplayers` smallint unsigned NOT NULL DEFAULT '0',
-  `revision` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Trinitycore',
+  `revision` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Trinitycore',
   PRIMARY KEY (`realmid`,`starttime`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Uptime system';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2637,4 +2638,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 2022-01-02 21:22:37
+-- Dump completed on 2022-01-15 23:25:00
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index bcb4f2c17e1..26ccf16d8e5 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -103,7 +103,7 @@ DROP TABLE IF EXISTS `arena_team`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `arena_team` (
   `arenaTeamId` int unsigned NOT NULL DEFAULT '0',
-  `name` varchar(24) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `name` varchar(24) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `captainGuid` bigint unsigned NOT NULL DEFAULT '0',
   `type` tinyint unsigned NOT NULL DEFAULT '0',
   `rating` smallint unsigned NOT NULL DEFAULT '0',
@@ -271,8 +271,8 @@ DROP TABLE IF EXISTS `bugreport`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `bugreport` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Identifier',
-  `type` longtext COLLATE utf8mb4_unicode_ci NOT NULL,
-  `content` longtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `type` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Debug System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -296,8 +296,8 @@ DROP TABLE IF EXISTS `calendar_events`;
 CREATE TABLE `calendar_events` (
   `EventID` bigint unsigned NOT NULL DEFAULT '0',
   `Owner` bigint unsigned NOT NULL DEFAULT '0',
-  `Title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `Description` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `Title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `Description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `EventType` tinyint unsigned NOT NULL DEFAULT '4',
   `TextureID` int NOT NULL DEFAULT '-1',
   `Date` bigint NOT NULL DEFAULT '0',
@@ -331,7 +331,7 @@ CREATE TABLE `calendar_invites` (
   `Status` tinyint unsigned NOT NULL DEFAULT '0',
   `ResponseTime` bigint NOT NULL DEFAULT '0',
   `ModerationRank` tinyint unsigned NOT NULL DEFAULT '0',
-  `Note` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `Note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   PRIMARY KEY (`InviteID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -353,12 +353,12 @@ DROP TABLE IF EXISTS `channels`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `channels` (
-  `name` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `team` int unsigned NOT NULL,
   `announce` tinyint unsigned NOT NULL DEFAULT '1',
   `ownership` tinyint unsigned NOT NULL DEFAULT '1',
-  `password` varchar(128) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `bannedList` text COLLATE utf8mb4_unicode_ci,
+  `password` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `bannedList` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `lastUsed` bigint unsigned NOT NULL,
   PRIMARY KEY (`name`,`team`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Channel System';
@@ -599,8 +599,8 @@ CREATE TABLE `character_banned` (
   `guid` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
   `bandate` bigint NOT NULL DEFAULT '0',
   `unbandate` bigint NOT NULL DEFAULT '0',
-  `bannedby` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `banreason` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `bannedby` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `banreason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `active` tinyint unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`guid`,`bandate`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Ban List';
@@ -679,7 +679,7 @@ DROP TABLE IF EXISTS `character_cuf_profiles`;
 CREATE TABLE `character_cuf_profiles` (
   `guid` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'Character Guid',
   `id` tinyint unsigned NOT NULL COMMENT 'Profile Id (0-4)',
-  `name` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Profile Name',
+  `name` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Profile Name',
   `frameHeight` smallint unsigned NOT NULL DEFAULT '0' COMMENT 'Profile Frame Height',
   `frameWidth` smallint unsigned NOT NULL DEFAULT '0' COMMENT 'Profile Frame Width',
   `sortBy` tinyint unsigned NOT NULL DEFAULT '0' COMMENT 'Frame Sort By',
@@ -765,11 +765,11 @@ DROP TABLE IF EXISTS `character_declinedname`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `character_declinedname` (
   `guid` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
-  `genitive` varchar(15) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `dative` varchar(15) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `accusative` varchar(15) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `instrumental` varchar(15) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `prepositional` varchar(15) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `genitive` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `dative` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `accusative` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `instrumental` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `prepositional` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   PRIMARY KEY (`guid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -794,8 +794,8 @@ CREATE TABLE `character_equipmentsets` (
   `guid` bigint unsigned NOT NULL DEFAULT '0',
   `setguid` bigint unsigned NOT NULL AUTO_INCREMENT,
   `setindex` tinyint unsigned NOT NULL DEFAULT '0',
-  `name` varchar(31) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `iconname` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `name` varchar(31) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `iconname` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `ignore_mask` int unsigned NOT NULL DEFAULT '0',
   `AssignedSpecIndex` int NOT NULL DEFAULT '-1',
   `item0` bigint unsigned NOT NULL DEFAULT '0',
@@ -1162,13 +1162,13 @@ CREATE TABLE `character_pet` (
   `level` smallint unsigned NOT NULL DEFAULT '1',
   `exp` int unsigned NOT NULL DEFAULT '0',
   `Reactstate` tinyint unsigned NOT NULL DEFAULT '0',
-  `name` varchar(21) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Pet',
+  `name` varchar(21) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Pet',
   `renamed` tinyint unsigned NOT NULL DEFAULT '0',
   `slot` tinyint unsigned NOT NULL DEFAULT '0',
   `curhealth` int unsigned NOT NULL DEFAULT '1',
   `curmana` int unsigned NOT NULL DEFAULT '0',
   `savetime` int unsigned NOT NULL DEFAULT '0',
-  `abdata` text COLLATE utf8mb4_unicode_ci,
+  `abdata` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `specialization` smallint unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`),
@@ -1195,11 +1195,11 @@ DROP TABLE IF EXISTS `character_pet_declinedname`;
 CREATE TABLE `character_pet_declinedname` (
   `id` int unsigned NOT NULL DEFAULT '0',
   `owner` int unsigned NOT NULL DEFAULT '0',
-  `genitive` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `dative` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `accusative` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `instrumental` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `prepositional` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `genitive` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `dative` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `accusative` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `instrumental` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `prepositional` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   KEY `owner_key` (`owner`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -1524,7 +1524,7 @@ CREATE TABLE `character_social` (
   `guid` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'Character Global Unique Identifier',
   `friend` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'Friend Global Unique Identifier',
   `flags` tinyint unsigned NOT NULL DEFAULT '0' COMMENT 'Friend Flags',
-  `note` varchar(48) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'Friend Note',
+  `note` varchar(48) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'Friend Note',
   PRIMARY KEY (`guid`,`friend`,`flags`),
   KEY `friend` (`friend`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Player System';
@@ -1702,8 +1702,8 @@ CREATE TABLE `character_transmog_outfits` (
   `guid` bigint NOT NULL DEFAULT '0',
   `setguid` bigint NOT NULL AUTO_INCREMENT,
   `setindex` tinyint unsigned NOT NULL DEFAULT '0',
-  `name` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `iconname` varchar(256) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `iconname` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `ignore_mask` int NOT NULL DEFAULT '0',
   `appearance0` int NOT NULL DEFAULT '0',
   `appearance1` int NOT NULL DEFAULT '0',
@@ -1758,7 +1758,7 @@ CREATE TABLE `character_void_storage` (
   `fixedScalingLevel` int unsigned DEFAULT '0',
   `artifactKnowledgeLevel` int unsigned DEFAULT '0',
   `context` tinyint unsigned NOT NULL DEFAULT '0',
-  `bonusListIDs` text COLLATE utf8mb4_unicode_ci,
+  `bonusListIDs` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`itemId`),
   UNIQUE KEY `idx_player_slot` (`playerGuid`,`slot`),
   KEY `idx_player` (`playerGuid`)
@@ -1784,7 +1784,7 @@ DROP TABLE IF EXISTS `characters`;
 CREATE TABLE `characters` (
   `guid` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
   `account` int unsigned NOT NULL DEFAULT '0' COMMENT 'Account Identifier',
-  `name` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `name` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `slot` tinyint unsigned NOT NULL DEFAULT '0',
   `race` tinyint unsigned NOT NULL DEFAULT '0',
   `class` tinyint unsigned NOT NULL DEFAULT '0',
@@ -1806,7 +1806,7 @@ CREATE TABLE `characters` (
   `raidDifficulty` tinyint unsigned NOT NULL DEFAULT '14',
   `legacyRaidDifficulty` tinyint unsigned NOT NULL DEFAULT '3',
   `orientation` float NOT NULL DEFAULT '0',
-  `taximask` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `taximask` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `online` tinyint unsigned NOT NULL DEFAULT '0',
   `createTime` bigint NOT NULL DEFAULT '0',
   `createMode` tinyint NOT NULL DEFAULT '0',
@@ -1830,7 +1830,7 @@ CREATE TABLE `characters` (
   `at_login` smallint unsigned NOT NULL DEFAULT '0',
   `zone` smallint unsigned NOT NULL DEFAULT '0',
   `death_expire_time` bigint NOT NULL DEFAULT '0',
-  `taxi_path` text COLLATE utf8mb4_unicode_ci,
+  `taxi_path` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `totalKills` int unsigned NOT NULL DEFAULT '0',
   `todayKills` smallint unsigned NOT NULL DEFAULT '0',
   `yesterdayKills` smallint unsigned NOT NULL DEFAULT '0',
@@ -1848,12 +1848,12 @@ CREATE TABLE `characters` (
   `latency` int unsigned NOT NULL DEFAULT '0',
   `activeTalentGroup` tinyint unsigned NOT NULL DEFAULT '0',
   `lootSpecId` int unsigned NOT NULL DEFAULT '0',
-  `exploredZones` longtext COLLATE utf8mb4_unicode_ci,
-  `equipmentCache` longtext COLLATE utf8mb4_unicode_ci,
-  `knownTitles` longtext COLLATE utf8mb4_unicode_ci,
+  `exploredZones` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `equipmentCache` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `knownTitles` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `actionBars` tinyint unsigned NOT NULL DEFAULT '0',
   `deleteInfos_Account` int unsigned DEFAULT NULL,
-  `deleteInfos_Name` varchar(12) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `deleteInfos_Name` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `deleteDate` bigint DEFAULT NULL,
   `honor` int unsigned NOT NULL DEFAULT '0',
   `honorLevel` int unsigned NOT NULL DEFAULT '1',
@@ -1891,7 +1891,7 @@ CREATE TABLE `corpse` (
   `orientation` float NOT NULL DEFAULT '0',
   `mapId` smallint unsigned NOT NULL DEFAULT '0' COMMENT 'Map Identifier',
   `displayId` int unsigned NOT NULL DEFAULT '0',
-  `itemCache` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `itemCache` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `race` tinyint unsigned NOT NULL DEFAULT '0',
   `class` tinyint unsigned NOT NULL DEFAULT '0',
   `gender` tinyint unsigned NOT NULL DEFAULT '0',
@@ -2021,7 +2021,7 @@ DROP TABLE IF EXISTS `gm_bug`;
 CREATE TABLE `gm_bug` (
   `id` int unsigned NOT NULL,
   `playerGuid` bigint unsigned NOT NULL,
-  `note` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `note` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `createTime` bigint NOT NULL DEFAULT '0',
   `mapId` smallint unsigned NOT NULL DEFAULT '0',
   `posX` float NOT NULL DEFAULT '0',
@@ -2030,7 +2030,7 @@ CREATE TABLE `gm_bug` (
   `facing` float NOT NULL DEFAULT '0',
   `closedBy` bigint NOT NULL DEFAULT '0',
   `assignedTo` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'GUID of admin to whom ticket is assigned',
-  `comment` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `comment` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2054,7 +2054,7 @@ DROP TABLE IF EXISTS `gm_complaint`;
 CREATE TABLE `gm_complaint` (
   `id` int unsigned NOT NULL,
   `playerGuid` bigint unsigned NOT NULL,
-  `note` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `note` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `createTime` bigint NOT NULL DEFAULT '0',
   `mapId` smallint unsigned NOT NULL DEFAULT '0',
   `posX` float NOT NULL DEFAULT '0',
@@ -2066,7 +2066,7 @@ CREATE TABLE `gm_complaint` (
   `reportLineIndex` int NOT NULL,
   `closedBy` bigint NOT NULL DEFAULT '0',
   `assignedTo` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'GUID of admin to whom ticket is assigned',
-  `comment` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `comment` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2091,7 +2091,7 @@ CREATE TABLE `gm_complaint_chatlog` (
   `complaintId` int unsigned NOT NULL,
   `lineId` int unsigned NOT NULL,
   `timestamp` bigint NOT NULL,
-  `text` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `text` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`complaintId`,`lineId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2115,7 +2115,7 @@ DROP TABLE IF EXISTS `gm_suggestion`;
 CREATE TABLE `gm_suggestion` (
   `id` int unsigned NOT NULL,
   `playerGuid` bigint unsigned NOT NULL,
-  `note` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `note` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `createTime` bigint NOT NULL DEFAULT '0',
   `mapId` smallint unsigned NOT NULL DEFAULT '0',
   `posX` float NOT NULL DEFAULT '0',
@@ -2124,7 +2124,7 @@ CREATE TABLE `gm_suggestion` (
   `facing` float NOT NULL DEFAULT '0',
   `closedBy` bigint NOT NULL DEFAULT '0',
   `assignedTo` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'GUID of admin to whom ticket is assigned',
-  `comment` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `comment` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2238,15 +2238,15 @@ DROP TABLE IF EXISTS `guild`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `guild` (
   `guildid` bigint unsigned NOT NULL DEFAULT '0',
-  `name` varchar(24) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `name` varchar(24) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `leaderguid` bigint unsigned NOT NULL DEFAULT '0',
   `EmblemStyle` tinyint unsigned NOT NULL DEFAULT '0',
   `EmblemColor` tinyint unsigned NOT NULL DEFAULT '0',
   `BorderStyle` tinyint unsigned NOT NULL DEFAULT '0',
   `BorderColor` tinyint unsigned NOT NULL DEFAULT '0',
   `BackgroundColor` tinyint unsigned NOT NULL DEFAULT '0',
-  `info` varchar(500) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `motd` varchar(256) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `info` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `motd` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `createdate` int unsigned NOT NULL DEFAULT '0',
   `BankMoney` bigint unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guildid`)
@@ -2273,7 +2273,7 @@ CREATE TABLE `guild_achievement` (
   `guildId` bigint unsigned NOT NULL,
   `achievement` int unsigned NOT NULL,
   `date` bigint NOT NULL DEFAULT '0',
-  `guids` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `guids` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`guildId`,`achievement`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2410,9 +2410,9 @@ DROP TABLE IF EXISTS `guild_bank_tab`;
 CREATE TABLE `guild_bank_tab` (
   `guildid` bigint unsigned NOT NULL DEFAULT '0',
   `TabId` tinyint unsigned NOT NULL DEFAULT '0',
-  `TabName` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `TabIcon` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `TabText` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `TabName` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `TabIcon` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `TabText` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`guildid`,`TabId`),
   KEY `guildid_key` (`guildid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -2469,8 +2469,8 @@ CREATE TABLE `guild_member` (
   `guildid` bigint unsigned NOT NULL COMMENT 'Guild Identificator',
   `guid` bigint unsigned NOT NULL,
   `rank` tinyint unsigned NOT NULL,
-  `pnote` varchar(31) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `offnote` varchar(31) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `pnote` varchar(31) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `offnote` varchar(31) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   UNIQUE KEY `guid_key` (`guid`),
   KEY `guildid_key` (`guildid`),
   KEY `guildid_rank_key` (`guildid`,`rank`)
@@ -2558,8 +2558,8 @@ DROP TABLE IF EXISTS `guild_rank`;
 CREATE TABLE `guild_rank` (
   `guildid` bigint unsigned NOT NULL DEFAULT '0',
   `rid` tinyint unsigned NOT NULL,
-  `RankOrder` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `rname` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `RankOrder` tinyint unsigned NOT NULL DEFAULT '0',
+  `rname` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `rights` int unsigned NOT NULL DEFAULT '0',
   `BankMoneyPerDay` int unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guildid`,`rid`),
@@ -2589,7 +2589,7 @@ CREATE TABLE `instance` (
   `resettime` bigint NOT NULL DEFAULT '0',
   `difficulty` tinyint unsigned NOT NULL DEFAULT '0',
   `completedEncounters` int unsigned NOT NULL DEFAULT '0',
-  `data` tinytext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `data` tinytext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `entranceId` int unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `map` (`map`),
@@ -2672,13 +2672,13 @@ CREATE TABLE `item_instance` (
   `giftCreatorGuid` bigint unsigned NOT NULL DEFAULT '0',
   `count` int unsigned NOT NULL DEFAULT '1',
   `duration` int NOT NULL DEFAULT '0',
-  `charges` tinytext COLLATE utf8mb4_unicode_ci,
+  `charges` tinytext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `flags` int unsigned NOT NULL DEFAULT '0',
-  `enchantments` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `enchantments` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `randomBonusListId` int unsigned NOT NULL DEFAULT '0',
   `durability` smallint unsigned NOT NULL DEFAULT '0',
   `playedTime` int unsigned NOT NULL DEFAULT '0',
-  `text` text COLLATE utf8mb4_unicode_ci,
+  `text` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `transmogrification` int unsigned NOT NULL DEFAULT '0',
   `enchantIllusion` int unsigned NOT NULL DEFAULT '0',
   `battlePetSpeciesId` int unsigned NOT NULL DEFAULT '0',
@@ -2686,7 +2686,7 @@ CREATE TABLE `item_instance` (
   `battlePetLevel` smallint unsigned NOT NULL DEFAULT '0',
   `battlePetDisplayId` int unsigned NOT NULL DEFAULT '0',
   `context` tinyint unsigned NOT NULL DEFAULT '0',
-  `bonusListIDs` text COLLATE utf8mb4_unicode_ci,
+  `bonusListIDs` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`guid`),
   KEY `idx_owner_guid` (`owner_guid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Item System';
@@ -2879,15 +2879,15 @@ DROP TABLE IF EXISTS `item_instance_gems`;
 CREATE TABLE `item_instance_gems` (
   `itemGuid` bigint unsigned NOT NULL,
   `gemItemId1` int unsigned NOT NULL DEFAULT '0',
-  `gemBonuses1` text COLLATE utf8mb4_unicode_ci,
+  `gemBonuses1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `gemContext1` tinyint unsigned NOT NULL DEFAULT '0',
   `gemScalingLevel1` int unsigned NOT NULL DEFAULT '0',
   `gemItemId2` int unsigned NOT NULL DEFAULT '0',
-  `gemBonuses2` text COLLATE utf8mb4_unicode_ci,
+  `gemBonuses2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `gemContext2` tinyint unsigned NOT NULL DEFAULT '0',
   `gemScalingLevel2` int unsigned NOT NULL DEFAULT '0',
   `gemItemId3` int unsigned NOT NULL DEFAULT '0',
-  `gemBonuses3` text COLLATE utf8mb4_unicode_ci,
+  `gemBonuses3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `gemContext3` tinyint unsigned NOT NULL DEFAULT '0',
   `gemScalingLevel3` int unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemGuid`)
@@ -2986,7 +2986,7 @@ CREATE TABLE `item_loot_items` (
   `needs_quest` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'quest drop',
   `rnd_bonus` int unsigned NOT NULL DEFAULT '0' COMMENT 'random bonus list added when originally rolled',
   `context` tinyint unsigned NOT NULL DEFAULT '0',
-  `bonus_list_ids` text COLLATE utf8mb4_unicode_ci COMMENT 'Space separated list of bonus list ids',
+  `bonus_list_ids` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT 'Space separated list of bonus list ids',
   PRIMARY KEY (`container_id`,`item_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3057,7 +3057,7 @@ DROP TABLE IF EXISTS `item_soulbound_trade_data`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `item_soulbound_trade_data` (
   `itemGuid` bigint unsigned NOT NULL COMMENT 'Item GUID',
-  `allowedPlayers` text COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Space separated GUID list of players who can receive this item in trade',
+  `allowedPlayers` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Space separated GUID list of players who can receive this item in trade',
   PRIMARY KEY (`itemGuid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Item Refund System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3109,8 +3109,8 @@ CREATE TABLE `mail` (
   `mailTemplateId` smallint unsigned NOT NULL DEFAULT '0',
   `sender` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'Character Global Unique Identifier',
   `receiver` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'Character Global Unique Identifier',
-  `subject` longtext COLLATE utf8mb4_unicode_ci,
-  `body` longtext COLLATE utf8mb4_unicode_ci,
+  `subject` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `body` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `has_items` tinyint unsigned NOT NULL DEFAULT '0',
   `expire_time` bigint NOT NULL DEFAULT '0',
   `deliver_time` bigint NOT NULL DEFAULT '0',
@@ -3301,7 +3301,7 @@ DROP TABLE IF EXISTS `petition`;
 CREATE TABLE `petition` (
   `ownerguid` bigint unsigned NOT NULL,
   `petitionguid` bigint unsigned DEFAULT '0',
-  `name` varchar(24) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `name` varchar(24) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`ownerguid`),
   UNIQUE KEY `index_ownerguid_petitionguid` (`ownerguid`,`petitionguid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Guild System';
@@ -3441,8 +3441,8 @@ CREATE TABLE `quest_tracker` (
   `quest_complete_time` datetime DEFAULT NULL,
   `quest_abandon_time` datetime DEFAULT NULL,
   `completed_by_gm` tinyint(1) NOT NULL DEFAULT '0',
-  `core_hash` varchar(120) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0',
-  `core_revision` varchar(120) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0',
+  `core_hash` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0',
+  `core_revision` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`,`character_guid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3464,7 +3464,7 @@ DROP TABLE IF EXISTS `reserved_name`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `reserved_name` (
-  `name` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `name` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   PRIMARY KEY (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Player Reserved Names';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3513,9 +3513,9 @@ DROP TABLE IF EXISTS `updates`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `updates` (
-  `name` varchar(200) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'filename with extension of the update.',
-  `hash` char(40) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT 'sha1 hash of the sql file.',
-  `state` enum('RELEASED','ARCHIVED') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
+  `name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'filename with extension of the update.',
+  `hash` char(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT 'sha1 hash of the sql file.',
+  `state` enum('RELEASED','ARCHIVED') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
   `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
   `speed` int unsigned NOT NULL DEFAULT '0' COMMENT 'time the query takes to apply in ms.',
   PRIMARY KEY (`name`)
@@ -3658,7 +3658,8 @@ INSERT INTO `updates` VALUES
 ('2021_12_31_01_characters.sql','336E62A8850A3E78A1D0BD3E81FFD5769184BDF8','ARCHIVED','2021-12-31 15:58:32',0),
 ('2021_12_31_02_characters.sql','C66A367F0AD7A9D6837238C21E91298413BD960C','ARCHIVED','2021-12-31 16:10:30',0),
 ('2022_01_02_00_characters.sql','5169A5BBACB42E6CEDE405D3C4843FD386CDF92E','ARCHIVED','2022-01-02 21:22:35',0),
-('2022_01_09_00_characters.sql','3AC51F589821C17027CBA861EF762A709430CDB3','RELEASED','2022-01-09 21:29:45',0);
+('2022_01_09_00_characters.sql','3AC51F589821C17027CBA861EF762A709430CDB3','ARCHIVED','2022-01-09 21:29:45',0),
+('2022_01_15_00_characters.sql','884EFB6592DC8A765E0C0BF8BF907B4E4733BB0C','ARCHIVED','2022-01-15 23:24:58',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3670,8 +3671,8 @@ DROP TABLE IF EXISTS `updates_include`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `updates_include` (
-  `path` varchar(200) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
-  `state` enum('RELEASED','ARCHIVED') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
+  `path` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
+  `state` enum('RELEASED','ARCHIVED') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
   PRIMARY KEY (`path`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='List of directories where we want to include sql updates.';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3725,7 +3726,7 @@ DROP TABLE IF EXISTS `worldstates`;
 CREATE TABLE `worldstates` (
   `entry` int unsigned NOT NULL DEFAULT '0',
   `value` int unsigned NOT NULL DEFAULT '0',
-  `comment` tinytext COLLATE utf8mb4_unicode_ci,
+  `comment` tinytext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`entry`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Variable Saves';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3760,4 +3761,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2022-01-02 21:22:38
+-- Dump completed on 2022-01-15 23:25:01
diff --git a/sql/base/dev/hotfixes_database.sql b/sql/base/dev/hotfixes_database.sql
index 390f1df5762..6019c1f03f3 100644
--- a/sql/base/dev/hotfixes_database.sql
+++ b/sql/base/dev/hotfixes_database.sql
@@ -2174,10 +2174,10 @@ CREATE TABLE `creature` (
   `DisplayIDProbability2` float NOT NULL DEFAULT '0',
   `DisplayIDProbability3` float NOT NULL DEFAULT '0',
   `DisplayIDProbability4` float NOT NULL DEFAULT '0',
-  `Name` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
-  `FemaleName` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
-  `SubName` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
-  `FemaleSubName` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Name` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `FemaleName` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `SubName` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `FemaleSubName` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `Type` mediumint unsigned NOT NULL DEFAULT '0',
   `Family` tinyint unsigned NOT NULL DEFAULT '0',
   `Classification` tinyint unsigned NOT NULL DEFAULT '0',
@@ -9114,6 +9114,45 @@ CREATE TABLE `ui_splash_screen_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `unit_condition`
+--
+
+DROP TABLE IF EXISTS `unit_condition`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `unit_condition` (
+  `ID` int unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint unsigned NOT NULL DEFAULT '0',
+  `Variable1` tinyint unsigned NOT NULL DEFAULT '0',
+  `Variable2` tinyint unsigned NOT NULL DEFAULT '0',
+  `Variable3` tinyint unsigned NOT NULL DEFAULT '0',
+  `Variable4` tinyint unsigned NOT NULL DEFAULT '0',
+  `Variable5` tinyint unsigned NOT NULL DEFAULT '0',
+  `Variable6` tinyint unsigned NOT NULL DEFAULT '0',
+  `Variable7` tinyint unsigned NOT NULL DEFAULT '0',
+  `Variable8` tinyint unsigned NOT NULL DEFAULT '0',
+  `Op1` tinyint NOT NULL DEFAULT '0',
+  `Op2` tinyint NOT NULL DEFAULT '0',
+  `Op3` tinyint NOT NULL DEFAULT '0',
+  `Op4` tinyint NOT NULL DEFAULT '0',
+  `Op5` tinyint NOT NULL DEFAULT '0',
+  `Op6` tinyint NOT NULL DEFAULT '0',
+  `Op7` tinyint NOT NULL DEFAULT '0',
+  `Op8` tinyint NOT NULL DEFAULT '0',
+  `Value1` int NOT NULL DEFAULT '0',
+  `Value2` int NOT NULL DEFAULT '0',
+  `Value3` int NOT NULL DEFAULT '0',
+  `Value4` int NOT NULL DEFAULT '0',
+  `Value5` int NOT NULL DEFAULT '0',
+  `Value6` int NOT NULL DEFAULT '0',
+  `Value7` int NOT NULL DEFAULT '0',
+  `Value8` int NOT NULL DEFAULT '0',
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`VerifiedBuild`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `unit_power_bar`
 --
 
@@ -9191,9 +9230,9 @@ DROP TABLE IF EXISTS `updates`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `updates` (
-  `name` varchar(200) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'filename with extension of the update.',
-  `hash` char(40) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT 'sha1 hash of the sql file.',
-  `state` enum('RELEASED','ARCHIVED') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
+  `name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'filename with extension of the update.',
+  `hash` char(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT 'sha1 hash of the sql file.',
+  `state` enum('RELEASED','ARCHIVED') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
   `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
   `speed` int unsigned NOT NULL DEFAULT '0' COMMENT 'time the query takes to apply in ms.',
   PRIMARY KEY (`name`)
@@ -9208,8 +9247,8 @@ DROP TABLE IF EXISTS `updates_include`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `updates_include` (
-  `path` varchar(200) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
-  `state` enum('RELEASED','ARCHIVED') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
+  `path` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
+  `state` enum('RELEASED','ARCHIVED') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
   PRIMARY KEY (`path`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='List of directories where we want to include sql updates.';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -9466,4 +9505,4 @@ CREATE TABLE `world_state_expression` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2022-01-02 21:22:42
+-- Dump completed on 2022-01-15 23:25:07
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index 2ff8bbe00f9..4b23b02c582 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -32,8 +32,8 @@ CREATE TABLE `access_requirement` (
   `quest_done_A` int unsigned NOT NULL DEFAULT '0',
   `quest_done_H` int unsigned NOT NULL DEFAULT '0',
   `completed_achievement` int unsigned NOT NULL DEFAULT '0',
-  `quest_failed_text` mediumtext COLLATE utf8mb4_unicode_ci,
-  `comment` mediumtext COLLATE utf8mb4_unicode_ci,
+  `quest_failed_text` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `comment` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`mapId`,`difficulty`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='Access Requirements';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -70,8 +70,8 @@ CREATE TABLE `achievement_reward` (
   `TitleH` int unsigned NOT NULL DEFAULT '0',
   `ItemID` int unsigned NOT NULL DEFAULT '0',
   `Sender` int unsigned NOT NULL DEFAULT '0',
-  `Subject` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `Body` mediumtext COLLATE utf8mb4_unicode_ci,
+  `Subject` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Body` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `MailTemplateID` int unsigned DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=FIXED COMMENT='Loot System';
@@ -86,9 +86,9 @@ DROP TABLE IF EXISTS `achievement_reward_locale`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `achievement_reward_locale` (
   `ID` int unsigned NOT NULL DEFAULT '0',
-  `Locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `Subject` mediumtext COLLATE utf8mb4_unicode_ci,
-  `Body` mediumtext COLLATE utf8mb4_unicode_ci,
+  `Locale` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Subject` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `Body` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`ID`,`Locale`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -119,8 +119,8 @@ CREATE TABLE `areatrigger` (
   `ShapeData3` float NOT NULL DEFAULT '0',
   `ShapeData4` float NOT NULL DEFAULT '0',
   `ShapeData5` float NOT NULL DEFAULT '0',
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`SpawnId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -151,7 +151,7 @@ CREATE TABLE `areatrigger_create_properties` (
   `ShapeData3` float NOT NULL DEFAULT '0',
   `ShapeData4` float NOT NULL DEFAULT '0',
   `ShapeData5` float NOT NULL DEFAULT '0',
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `VerifiedBuild` int unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -238,7 +238,7 @@ DROP TABLE IF EXISTS `areatrigger_scripts`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `areatrigger_scripts` (
   `entry` int NOT NULL,
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`entry`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -252,7 +252,7 @@ DROP TABLE IF EXISTS `areatrigger_tavern`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `areatrigger_tavern` (
   `id` int unsigned NOT NULL DEFAULT '0' COMMENT 'Identifier',
-  `name` mediumtext COLLATE utf8mb4_unicode_ci,
+  `name` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Trigger System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -267,7 +267,7 @@ DROP TABLE IF EXISTS `areatrigger_teleport`;
 CREATE TABLE `areatrigger_teleport` (
   `ID` int unsigned NOT NULL DEFAULT '0',
   `PortLocID` int unsigned NOT NULL DEFAULT '0',
-  `Name` mediumtext COLLATE utf8mb4_unicode_ci,
+  `Name` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`ID`),
   FULLTEXT KEY `name` (`Name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Trigger System';
@@ -342,6 +342,21 @@ CREATE TABLE `battle_pet_quality` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `battlefield_template`
+--
+
+DROP TABLE IF EXISTS `battlefield_template`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `battlefield_template` (
+  `TypeId` tinyint unsigned NOT NULL,
+  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `comment` text COLLATE utf8mb4_unicode_ci,
+  PRIMARY KEY (`TypeId`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `battleground_template`
 --
 
@@ -354,8 +369,8 @@ CREATE TABLE `battleground_template` (
   `HordeStartLoc` int unsigned NOT NULL,
   `StartMaxDist` float NOT NULL DEFAULT '0',
   `Weight` tinyint unsigned NOT NULL DEFAULT '1',
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `Comment` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `Comment` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -389,7 +404,7 @@ CREATE TABLE `blackmarket_template` (
   `minBid` bigint unsigned NOT NULL DEFAULT '0',
   `duration` int NOT NULL DEFAULT '0',
   `chance` float NOT NULL DEFAULT '0',
-  `bonusListIDs` mediumtext COLLATE utf8mb4_unicode_ci,
+  `bonusListIDs` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`marketId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -403,8 +418,8 @@ DROP TABLE IF EXISTS `character_template`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `character_template` (
   `Id` int unsigned NOT NULL,
-  `Name` varchar(70) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `Description` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Name` varchar(70) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Description` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `Level` tinyint unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -449,9 +464,9 @@ DROP TABLE IF EXISTS `command`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `command` (
-  `name` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `permission` smallint unsigned NOT NULL DEFAULT '0',
-  `help` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `help` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Chat System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -477,8 +492,8 @@ CREATE TABLE `conditions` (
   `NegativeCondition` tinyint unsigned NOT NULL DEFAULT '0',
   `ErrorType` int unsigned NOT NULL DEFAULT '0',
   `ErrorTextId` int unsigned NOT NULL DEFAULT '0',
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Condition System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -530,7 +545,7 @@ CREATE TABLE `conversation_template` (
   `Id` int unsigned NOT NULL,
   `FirstLineId` int unsigned NOT NULL,
   `TextureKitId` int unsigned NOT NULL DEFAULT '0',
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `VerifiedBuild` int unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -549,7 +564,7 @@ CREATE TABLE `creature` (
   `map` smallint unsigned NOT NULL DEFAULT '0' COMMENT 'Map Identifier',
   `zoneId` smallint unsigned NOT NULL DEFAULT '0' COMMENT 'Zone Identifier',
   `areaId` smallint unsigned NOT NULL DEFAULT '0' COMMENT 'Area Identifier',
-  `spawnDifficulties` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0',
+  `spawnDifficulties` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0',
   `phaseUseFlags` tinyint unsigned NOT NULL DEFAULT '0',
   `PhaseId` int DEFAULT '0',
   `PhaseGroup` int DEFAULT '0',
@@ -571,7 +586,7 @@ CREATE TABLE `creature` (
   `unit_flags2` int unsigned NOT NULL DEFAULT '0',
   `unit_flags3` int unsigned NOT NULL DEFAULT '0',
   `dynamicflags` int unsigned NOT NULL DEFAULT '0',
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`),
   KEY `idx_map` (`map`),
@@ -597,7 +612,7 @@ CREATE TABLE `creature_addon` (
   `movementAnimKit` smallint NOT NULL DEFAULT '0',
   `meleeAnimKit` smallint NOT NULL DEFAULT '0',
   `visibilityDistanceType` tinyint unsigned NOT NULL DEFAULT '0',
-  `auras` mediumtext COLLATE utf8mb4_unicode_ci,
+  `auras` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`guid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -615,7 +630,7 @@ CREATE TABLE `creature_classlevelstats` (
   `basemana` int unsigned NOT NULL DEFAULT '1',
   `attackpower` smallint NOT NULL DEFAULT '0',
   `rangedattackpower` smallint NOT NULL DEFAULT '0',
-  `comment` mediumtext COLLATE utf8mb4_unicode_ci,
+  `comment` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`level`,`class`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -680,7 +695,7 @@ CREATE TABLE `creature_loot_template` (
   `GroupId` tinyint unsigned NOT NULL DEFAULT '0',
   `MinCount` tinyint unsigned NOT NULL DEFAULT '1',
   `MaxCount` tinyint unsigned NOT NULL DEFAULT '1',
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`Entry`,`Item`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Loot System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -804,7 +819,8 @@ CREATE TABLE `creature_summon_groups` (
   `position_z` float NOT NULL DEFAULT '0',
   `orientation` float NOT NULL DEFAULT '0',
   `summonType` tinyint unsigned NOT NULL DEFAULT '0',
-  `summonTime` int unsigned NOT NULL DEFAULT '0'
+  `summonTime` int unsigned NOT NULL DEFAULT '0',
+  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -822,11 +838,11 @@ CREATE TABLE `creature_template` (
   `difficulty_entry_3` int unsigned NOT NULL DEFAULT '0',
   `KillCredit1` int unsigned NOT NULL DEFAULT '0',
   `KillCredit2` int unsigned NOT NULL DEFAULT '0',
-  `name` mediumtext COLLATE utf8mb4_unicode_ci,
-  `femaleName` mediumtext COLLATE utf8mb4_unicode_ci,
-  `subname` mediumtext COLLATE utf8mb4_unicode_ci,
-  `TitleAlt` mediumtext COLLATE utf8mb4_unicode_ci,
-  `IconName` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `name` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `femaleName` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `subname` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `TitleAlt` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `IconName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `gossip_menu_id` int unsigned NOT NULL DEFAULT '0',
   `minlevel` smallint NOT NULL DEFAULT '1',
   `maxlevel` smallint NOT NULL DEFAULT '1',
@@ -860,7 +876,7 @@ CREATE TABLE `creature_template` (
   `VehicleId` int unsigned NOT NULL DEFAULT '0',
   `mingold` int unsigned NOT NULL DEFAULT '0',
   `maxgold` int unsigned NOT NULL DEFAULT '0',
-  `AIName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `AIName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `MovementType` tinyint unsigned NOT NULL DEFAULT '0',
   `HoverHeight` float NOT NULL DEFAULT '1',
   `HealthModifier` float NOT NULL DEFAULT '1',
@@ -879,7 +895,7 @@ CREATE TABLE `creature_template` (
   `mechanic_immune_mask` int unsigned NOT NULL DEFAULT '0',
   `spell_school_immune_mask` int unsigned NOT NULL DEFAULT '0',
   `flags_extra` int unsigned NOT NULL DEFAULT '0',
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`entry`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Creature System';
@@ -903,7 +919,7 @@ CREATE TABLE `creature_template_addon` (
   `movementAnimKit` smallint NOT NULL DEFAULT '0',
   `meleeAnimKit` smallint NOT NULL DEFAULT '0',
   `visibilityDistanceType` tinyint unsigned NOT NULL DEFAULT '0',
-  `auras` mediumtext COLLATE utf8mb4_unicode_ci,
+  `auras` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`entry`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -917,11 +933,11 @@ DROP TABLE IF EXISTS `creature_template_locale`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `creature_template_locale` (
   `entry` int unsigned NOT NULL DEFAULT '0',
-  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `Name` mediumtext COLLATE utf8mb4_unicode_ci,
-  `NameAlt` mediumtext COLLATE utf8mb4_unicode_ci,
-  `Title` mediumtext COLLATE utf8mb4_unicode_ci,
-  `TitleAlt` mediumtext COLLATE utf8mb4_unicode_ci,
+  `locale` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Name` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `NameAlt` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `Title` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `TitleAlt` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`entry`,`locale`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -1025,7 +1041,7 @@ CREATE TABLE `creature_text` (
   `CreatureID` int unsigned NOT NULL DEFAULT '0',
   `GroupID` tinyint unsigned NOT NULL DEFAULT '0',
   `ID` tinyint unsigned NOT NULL DEFAULT '0',
-  `Text` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Text` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `Type` tinyint unsigned NOT NULL DEFAULT '0',
   `Language` tinyint NOT NULL DEFAULT '0',
   `Probability` float NOT NULL DEFAULT '0',
@@ -1035,7 +1051,7 @@ CREATE TABLE `creature_text` (
   `SoundPlayType` tinyint unsigned NOT NULL DEFAULT '0',
   `BroadcastTextId` int NOT NULL DEFAULT '0',
   `TextRange` tinyint unsigned NOT NULL DEFAULT '0',
-  `comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT '',
+  `comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '',
   PRIMARY KEY (`CreatureID`,`GroupID`,`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1051,8 +1067,8 @@ CREATE TABLE `creature_text_locale` (
   `CreatureID` int unsigned NOT NULL DEFAULT '0',
   `GroupID` tinyint unsigned NOT NULL DEFAULT '0',
   `ID` tinyint unsigned NOT NULL DEFAULT '0',
-  `Locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `Text` mediumtext COLLATE utf8mb4_unicode_ci,
+  `Locale` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Text` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`CreatureID`,`GroupID`,`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1085,7 +1101,7 @@ CREATE TABLE `criteria_data` (
   `type` tinyint unsigned NOT NULL DEFAULT '0',
   `value1` int unsigned NOT NULL DEFAULT '0',
   `value2` int unsigned NOT NULL DEFAULT '0',
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   PRIMARY KEY (`criteria_id`,`type`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Achievment system';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1101,9 +1117,9 @@ CREATE TABLE `disables` (
   `sourceType` int unsigned NOT NULL,
   `entry` int unsigned NOT NULL,
   `flags` smallint NOT NULL,
-  `params_0` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `params_1` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `comment` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `params_0` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `params_1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   PRIMARY KEY (`sourceType`,`entry`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1125,7 +1141,7 @@ CREATE TABLE `disenchant_loot_template` (
   `GroupId` tinyint unsigned NOT NULL DEFAULT '0',
   `MinCount` tinyint unsigned NOT NULL DEFAULT '1',
   `MaxCount` tinyint unsigned NOT NULL DEFAULT '1',
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`Entry`,`Item`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Loot System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1182,7 +1198,7 @@ CREATE TABLE `fishing_loot_template` (
   `GroupId` tinyint unsigned NOT NULL DEFAULT '0',
   `MinCount` tinyint unsigned NOT NULL DEFAULT '1',
   `MaxCount` tinyint unsigned NOT NULL DEFAULT '1',
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`Entry`,`Item`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Loot System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1202,7 +1218,7 @@ CREATE TABLE `game_event` (
   `length` bigint unsigned NOT NULL DEFAULT '2592000' COMMENT 'Length in minutes of the event',
   `holiday` int unsigned NOT NULL DEFAULT '0' COMMENT 'Client side holiday id',
   `holidayStage` tinyint unsigned NOT NULL DEFAULT '0',
-  `description` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Description of the event displayed in console',
+  `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Description of the event displayed in console',
   `world_event` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '0 if normal event, 1 if world event',
   `announce` tinyint unsigned DEFAULT '2' COMMENT '0 dont announce, 1 announce, 2 value from config',
   PRIMARY KEY (`eventEntry`)
@@ -1250,7 +1266,7 @@ CREATE TABLE `game_event_condition` (
   `req_num` float DEFAULT '0',
   `max_world_state_field` smallint unsigned NOT NULL DEFAULT '0',
   `done_world_state_field` smallint unsigned NOT NULL DEFAULT '0',
-  `description` varchar(25) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `description` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   PRIMARY KEY (`eventEntry`,`condition_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1345,7 +1361,7 @@ CREATE TABLE `game_event_npc_vendor` (
   `incrtime` int unsigned NOT NULL DEFAULT '0',
   `ExtendedCost` int unsigned NOT NULL DEFAULT '0',
   `type` tinyint unsigned NOT NULL DEFAULT '1',
-  `BonusListIDs` mediumtext COLLATE utf8mb4_unicode_ci,
+  `BonusListIDs` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `PlayerConditionID` int unsigned NOT NULL DEFAULT '0',
   `IgnoreFiltering` tinyint unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`,`item`,`ExtendedCost`,`type`),
@@ -1441,7 +1457,7 @@ CREATE TABLE `game_tele` (
   `position_z` float NOT NULL DEFAULT '0',
   `orientation` float NOT NULL DEFAULT '0',
   `map` smallint unsigned NOT NULL DEFAULT '0',
-  `name` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Tele Command';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1467,7 +1483,7 @@ CREATE TABLE `game_weather` (
   `winter_rain_chance` tinyint unsigned NOT NULL DEFAULT '25',
   `winter_snow_chance` tinyint unsigned NOT NULL DEFAULT '25',
   `winter_storm_chance` tinyint unsigned NOT NULL DEFAULT '25',
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   PRIMARY KEY (`zone`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Weather System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1485,7 +1501,7 @@ CREATE TABLE `gameobject` (
   `map` smallint unsigned NOT NULL DEFAULT '0' COMMENT 'Map Identifier',
   `zoneId` smallint unsigned NOT NULL DEFAULT '0' COMMENT 'Zone Identifier',
   `areaId` smallint unsigned NOT NULL DEFAULT '0' COMMENT 'Area Identifier',
-  `spawnDifficulties` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0',
+  `spawnDifficulties` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0',
   `phaseUseFlags` tinyint unsigned NOT NULL DEFAULT '0',
   `PhaseId` int DEFAULT '0',
   `PhaseGroup` int DEFAULT '0',
@@ -1501,7 +1517,7 @@ CREATE TABLE `gameobject` (
   `spawntimesecs` int NOT NULL DEFAULT '0',
   `animprogress` tinyint unsigned NOT NULL DEFAULT '0',
   `state` tinyint unsigned NOT NULL DEFAULT '0',
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Gameobject System';
@@ -1545,7 +1561,7 @@ CREATE TABLE `gameobject_loot_template` (
   `GroupId` tinyint unsigned NOT NULL DEFAULT '0',
   `MinCount` tinyint unsigned NOT NULL DEFAULT '1',
   `MaxCount` tinyint unsigned NOT NULL DEFAULT '1',
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`Entry`,`Item`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Loot System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1620,10 +1636,10 @@ CREATE TABLE `gameobject_template` (
   `entry` int unsigned NOT NULL DEFAULT '0',
   `type` tinyint unsigned NOT NULL DEFAULT '0',
   `displayId` int unsigned NOT NULL DEFAULT '0',
-  `name` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `IconName` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `castBarCaption` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `unk1` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `IconName` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `castBarCaption` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `unk1` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `size` float NOT NULL DEFAULT '1',
   `Data0` int NOT NULL DEFAULT '0',
   `Data1` int NOT NULL DEFAULT '0',
@@ -1661,8 +1677,8 @@ CREATE TABLE `gameobject_template` (
   `Data33` int NOT NULL DEFAULT '0',
   `Data34` int NOT NULL DEFAULT '0',
   `ContentTuningId` int NOT NULL DEFAULT '0',
-  `AIName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `AIName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`entry`),
   KEY `idx_name` (`name`)
@@ -1697,10 +1713,10 @@ DROP TABLE IF EXISTS `gameobject_template_locale`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `gameobject_template_locale` (
   `entry` int unsigned NOT NULL DEFAULT '0',
-  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `name` mediumtext COLLATE utf8mb4_unicode_ci,
-  `castBarCaption` mediumtext COLLATE utf8mb4_unicode_ci,
-  `unk1` mediumtext COLLATE utf8mb4_unicode_ci,
+  `locale` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `name` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `castBarCaption` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `unk1` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`entry`,`locale`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -1771,7 +1787,7 @@ CREATE TABLE `gossip_menu_option` (
   `MenuId` int unsigned NOT NULL DEFAULT '0',
   `OptionIndex` int unsigned NOT NULL DEFAULT '0',
   `OptionIcon` tinyint unsigned NOT NULL DEFAULT '0',
-  `OptionText` mediumtext COLLATE utf8mb4_unicode_ci,
+  `OptionText` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `OptionBroadcastTextId` int unsigned NOT NULL DEFAULT '0',
   `OptionType` int unsigned NOT NULL DEFAULT '0',
   `OptionNpcFlag` bigint unsigned NOT NULL DEFAULT '0',
@@ -1808,7 +1824,7 @@ CREATE TABLE `gossip_menu_option_box` (
   `OptionIndex` int unsigned NOT NULL DEFAULT '0',
   `BoxCoded` tinyint unsigned NOT NULL DEFAULT '0',
   `BoxMoney` int unsigned NOT NULL DEFAULT '0',
-  `BoxText` mediumtext COLLATE utf8mb4_unicode_ci,
+  `BoxText` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `BoxBroadcastTextId` int unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`MenuId`,`OptionIndex`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -1824,9 +1840,9 @@ DROP TABLE IF EXISTS `gossip_menu_option_locale`;
 CREATE TABLE `gossip_menu_option_locale` (
   `MenuId` int unsigned NOT NULL DEFAULT '0',
   `OptionIndex` int unsigned NOT NULL DEFAULT '0',
-  `Locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `OptionText` mediumtext COLLATE utf8mb4_unicode_ci,
-  `BoxText` mediumtext COLLATE utf8mb4_unicode_ci,
+  `Locale` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `OptionText` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `BoxText` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`MenuId`,`OptionIndex`,`Locale`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1842,7 +1858,7 @@ CREATE TABLE `graveyard_zone` (
   `ID` int unsigned NOT NULL DEFAULT '0',
   `GhostZone` int unsigned NOT NULL DEFAULT '0',
   `Faction` smallint unsigned NOT NULL DEFAULT '0',
-  `Comment` mediumtext COLLATE utf8mb4_unicode_ci,
+  `Comment` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`ID`,`GhostZone`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Trigger System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1889,7 +1905,7 @@ CREATE TABLE `instance_encounters` (
   `creditType` tinyint unsigned NOT NULL DEFAULT '0',
   `creditEntry` int unsigned NOT NULL DEFAULT '0',
   `lastEncounterDungeon` smallint unsigned NOT NULL DEFAULT '0' COMMENT 'If not 0, LfgDungeon.dbc entry for the instance it is last encounter in',
-  `comment` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   PRIMARY KEY (`entry`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1921,7 +1937,7 @@ DROP TABLE IF EXISTS `instance_template`;
 CREATE TABLE `instance_template` (
   `map` smallint unsigned NOT NULL,
   `parent` smallint unsigned NOT NULL,
-  `script` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `script` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   PRIMARY KEY (`map`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1943,7 +1959,7 @@ CREATE TABLE `item_loot_template` (
   `GroupId` tinyint unsigned NOT NULL DEFAULT '0',
   `MinCount` tinyint unsigned NOT NULL DEFAULT '1',
   `MaxCount` tinyint unsigned NOT NULL DEFAULT '1',
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`Entry`,`Item`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Loot System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1972,7 +1988,7 @@ DROP TABLE IF EXISTS `item_script_names`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `item_script_names` (
   `Id` int unsigned NOT NULL,
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2099,7 +2115,7 @@ CREATE TABLE `mail_loot_template` (
   `GroupId` tinyint unsigned NOT NULL DEFAULT '0',
   `MinCount` tinyint unsigned NOT NULL DEFAULT '1',
   `MaxCount` tinyint unsigned NOT NULL DEFAULT '1',
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`Entry`,`Item`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Loot System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2121,7 +2137,7 @@ CREATE TABLE `milling_loot_template` (
   `GroupId` tinyint unsigned NOT NULL DEFAULT '0',
   `MinCount` tinyint unsigned NOT NULL DEFAULT '1',
   `MaxCount` tinyint unsigned NOT NULL DEFAULT '1',
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`Entry`,`Item`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Loot System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2201,7 +2217,7 @@ CREATE TABLE `npc_vendor` (
   `incrtime` int unsigned NOT NULL DEFAULT '0',
   `ExtendedCost` int unsigned NOT NULL DEFAULT '0',
   `type` tinyint unsigned NOT NULL DEFAULT '1',
-  `BonusListIDs` mediumtext COLLATE utf8mb4_unicode_ci,
+  `BonusListIDs` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `PlayerConditionID` int unsigned NOT NULL DEFAULT '0',
   `IgnoreFiltering` tinyint unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
@@ -2219,8 +2235,8 @@ DROP TABLE IF EXISTS `outdoorpvp_template`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `outdoorpvp_template` (
   `TypeId` tinyint unsigned NOT NULL,
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `comment` mediumtext COLLATE utf8mb4_unicode_ci,
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `comment` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`TypeId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='OutdoorPvP Templates';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2234,7 +2250,7 @@ DROP TABLE IF EXISTS `page_text`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `page_text` (
   `ID` int unsigned NOT NULL DEFAULT '0',
-  `Text` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Text` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `NextPageID` int unsigned NOT NULL DEFAULT '0',
   `PlayerConditionID` int NOT NULL DEFAULT '0',
   `Flags` tinyint unsigned NOT NULL DEFAULT '0',
@@ -2252,8 +2268,8 @@ DROP TABLE IF EXISTS `page_text_locale`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `page_text_locale` (
   `ID` int unsigned NOT NULL DEFAULT '0',
-  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `Text` mediumtext COLLATE utf8mb4_unicode_ci,
+  `locale` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Text` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -2290,7 +2306,7 @@ DROP TABLE IF EXISTS `pet_name_generation`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `pet_name_generation` (
   `id` int unsigned NOT NULL,
-  `word` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `word` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `entry` int unsigned NOT NULL DEFAULT '0',
   `half` tinyint unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
@@ -2307,7 +2323,7 @@ DROP TABLE IF EXISTS `phase_area`;
 CREATE TABLE `phase_area` (
   `AreaId` int unsigned NOT NULL,
   `PhaseId` int unsigned NOT NULL,
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`AreaId`,`PhaseId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2343,7 +2359,7 @@ CREATE TABLE `pickpocketing_loot_template` (
   `GroupId` tinyint unsigned NOT NULL DEFAULT '0',
   `MinCount` tinyint unsigned NOT NULL DEFAULT '1',
   `MaxCount` tinyint unsigned NOT NULL DEFAULT '1',
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`Entry`,`Item`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Loot System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2480,7 +2496,7 @@ CREATE TABLE `playerchoice` (
   `ChoiceId` int NOT NULL,
   `UiTextureKitId` int NOT NULL DEFAULT '0',
   `SoundKitId` int unsigned NOT NULL DEFAULT '0',
-  `Question` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Question` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `HideWarboardHeader` tinyint(1) NOT NULL DEFAULT '0',
   `KeepOpenAfterChoice` tinyint unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
@@ -2497,8 +2513,8 @@ DROP TABLE IF EXISTS `playerchoice_locale`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `playerchoice_locale` (
   `ChoiceId` int NOT NULL,
-  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `Question` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `locale` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Question` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ChoiceId`,`locale`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -2523,12 +2539,12 @@ CREATE TABLE `playerchoice_response` (
   `SoundKitID` int unsigned NOT NULL DEFAULT '0',
   `GroupID` tinyint unsigned NOT NULL DEFAULT '0',
   `UiTextureKitID` int NOT NULL DEFAULT '0',
-  `Header` varchar(511) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `SubHeader` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `ButtonTooltip` varchar(400) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `Answer` varchar(511) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `Description` varchar(2047) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `Confirmation` varchar(127) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Header` varchar(511) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `SubHeader` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `ButtonTooltip` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `Answer` varchar(511) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Description` varchar(2047) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Confirmation` varchar(127) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `RewardQuestID` int unsigned DEFAULT NULL,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ChoiceId`,`ResponseId`)
@@ -2545,13 +2561,13 @@ DROP TABLE IF EXISTS `playerchoice_response_locale`;
 CREATE TABLE `playerchoice_response_locale` (
   `ChoiceId` int NOT NULL,
   `ResponseId` int NOT NULL,
-  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `Header` varchar(511) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `SubHeader` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `ButtonTooltip` varchar(400) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `Answer` varchar(511) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `Description` varchar(2047) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `Confirmation` varchar(127) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `locale` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Header` varchar(511) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `SubHeader` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `ButtonTooltip` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `Answer` varchar(511) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `Description` varchar(2047) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `Confirmation` varchar(127) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ChoiceId`,`ResponseId`,`locale`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -2648,7 +2664,7 @@ CREATE TABLE `playerchoice_response_reward_item` (
   `ResponseId` int NOT NULL,
   `Index` int unsigned NOT NULL,
   `ItemId` int unsigned NOT NULL DEFAULT '0',
-  `BonusListIDs` mediumtext COLLATE utf8mb4_unicode_ci,
+  `BonusListIDs` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `Quantity` int NOT NULL DEFAULT '0',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ChoiceId`,`ResponseId`)
@@ -2667,7 +2683,7 @@ CREATE TABLE `playerchoice_response_reward_item_choice` (
   `ResponseId` int NOT NULL,
   `Index` int unsigned NOT NULL,
   `ItemId` int unsigned NOT NULL DEFAULT '0',
-  `BonusListIDs` mediumtext COLLATE utf8mb4_unicode_ci,
+  `BonusListIDs` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `Quantity` int NOT NULL DEFAULT '0',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ChoiceId`,`ResponseId`)
@@ -2730,9 +2746,10 @@ DROP TABLE IF EXISTS `playercreateinfo_cast_spell`;
 CREATE TABLE `playercreateinfo_cast_spell` (
   `raceMask` bigint unsigned NOT NULL,
   `classMask` int unsigned NOT NULL DEFAULT '0',
+  `createMode` tinyint NOT NULL DEFAULT '0',
   `spell` int unsigned NOT NULL DEFAULT '0',
-  `note` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`raceMask`,`classMask`,`spell`)
+  `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`raceMask`,`classMask`,`createMode`,`spell`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2764,7 +2781,7 @@ CREATE TABLE `playercreateinfo_spell_custom` (
   `racemask` bigint unsigned NOT NULL,
   `classmask` int unsigned NOT NULL DEFAULT '0',
   `Spell` int unsigned NOT NULL DEFAULT '0',
-  `Note` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`racemask`,`classmask`,`Spell`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2784,7 +2801,7 @@ CREATE TABLE `points_of_interest` (
   `Icon` int unsigned NOT NULL DEFAULT '0',
   `Flags` int unsigned NOT NULL DEFAULT '0',
   `Importance` int unsigned NOT NULL DEFAULT '0',
-  `Name` mediumtext COLLATE utf8mb4_unicode_ci,
+  `Name` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `Unknown905` int NOT NULL DEFAULT '0',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -2800,8 +2817,8 @@ DROP TABLE IF EXISTS `points_of_interest_locale`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `points_of_interest_locale` (
   `ID` int unsigned NOT NULL DEFAULT '0',
-  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `Name` mediumtext COLLATE utf8mb4_unicode_ci,
+  `locale` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Name` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -2819,7 +2836,7 @@ CREATE TABLE `pool_members` (
   `spawnId` int unsigned NOT NULL,
   `poolSpawnId` int unsigned NOT NULL,
   `chance` float NOT NULL,
-  `description` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`type`,`spawnId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2834,7 +2851,7 @@ DROP TABLE IF EXISTS `pool_template`;
 CREATE TABLE `pool_template` (
   `entry` int unsigned NOT NULL DEFAULT '0' COMMENT 'Pool entry',
   `max_limit` int unsigned NOT NULL DEFAULT '0' COMMENT 'Max number of objects (0) is no limit',
-  `description` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`entry`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2856,7 +2873,7 @@ CREATE TABLE `prospecting_loot_template` (
   `GroupId` tinyint unsigned NOT NULL DEFAULT '0',
   `MinCount` tinyint unsigned NOT NULL DEFAULT '1',
   `MaxCount` tinyint unsigned NOT NULL DEFAULT '1',
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`Entry`,`Item`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Loot System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2895,7 +2912,7 @@ CREATE TABLE `quest_greeting` (
   `Type` tinyint unsigned NOT NULL DEFAULT '0',
   `GreetEmoteType` smallint unsigned NOT NULL DEFAULT '0',
   `GreetEmoteDelay` int unsigned NOT NULL DEFAULT '0',
-  `Greeting` mediumtext COLLATE utf8mb4_unicode_ci,
+  `Greeting` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`Type`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -2911,8 +2928,8 @@ DROP TABLE IF EXISTS `quest_greeting_locale`;
 CREATE TABLE `quest_greeting_locale` (
   `ID` int unsigned NOT NULL DEFAULT '0',
   `type` tinyint unsigned NOT NULL DEFAULT '0',
-  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `Greeting` mediumtext COLLATE utf8mb4_unicode_ci,
+  `locale` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Greeting` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`type`,`locale`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -2950,7 +2967,7 @@ CREATE TABLE `quest_objectives` (
   `Flags` int unsigned NOT NULL DEFAULT '0',
   `Flags2` int unsigned NOT NULL DEFAULT '0',
   `ProgressBarWeight` float NOT NULL DEFAULT '0',
-  `Description` mediumtext COLLATE utf8mb4_unicode_ci,
+  `Description` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -2965,10 +2982,10 @@ DROP TABLE IF EXISTS `quest_objectives_locale`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `quest_objectives_locale` (
   `ID` int unsigned NOT NULL DEFAULT '0',
-  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `locale` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `QuestId` int unsigned NOT NULL DEFAULT '0',
   `StorageIndex` tinyint NOT NULL DEFAULT '0',
-  `Description` mediumtext COLLATE utf8mb4_unicode_ci,
+  `Description` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -2991,7 +3008,7 @@ CREATE TABLE `quest_offer_reward` (
   `EmoteDelay2` int unsigned NOT NULL DEFAULT '0',
   `EmoteDelay3` int unsigned NOT NULL DEFAULT '0',
   `EmoteDelay4` int unsigned NOT NULL DEFAULT '0',
-  `RewardText` mediumtext COLLATE utf8mb4_unicode_ci,
+  `RewardText` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -3006,8 +3023,8 @@ DROP TABLE IF EXISTS `quest_offer_reward_locale`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `quest_offer_reward_locale` (
   `ID` int unsigned NOT NULL DEFAULT '0',
-  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `RewardText` mediumtext COLLATE utf8mb4_unicode_ci,
+  `locale` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `RewardText` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -3073,7 +3090,7 @@ CREATE TABLE `quest_pool_members` (
   `questId` int unsigned NOT NULL,
   `poolId` int unsigned NOT NULL,
   `poolIndex` tinyint unsigned NOT NULL COMMENT 'Multiple quests with the same index will always spawn together!',
-  `description` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`questId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3088,7 +3105,7 @@ DROP TABLE IF EXISTS `quest_pool_template`;
 CREATE TABLE `quest_pool_template` (
   `poolId` int unsigned NOT NULL,
   `numActive` int unsigned NOT NULL COMMENT 'Number of indices to have active at any time',
-  `description` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`poolId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3106,7 +3123,7 @@ CREATE TABLE `quest_request_items` (
   `EmoteOnIncomplete` smallint unsigned NOT NULL DEFAULT '0',
   `EmoteOnCompleteDelay` int unsigned NOT NULL DEFAULT '0',
   `EmoteOnIncompleteDelay` int unsigned NOT NULL DEFAULT '0',
-  `CompletionText` mediumtext COLLATE utf8mb4_unicode_ci,
+  `CompletionText` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -3121,8 +3138,8 @@ DROP TABLE IF EXISTS `quest_request_items_locale`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `quest_request_items_locale` (
   `ID` int unsigned NOT NULL DEFAULT '0',
-  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `CompletionText` mediumtext COLLATE utf8mb4_unicode_ci,
+  `locale` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `CompletionText` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -3284,15 +3301,15 @@ CREATE TABLE `quest_template` (
   `Expansion` int NOT NULL DEFAULT '0',
   `ManagedWorldStateID` int NOT NULL DEFAULT '0',
   `QuestSessionBonus` int NOT NULL DEFAULT '0',
-  `LogTitle` mediumtext COLLATE utf8mb4_unicode_ci,
-  `LogDescription` mediumtext COLLATE utf8mb4_unicode_ci,
-  `QuestDescription` mediumtext COLLATE utf8mb4_unicode_ci,
-  `AreaDescription` mediumtext COLLATE utf8mb4_unicode_ci,
-  `PortraitGiverText` mediumtext COLLATE utf8mb4_unicode_ci,
-  `PortraitGiverName` mediumtext COLLATE utf8mb4_unicode_ci,
-  `PortraitTurnInText` mediumtext COLLATE utf8mb4_unicode_ci,
-  `PortraitTurnInName` mediumtext COLLATE utf8mb4_unicode_ci,
-  `QuestCompletionLog` mediumtext COLLATE utf8mb4_unicode_ci,
+  `LogTitle` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `LogDescription` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `QuestDescription` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `AreaDescription` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `PortraitGiverText` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `PortraitGiverName` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `PortraitTurnInText` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `PortraitTurnInName` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `QuestCompletionLog` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Quest System';
@@ -3324,7 +3341,7 @@ CREATE TABLE `quest_template_addon` (
   `RequiredMaxRepValue` int NOT NULL DEFAULT '0',
   `ProvidedItemCount` tinyint unsigned NOT NULL DEFAULT '0',
   `SpecialFlags` tinyint unsigned NOT NULL DEFAULT '0',
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3338,16 +3355,16 @@ DROP TABLE IF EXISTS `quest_template_locale`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `quest_template_locale` (
   `ID` int unsigned NOT NULL DEFAULT '0',
-  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `LogTitle` mediumtext COLLATE utf8mb4_unicode_ci,
-  `LogDescription` mediumtext COLLATE utf8mb4_unicode_ci,
-  `QuestDescription` mediumtext COLLATE utf8mb4_unicode_ci,
-  `AreaDescription` mediumtext COLLATE utf8mb4_unicode_ci,
-  `PortraitGiverText` mediumtext COLLATE utf8mb4_unicode_ci,
-  `PortraitGiverName` mediumtext COLLATE utf8mb4_unicode_ci,
-  `PortraitTurnInText` mediumtext COLLATE utf8mb4_unicode_ci,
-  `PortraitTurnInName` mediumtext COLLATE utf8mb4_unicode_ci,
-  `QuestCompletionLog` mediumtext COLLATE utf8mb4_unicode_ci,
+  `locale` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `LogTitle` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `LogDescription` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `QuestDescription` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `AreaDescription` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `PortraitGiverText` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `PortraitGiverName` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `PortraitTurnInText` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `PortraitTurnInName` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `QuestCompletionLog` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -3401,7 +3418,7 @@ CREATE TABLE `reference_loot_template` (
   `GroupId` tinyint unsigned NOT NULL DEFAULT '0',
   `MinCount` tinyint unsigned NOT NULL DEFAULT '1',
   `MaxCount` tinyint unsigned NOT NULL DEFAULT '1',
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`Entry`,`Item`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Loot System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3526,7 +3543,7 @@ CREATE TABLE `scene_template` (
   `Flags` int unsigned NOT NULL DEFAULT '0',
   `ScriptPackageID` int unsigned NOT NULL DEFAULT '0',
   `Encrypted` tinyint unsigned NOT NULL DEFAULT '0',
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   PRIMARY KEY (`SceneId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3582,7 +3599,7 @@ CREATE TABLE `script_waypoint` (
   `location_y` float NOT NULL DEFAULT '0',
   `location_z` float NOT NULL DEFAULT '0',
   `waittime` int unsigned NOT NULL DEFAULT '0' COMMENT 'waittime in millisecs',
-  `point_comment` mediumtext COLLATE utf8mb4_unicode_ci,
+  `point_comment` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`entry`,`pointid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Script Creature waypoints';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3829,7 +3846,7 @@ CREATE TABLE `skinning_loot_template` (
   `GroupId` tinyint unsigned NOT NULL DEFAULT '0',
   `MinCount` tinyint unsigned NOT NULL DEFAULT '1',
   `MaxCount` tinyint unsigned NOT NULL DEFAULT '1',
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`Entry`,`Item`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Loot System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3855,7 +3872,7 @@ CREATE TABLE `smart_scripts` (
   `event_param3` int unsigned NOT NULL DEFAULT '0',
   `event_param4` int unsigned NOT NULL DEFAULT '0',
   `event_param5` int unsigned NOT NULL DEFAULT '0',
-  `event_param_string` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `event_param_string` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `action_type` tinyint unsigned NOT NULL DEFAULT '0',
   `action_param1` int unsigned NOT NULL DEFAULT '0',
   `action_param2` int unsigned NOT NULL DEFAULT '0',
@@ -3872,7 +3889,7 @@ CREATE TABLE `smart_scripts` (
   `target_y` float NOT NULL DEFAULT '0',
   `target_z` float NOT NULL DEFAULT '0',
   `target_o` float NOT NULL DEFAULT '0',
-  `comment` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Event Comment',
+  `comment` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Event Comment',
   PRIMARY KEY (`entryorguid`,`source_type`,`id`,`link`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3901,7 +3918,7 @@ DROP TABLE IF EXISTS `spawn_group_template`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `spawn_group_template` (
   `groupId` int unsigned NOT NULL,
-  `groupName` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `groupName` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `groupFlags` int unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`groupId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -4014,7 +4031,7 @@ CREATE TABLE `spell_linked_spell` (
   `spell_trigger` int NOT NULL,
   `spell_effect` int NOT NULL DEFAULT '0',
   `type` tinyint unsigned NOT NULL DEFAULT '0',
-  `comment` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `comment` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   UNIQUE KEY `trigger_effect_type` (`spell_trigger`,`spell_effect`,`type`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Spell System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -4036,7 +4053,7 @@ CREATE TABLE `spell_loot_template` (
   `GroupId` tinyint unsigned NOT NULL DEFAULT '0',
   `MinCount` tinyint unsigned NOT NULL DEFAULT '1',
   `MaxCount` tinyint unsigned NOT NULL DEFAULT '1',
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`Entry`,`Item`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Loot System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -4109,7 +4126,7 @@ DROP TABLE IF EXISTS `spell_script_names`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `spell_script_names` (
   `spell_id` int NOT NULL,
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   UNIQUE KEY `spell_id` (`spell_id`,`ScriptName`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -4196,7 +4213,7 @@ DROP TABLE IF EXISTS `terrain_swap_defaults`;
 CREATE TABLE `terrain_swap_defaults` (
   `MapId` int unsigned NOT NULL,
   `TerrainSwapMap` int unsigned NOT NULL,
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`MapId`,`TerrainSwapMap`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -4211,7 +4228,7 @@ DROP TABLE IF EXISTS `terrain_worldmap`;
 CREATE TABLE `terrain_worldmap` (
   `TerrainSwapMap` int unsigned NOT NULL,
   `UiMapPhaseId` int unsigned NOT NULL,
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`TerrainSwapMap`,`UiMapPhaseId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -4226,7 +4243,7 @@ DROP TABLE IF EXISTS `trainer`;
 CREATE TABLE `trainer` (
   `Id` int unsigned NOT NULL DEFAULT '0',
   `Type` tinyint unsigned NOT NULL DEFAULT '2',
-  `Greeting` mediumtext COLLATE utf8mb4_unicode_ci,
+  `Greeting` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -4241,8 +4258,8 @@ DROP TABLE IF EXISTS `trainer_locale`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `trainer_locale` (
   `Id` int unsigned NOT NULL DEFAULT '0',
-  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `Greeting_lang` mediumtext COLLATE utf8mb4_unicode_ci,
+  `locale` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Greeting_lang` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`Id`,`locale`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -4280,11 +4297,11 @@ DROP TABLE IF EXISTS `transports`;
 CREATE TABLE `transports` (
   `guid` bigint unsigned NOT NULL DEFAULT '0',
   `entry` int unsigned NOT NULL DEFAULT '0',
-  `name` mediumtext COLLATE utf8mb4_unicode_ci,
+  `name` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `phaseUseFlags` tinyint unsigned NOT NULL DEFAULT '0',
   `phaseid` int NOT NULL DEFAULT '0',
   `phasegroup` int NOT NULL DEFAULT '0',
-  `ScriptName` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   PRIMARY KEY (`guid`),
   UNIQUE KEY `idx_entry` (`entry`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Transports';
@@ -4299,15 +4316,15 @@ DROP TABLE IF EXISTS `trinity_string`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `trinity_string` (
   `entry` int unsigned NOT NULL DEFAULT '0',
-  `content_default` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
-  `content_loc1` mediumtext COLLATE utf8mb4_unicode_ci,
-  `content_loc2` mediumtext COLLATE utf8mb4_unicode_ci,
-  `content_loc3` mediumtext COLLATE utf8mb4_unicode_ci,
-  `content_loc4` mediumtext COLLATE utf8mb4_unicode_ci,
-  `content_loc5` mediumtext COLLATE utf8mb4_unicode_ci,
-  `content_loc6` mediumtext COLLATE utf8mb4_unicode_ci,
-  `content_loc7` mediumtext COLLATE utf8mb4_unicode_ci,
-  `content_loc8` mediumtext COLLATE utf8mb4_unicode_ci,
+  `content_default` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `content_loc1` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `content_loc2` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `content_loc3` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `content_loc4` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `content_loc5` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `content_loc6` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `content_loc7` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `content_loc8` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`entry`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -4320,9 +4337,9 @@ DROP TABLE IF EXISTS `updates`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `updates` (
-  `name` varchar(200) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'filename with extension of the update.',
-  `hash` char(40) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT 'sha1 hash of the sql file.',
-  `state` enum('RELEASED','ARCHIVED') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
+  `name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'filename with extension of the update.',
+  `hash` char(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT 'sha1 hash of the sql file.',
+  `state` enum('RELEASED','ARCHIVED') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
   `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
   `speed` int unsigned NOT NULL DEFAULT '0' COMMENT 'time the query takes to apply in ms.',
   PRIMARY KEY (`name`)
@@ -4337,8 +4354,8 @@ DROP TABLE IF EXISTS `updates_include`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `updates_include` (
-  `path` varchar(200) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
-  `state` enum('RELEASED','ARCHIVED') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
+  `path` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
+  `state` enum('RELEASED','ARCHIVED') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
   PRIMARY KEY (`path`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='List of directories where we want to include sql updates.';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -4355,7 +4372,7 @@ CREATE TABLE `vehicle_accessory` (
   `accessory_entry` int unsigned NOT NULL DEFAULT '0',
   `seat_id` tinyint NOT NULL DEFAULT '0',
   `minion` tinyint unsigned NOT NULL DEFAULT '0',
-  `description` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `description` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `summontype` tinyint unsigned NOT NULL DEFAULT '6' COMMENT 'see enum TempSummonType',
   `summontimer` int unsigned NOT NULL DEFAULT '30000' COMMENT 'timer, only relevant for certain summontypes',
   PRIMARY KEY (`guid`,`seat_id`)
@@ -4407,7 +4424,7 @@ CREATE TABLE `vehicle_template_accessory` (
   `accessory_entry` int unsigned NOT NULL DEFAULT '0',
   `seat_id` tinyint NOT NULL DEFAULT '0',
   `minion` tinyint unsigned NOT NULL DEFAULT '0',
-  `description` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `description` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `summontype` tinyint unsigned NOT NULL DEFAULT '6' COMMENT 'see enum TempSummonType',
   `summontimer` int unsigned NOT NULL DEFAULT '30000' COMMENT 'timer, only relevant for certain summontypes',
   PRIMARY KEY (`entry`,`seat_id`)
@@ -4422,9 +4439,9 @@ DROP TABLE IF EXISTS `version`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `version` (
-  `core_version` varchar(250) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'Core revision dumped at startup.',
-  `core_revision` varchar(120) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `db_version` varchar(120) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Version of world DB.',
+  `core_version` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'Core revision dumped at startup.',
+  `core_revision` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `db_version` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Version of world DB.',
   `cache_id` int DEFAULT '0',
   PRIMARY KEY (`core_version`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Version Notes';
@@ -4440,12 +4457,12 @@ DROP TABLE IF EXISTS `warden_checks`;
 CREATE TABLE `warden_checks` (
   `id` smallint unsigned NOT NULL AUTO_INCREMENT,
   `type` tinyint unsigned DEFAULT NULL,
-  `data` varchar(48) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `str` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `data` varchar(48) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `str` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `address` int unsigned DEFAULT NULL,
   `length` tinyint unsigned DEFAULT NULL,
-  `result` varchar(24) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `comment` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `result` varchar(24) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `comment` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=787 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -4509,7 +4526,7 @@ CREATE TABLE `waypoints` (
   `position_x` float NOT NULL DEFAULT '0',
   `position_y` float NOT NULL DEFAULT '0',
   `position_z` float NOT NULL DEFAULT '0',
-  `point_comment` mediumtext COLLATE utf8mb4_unicode_ci,
+  `point_comment` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`entry`,`pointid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Creature waypoints';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -4528,7 +4545,7 @@ CREATE TABLE `world_safe_locs` (
   `LocY` float DEFAULT NULL,
   `LocZ` float DEFAULT NULL,
   `Facing` float DEFAULT NULL,
-  `Comment` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -4546,4 +4563,4 @@ CREATE TABLE `world_safe_locs` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2022-01-02 21:22:39
+-- Dump completed on 2022-01-15 23:25:03
diff --git a/sql/updates/auth/master/2022_01_02_00_auth.sql b/sql/old/9.x/auth/22011_2022_01_15/2022_01_02_00_auth.sql
index 727e85e7536..727e85e7536 100644
--- a/sql/updates/auth/master/2022_01_02_00_auth.sql
+++ b/sql/old/9.x/auth/22011_2022_01_15/2022_01_02_00_auth.sql
diff --git a/sql/updates/auth/master/2022_01_08_00_auth.sql b/sql/old/9.x/auth/22011_2022_01_15/2022_01_08_00_auth.sql
index 0b5ba03faec..0b5ba03faec 100644
--- a/sql/updates/auth/master/2022_01_08_00_auth.sql
+++ b/sql/old/9.x/auth/22011_2022_01_15/2022_01_08_00_auth.sql
diff --git a/sql/updates/characters/master/2022_01_02_00_characters.sql b/sql/old/9.x/characters/22011_2022_01_15/2022_01_02_00_characters.sql
index ab361bdae75..ab361bdae75 100644
--- a/sql/updates/characters/master/2022_01_02_00_characters.sql
+++ b/sql/old/9.x/characters/22011_2022_01_15/2022_01_02_00_characters.sql
diff --git a/sql/updates/characters/master/2022_01_09_00_characters.sql b/sql/old/9.x/characters/22011_2022_01_15/2022_01_09_00_characters.sql
index 6cf9ad0b470..6cf9ad0b470 100644
--- a/sql/updates/characters/master/2022_01_09_00_characters.sql
+++ b/sql/old/9.x/characters/22011_2022_01_15/2022_01_09_00_characters.sql
diff --git a/sql/updates/hotfixes/master/2022_01_02_00_hotfixes.sql b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_02_00_hotfixes.sql
index dcf0d2e74f1..dcf0d2e74f1 100644
--- a/sql/updates/hotfixes/master/2022_01_02_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_02_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2022_01_03_00_hotfixes.sql b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_03_00_hotfixes.sql
index d657d9a993a..d657d9a993a 100644
--- a/sql/updates/hotfixes/master/2022_01_03_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_03_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2022_01_11_00_hotfixes.sql b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_11_00_hotfixes.sql
index 2113b12fa69..2113b12fa69 100644
--- a/sql/updates/hotfixes/master/2022_01_11_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_11_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2022_01_13_00_hotfixes.sql b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_00_hotfixes.sql
index 27da5d3070b..27da5d3070b 100644
--- a/sql/updates/hotfixes/master/2022_01_13_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2022_01_13_01_hotfixes.sql b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_01_hotfixes.sql
index 57b74efeca2..57b74efeca2 100644
--- a/sql/updates/hotfixes/master/2022_01_13_01_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2022_01_13_02_hotfixes.sql b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_02_hotfixes.sql
index 56318fdd348..56318fdd348 100644
--- a/sql/updates/hotfixes/master/2022_01_13_02_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_02_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2022_01_13_03_hotfixes.sql b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_03_hotfixes.sql
index 5ff98002fb8..5ff98002fb8 100644
--- a/sql/updates/hotfixes/master/2022_01_13_03_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_03_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2022_01_13_04_hotfixes.sql b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_04_hotfixes.sql
index aa3ddbd1367..aa3ddbd1367 100644
--- a/sql/updates/hotfixes/master/2022_01_13_04_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_04_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2022_01_13_05_hotfixes.sql b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_05_hotfixes.sql
index 9a4954126b9..9a4954126b9 100644
--- a/sql/updates/hotfixes/master/2022_01_13_05_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_05_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2022_01_13_06_hotfixes.sql b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_06_hotfixes.sql
index fa4f7b65c99..fa4f7b65c99 100644
--- a/sql/updates/hotfixes/master/2022_01_13_06_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_06_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2022_01_13_07_hotfixes.sql b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_07_hotfixes.sql
index de84d82b0cd..de84d82b0cd 100644
--- a/sql/updates/hotfixes/master/2022_01_13_07_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_07_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2022_01_13_08_hotfixes.sql b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_08_hotfixes.sql
index a8c2755be44..a8c2755be44 100644
--- a/sql/updates/hotfixes/master/2022_01_13_08_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_08_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2022_01_13_09_hotfixes.sql b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_09_hotfixes.sql
index 3f3377ffae1..3f3377ffae1 100644
--- a/sql/updates/hotfixes/master/2022_01_13_09_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_13_09_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2022_01_14_00_hotfixes.sql b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_14_00_hotfixes.sql
index a39791053ae..a39791053ae 100644
--- a/sql/updates/hotfixes/master/2022_01_14_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_14_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2022_01_15_00_hotfixes.sql b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_15_00_hotfixes.sql
index 48453433c60..48453433c60 100644
--- a/sql/updates/hotfixes/master/2022_01_15_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/22011_2022_01_15/2022_01_15_00_hotfixes.sql
diff --git a/sql/updates/world/master/2022_01_02_17_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_02_17_world.sql
index a44155891bd..a44155891bd 100644
--- a/sql/updates/world/master/2022_01_02_17_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_02_17_world.sql
diff --git a/sql/updates/world/master/2022_01_04_00_world_2020_05_10_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_00_world_2020_05_10_01_world.sql
index 26830cbd0b9..26830cbd0b9 100644
--- a/sql/updates/world/master/2022_01_04_00_world_2020_05_10_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_00_world_2020_05_10_01_world.sql
diff --git a/sql/updates/world/master/2022_01_04_01_world_2020_05_10_03_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_01_world_2020_05_10_03_world.sql
index 84b0a46f99e..84b0a46f99e 100644
--- a/sql/updates/world/master/2022_01_04_01_world_2020_05_10_03_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_01_world_2020_05_10_03_world.sql
diff --git a/sql/updates/world/master/2022_01_04_02_world_2020_05_10_04_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_02_world_2020_05_10_04_world.sql
index 878a66b48c6..878a66b48c6 100644
--- a/sql/updates/world/master/2022_01_04_02_world_2020_05_10_04_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_02_world_2020_05_10_04_world.sql
diff --git a/sql/updates/world/master/2022_01_04_03_world_2020_05_11_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_03_world_2020_05_11_00_world.sql
index c121298c87c..c121298c87c 100644
--- a/sql/updates/world/master/2022_01_04_03_world_2020_05_11_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_03_world_2020_05_11_00_world.sql
diff --git a/sql/updates/world/master/2022_01_04_04_world_2020_05_11_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_04_world_2020_05_11_01_world.sql
index 9ddb0b5bed0..9ddb0b5bed0 100644
--- a/sql/updates/world/master/2022_01_04_04_world_2020_05_11_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_04_world_2020_05_11_01_world.sql
diff --git a/sql/updates/world/master/2022_01_04_05_world_2020_05_11_02_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_05_world_2020_05_11_02_world.sql
index 912998ac54e..912998ac54e 100644
--- a/sql/updates/world/master/2022_01_04_05_world_2020_05_11_02_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_05_world_2020_05_11_02_world.sql
diff --git a/sql/updates/world/master/2022_01_04_06_world_2020_05_11_04_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_06_world_2020_05_11_04_world.sql
index 4ac98de4ef6..4ac98de4ef6 100644
--- a/sql/updates/world/master/2022_01_04_06_world_2020_05_11_04_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_06_world_2020_05_11_04_world.sql
diff --git a/sql/updates/world/master/2022_01_04_07_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_07_world.sql
index 77875be3117..77875be3117 100644
--- a/sql/updates/world/master/2022_01_04_07_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_07_world.sql
diff --git a/sql/updates/world/master/2022_01_04_07_world_2020_05_11_03_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_07_world_2020_05_11_03_world.sql
index ae8e0a87ea7..ae8e0a87ea7 100644
--- a/sql/updates/world/master/2022_01_04_07_world_2020_05_11_03_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_07_world_2020_05_11_03_world.sql
diff --git a/sql/updates/world/master/2022_01_04_08_world_2020_05_13_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_08_world_2020_05_13_00_world.sql
index 321ede22167..321ede22167 100644
--- a/sql/updates/world/master/2022_01_04_08_world_2020_05_13_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_08_world_2020_05_13_00_world.sql
diff --git a/sql/updates/world/master/2022_01_04_09_world_2020_05_13_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_09_world_2020_05_13_01_world.sql
index 4f237615127..4f237615127 100644
--- a/sql/updates/world/master/2022_01_04_09_world_2020_05_13_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_09_world_2020_05_13_01_world.sql
diff --git a/sql/updates/world/master/2022_01_04_10_world_2020_05_13_02_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_10_world_2020_05_13_02_world.sql
index 1769fa389fe..1769fa389fe 100644
--- a/sql/updates/world/master/2022_01_04_10_world_2020_05_13_02_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_10_world_2020_05_13_02_world.sql
diff --git a/sql/updates/world/master/2022_01_04_11_world_2020_05_13_03_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_11_world_2020_05_13_03_world.sql
index 9a4f7b0b000..9a4f7b0b000 100644
--- a/sql/updates/world/master/2022_01_04_11_world_2020_05_13_03_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_11_world_2020_05_13_03_world.sql
diff --git a/sql/updates/world/master/2022_01_04_12_world_2020_05_13_04_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_12_world_2020_05_13_04_world.sql
index 13111a8997a..13111a8997a 100644
--- a/sql/updates/world/master/2022_01_04_12_world_2020_05_13_04_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_12_world_2020_05_13_04_world.sql
diff --git a/sql/updates/world/master/2022_01_04_13_world_2020_05_15_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_13_world_2020_05_15_01_world.sql
index ab297ecb0d2..ab297ecb0d2 100644
--- a/sql/updates/world/master/2022_01_04_13_world_2020_05_15_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_13_world_2020_05_15_01_world.sql
diff --git a/sql/updates/world/master/2022_01_04_14_world_2020_05_16_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_14_world_2020_05_16_00_world.sql
index c48237e14bf..c48237e14bf 100644
--- a/sql/updates/world/master/2022_01_04_14_world_2020_05_16_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_04_14_world_2020_05_16_00_world.sql
diff --git a/sql/updates/world/master/2022_01_05_00_world_2020_05_17_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_05_00_world_2020_05_17_01_world.sql
index 0e5d4473fee..0e5d4473fee 100644
--- a/sql/updates/world/master/2022_01_05_00_world_2020_05_17_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_05_00_world_2020_05_17_01_world.sql
diff --git a/sql/updates/world/master/2022_01_05_01_world_2020_05_17_02_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_05_01_world_2020_05_17_02_world.sql
index b020dbc9c18..b020dbc9c18 100644
--- a/sql/updates/world/master/2022_01_05_01_world_2020_05_17_02_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_05_01_world_2020_05_17_02_world.sql
diff --git a/sql/updates/world/master/2022_01_06_00_world_2020_05_17_03_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_00_world_2020_05_17_03_world.sql
index 0083da35248..0083da35248 100644
--- a/sql/updates/world/master/2022_01_06_00_world_2020_05_17_03_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_00_world_2020_05_17_03_world.sql
diff --git a/sql/updates/world/master/2022_01_06_01_world_2020_05_17_04_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_01_world_2020_05_17_04_world.sql
index bbb3c4082dd..bbb3c4082dd 100644
--- a/sql/updates/world/master/2022_01_06_01_world_2020_05_17_04_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_01_world_2020_05_17_04_world.sql
diff --git a/sql/updates/world/master/2022_01_06_02_world_2020_05_17_05_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_02_world_2020_05_17_05_world.sql
index 09ac1141c25..09ac1141c25 100644
--- a/sql/updates/world/master/2022_01_06_02_world_2020_05_17_05_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_02_world_2020_05_17_05_world.sql
diff --git a/sql/updates/world/master/2022_01_06_03_world_2020_05_17_06_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_03_world_2020_05_17_06_world.sql
index 3c67e655d7b..3c67e655d7b 100644
--- a/sql/updates/world/master/2022_01_06_03_world_2020_05_17_06_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_03_world_2020_05_17_06_world.sql
diff --git a/sql/updates/world/master/2022_01_06_04_world_2020_05_18_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_04_world_2020_05_18_00_world.sql
index 31b6fb6ddd4..31b6fb6ddd4 100644
--- a/sql/updates/world/master/2022_01_06_04_world_2020_05_18_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_04_world_2020_05_18_00_world.sql
diff --git a/sql/updates/world/master/2022_01_06_05_world_2020_05_19_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_05_world_2020_05_19_00_world.sql
index dc098a884d8..dc098a884d8 100644
--- a/sql/updates/world/master/2022_01_06_05_world_2020_05_19_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_05_world_2020_05_19_00_world.sql
diff --git a/sql/updates/world/master/2022_01_06_06_world_2020_05_19_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_06_world_2020_05_19_01_world.sql
index afc29baa908..afc29baa908 100644
--- a/sql/updates/world/master/2022_01_06_06_world_2020_05_19_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_06_world_2020_05_19_01_world.sql
diff --git a/sql/updates/world/master/2022_01_06_07_world_2020_05_19_02_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_07_world_2020_05_19_02_world.sql
index 5f3389a2d59..5f3389a2d59 100644
--- a/sql/updates/world/master/2022_01_06_07_world_2020_05_19_02_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_07_world_2020_05_19_02_world.sql
diff --git a/sql/updates/world/master/2022_01_06_08_world_2020_05_19_03_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_08_world_2020_05_19_03_world.sql
index ebeb29d81f9..ebeb29d81f9 100644
--- a/sql/updates/world/master/2022_01_06_08_world_2020_05_19_03_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_08_world_2020_05_19_03_world.sql
diff --git a/sql/updates/world/master/2022_01_06_09_world_2020_05_19_04_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_09_world_2020_05_19_04_world.sql
index 791d6e40fd8..791d6e40fd8 100644
--- a/sql/updates/world/master/2022_01_06_09_world_2020_05_19_04_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_09_world_2020_05_19_04_world.sql
diff --git a/sql/updates/world/master/2022_01_06_10_world_2020_05_19_05_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_10_world_2020_05_19_05_world.sql
index 1bfdfbb8a01..1bfdfbb8a01 100644
--- a/sql/updates/world/master/2022_01_06_10_world_2020_05_19_05_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_10_world_2020_05_19_05_world.sql
diff --git a/sql/updates/world/master/2022_01_06_11_world_2020_05_20_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_11_world_2020_05_20_01_world.sql
index 4feb480671e..4feb480671e 100644
--- a/sql/updates/world/master/2022_01_06_11_world_2020_05_20_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_11_world_2020_05_20_01_world.sql
diff --git a/sql/updates/world/master/2022_01_06_12_world_2020_05_20_02_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_12_world_2020_05_20_02_world.sql
index 768f9fccd0c..768f9fccd0c 100644
--- a/sql/updates/world/master/2022_01_06_12_world_2020_05_20_02_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_12_world_2020_05_20_02_world.sql
diff --git a/sql/updates/world/master/2022_01_06_13_world_2020_05_20_03_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_13_world_2020_05_20_03_world.sql
index 445f41974a9..445f41974a9 100644
--- a/sql/updates/world/master/2022_01_06_13_world_2020_05_20_03_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_13_world_2020_05_20_03_world.sql
diff --git a/sql/updates/world/master/2022_01_06_14_world_2020_05_22_00_world_335.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_14_world_2020_05_22_00_world_335.sql
index b635a618cfa..b635a618cfa 100644
--- a/sql/updates/world/master/2022_01_06_14_world_2020_05_22_00_world_335.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_14_world_2020_05_22_00_world_335.sql
diff --git a/sql/updates/world/master/2022_01_06_15_world_2020_05_21_02_world_335.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_15_world_2020_05_21_02_world_335.sql
index e9b8bf56cc8..e9b8bf56cc8 100644
--- a/sql/updates/world/master/2022_01_06_15_world_2020_05_21_02_world_335.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_15_world_2020_05_21_02_world_335.sql
diff --git a/sql/updates/world/master/2022_01_06_16_world_2020_05_21_03_world_335.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_16_world_2020_05_21_03_world_335.sql
index 26160cd59bc..26160cd59bc 100644
--- a/sql/updates/world/master/2022_01_06_16_world_2020_05_21_03_world_335.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_16_world_2020_05_21_03_world_335.sql
diff --git a/sql/updates/world/master/2022_01_06_17_world_2020_05_21_04_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_17_world_2020_05_21_04_world.sql
index 9a4506823c1..9a4506823c1 100644
--- a/sql/updates/world/master/2022_01_06_17_world_2020_05_21_04_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_17_world_2020_05_21_04_world.sql
diff --git a/sql/updates/world/master/2022_01_06_18_world_2020_05_21_05_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_18_world_2020_05_21_05_world.sql
index a7c005c0998..a7c005c0998 100644
--- a/sql/updates/world/master/2022_01_06_18_world_2020_05_21_05_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_18_world_2020_05_21_05_world.sql
diff --git a/sql/updates/world/master/2022_01_06_19_world_2020_05_22_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_19_world_2020_05_22_00_world.sql
index 1583dd91191..1583dd91191 100644
--- a/sql/updates/world/master/2022_01_06_19_world_2020_05_22_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_19_world_2020_05_22_00_world.sql
diff --git a/sql/updates/world/master/2022_01_06_20_world_2020_05_24_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_20_world_2020_05_24_00_world.sql
index 75c64b2e98f..75c64b2e98f 100644
--- a/sql/updates/world/master/2022_01_06_20_world_2020_05_24_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_20_world_2020_05_24_00_world.sql
diff --git a/sql/updates/world/master/2022_01_06_21_world_2020_05_24_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_21_world_2020_05_24_01_world.sql
index 7c4c064263a..7c4c064263a 100644
--- a/sql/updates/world/master/2022_01_06_21_world_2020_05_24_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_21_world_2020_05_24_01_world.sql
diff --git a/sql/updates/world/master/2022_01_06_22_world_2020_05_25_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_22_world_2020_05_25_00_world.sql
index 7fed92835a3..7fed92835a3 100644
--- a/sql/updates/world/master/2022_01_06_22_world_2020_05_25_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_22_world_2020_05_25_00_world.sql
diff --git a/sql/updates/world/master/2022_01_06_23_world_2020_05_25_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_23_world_2020_05_25_01_world.sql
index 535c7c277ce..535c7c277ce 100644
--- a/sql/updates/world/master/2022_01_06_23_world_2020_05_25_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_23_world_2020_05_25_01_world.sql
diff --git a/sql/updates/world/master/2022_01_06_24_world_2020_05_25_04_world_335.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_24_world_2020_05_25_04_world_335.sql
index 26d8488ee40..26d8488ee40 100644
--- a/sql/updates/world/master/2022_01_06_24_world_2020_05_25_04_world_335.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_24_world_2020_05_25_04_world_335.sql
diff --git a/sql/updates/world/master/2022_01_06_25_world_2020_05_25_05_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_25_world_2020_05_25_05_world.sql
index 42e81405b58..42e81405b58 100644
--- a/sql/updates/world/master/2022_01_06_25_world_2020_05_25_05_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_25_world_2020_05_25_05_world.sql
diff --git a/sql/updates/world/master/2022_01_06_26_world_2020_05_25_06_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_26_world_2020_05_25_06_world.sql
index f21fded2f3f..f21fded2f3f 100644
--- a/sql/updates/world/master/2022_01_06_26_world_2020_05_25_06_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_26_world_2020_05_25_06_world.sql
diff --git a/sql/updates/world/master/2022_01_06_27_world_2020_05_27_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_27_world_2020_05_27_00_world.sql
index 0cc2447868d..0cc2447868d 100644
--- a/sql/updates/world/master/2022_01_06_27_world_2020_05_27_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_27_world_2020_05_27_00_world.sql
diff --git a/sql/updates/world/master/2022_01_06_28_world_2020_05_27_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_28_world_2020_05_27_01_world.sql
index e0b31a1c4de..e0b31a1c4de 100644
--- a/sql/updates/world/master/2022_01_06_28_world_2020_05_27_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_28_world_2020_05_27_01_world.sql
diff --git a/sql/updates/world/master/2022_01_06_29_world_2020_05_27_02_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_29_world_2020_05_27_02_world.sql
index 5b064bf1bf9..5b064bf1bf9 100644
--- a/sql/updates/world/master/2022_01_06_29_world_2020_05_27_02_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_29_world_2020_05_27_02_world.sql
diff --git a/sql/updates/world/master/2022_01_06_30_world_2020_05_28_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_30_world_2020_05_28_00_world.sql
index 29daf84126b..29daf84126b 100644
--- a/sql/updates/world/master/2022_01_06_30_world_2020_05_28_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_30_world_2020_05_28_00_world.sql
diff --git a/sql/updates/world/master/2022_01_06_31_world_2020_05_28_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_31_world_2020_05_28_01_world.sql
index 180d7a3dd74..180d7a3dd74 100644
--- a/sql/updates/world/master/2022_01_06_31_world_2020_05_28_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_31_world_2020_05_28_01_world.sql
diff --git a/sql/updates/world/master/2022_01_06_32_world_2020_05_28_02_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_32_world_2020_05_28_02_world.sql
index e0704b755f9..e0704b755f9 100644
--- a/sql/updates/world/master/2022_01_06_32_world_2020_05_28_02_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_32_world_2020_05_28_02_world.sql
diff --git a/sql/updates/world/master/2022_01_06_33_world_2020_05_30_02_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_33_world_2020_05_30_02_world.sql
index 4580b30b849..4580b30b849 100644
--- a/sql/updates/world/master/2022_01_06_33_world_2020_05_30_02_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_33_world_2020_05_30_02_world.sql
diff --git a/sql/updates/world/master/2022_01_06_34_world_2020_05_30_03_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_34_world_2020_05_30_03_world.sql
index f2a2bd346f3..f2a2bd346f3 100644
--- a/sql/updates/world/master/2022_01_06_34_world_2020_05_30_03_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_34_world_2020_05_30_03_world.sql
diff --git a/sql/updates/world/master/2022_01_06_35_world_2020_05_30_04_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_35_world_2020_05_30_04_world.sql
index 49786bb4e88..49786bb4e88 100644
--- a/sql/updates/world/master/2022_01_06_35_world_2020_05_30_04_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_35_world_2020_05_30_04_world.sql
diff --git a/sql/updates/world/master/2022_01_06_36_world_2020_06_03_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_36_world_2020_06_03_00_world.sql
index 92978b2d024..92978b2d024 100644
--- a/sql/updates/world/master/2022_01_06_36_world_2020_06_03_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_36_world_2020_06_03_00_world.sql
diff --git a/sql/updates/world/master/2022_01_06_37_world_2020_06_14_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_37_world_2020_06_14_00_world.sql
index 47a04e605ca..47a04e605ca 100644
--- a/sql/updates/world/master/2022_01_06_37_world_2020_06_14_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_37_world_2020_06_14_00_world.sql
diff --git a/sql/updates/world/master/2022_01_06_38_world_2020_06_14_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_38_world_2020_06_14_01_world.sql
index e6b7b6cba45..e6b7b6cba45 100644
--- a/sql/updates/world/master/2022_01_06_38_world_2020_06_14_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_38_world_2020_06_14_01_world.sql
diff --git a/sql/updates/world/master/2022_01_06_39_world_2020_06_14_02_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_39_world_2020_06_14_02_world.sql
index 5e97746f2a8..5e97746f2a8 100644
--- a/sql/updates/world/master/2022_01_06_39_world_2020_06_14_02_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_39_world_2020_06_14_02_world.sql
diff --git a/sql/updates/world/master/2022_01_06_40_world_2020_06_14_03_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_40_world_2020_06_14_03_world.sql
index b0c8f7515d4..b0c8f7515d4 100644
--- a/sql/updates/world/master/2022_01_06_40_world_2020_06_14_03_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_40_world_2020_06_14_03_world.sql
diff --git a/sql/updates/world/master/2022_01_06_41_world_2020_06_14_04_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_41_world_2020_06_14_04_world.sql
index 7616f474fcc..7616f474fcc 100644
--- a/sql/updates/world/master/2022_01_06_41_world_2020_06_14_04_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_41_world_2020_06_14_04_world.sql
diff --git a/sql/updates/world/master/2022_01_06_42_world_2020_06_14_05_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_42_world_2020_06_14_05_world.sql
index 57986eec9a5..57986eec9a5 100644
--- a/sql/updates/world/master/2022_01_06_42_world_2020_06_14_05_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_42_world_2020_06_14_05_world.sql
diff --git a/sql/updates/world/master/2022_01_06_43_world_2020_06_14_07_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_43_world_2020_06_14_07_world.sql
index 012f439bb6b..012f439bb6b 100644
--- a/sql/updates/world/master/2022_01_06_43_world_2020_06_14_07_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_43_world_2020_06_14_07_world.sql
diff --git a/sql/updates/world/master/2022_01_06_44_world_2020_06_14_08_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_44_world_2020_06_14_08_world.sql
index c4ebed6881e..c4ebed6881e 100644
--- a/sql/updates/world/master/2022_01_06_44_world_2020_06_14_08_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_44_world_2020_06_14_08_world.sql
diff --git a/sql/updates/world/master/2022_01_06_45_world_2020_06_14_09_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_45_world_2020_06_14_09_world.sql
index 4a2c34e4513..4a2c34e4513 100644
--- a/sql/updates/world/master/2022_01_06_45_world_2020_06_14_09_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_45_world_2020_06_14_09_world.sql
diff --git a/sql/updates/world/master/2022_01_06_46_world_2020_06_14_10_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_46_world_2020_06_14_10_world.sql
index 7a403c85ad5..7a403c85ad5 100644
--- a/sql/updates/world/master/2022_01_06_46_world_2020_06_14_10_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_46_world_2020_06_14_10_world.sql
diff --git a/sql/updates/world/master/2022_01_06_47_world_2020_06_14_11_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_47_world_2020_06_14_11_world.sql
index 2a328c16129..2a328c16129 100644
--- a/sql/updates/world/master/2022_01_06_47_world_2020_06_14_11_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_47_world_2020_06_14_11_world.sql
diff --git a/sql/updates/world/master/2022_01_06_48_world_2020_06_14_12_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_48_world_2020_06_14_12_world.sql
index 6ca5a305949..6ca5a305949 100644
--- a/sql/updates/world/master/2022_01_06_48_world_2020_06_14_12_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_48_world_2020_06_14_12_world.sql
diff --git a/sql/updates/world/master/2022_01_06_49_world_2020_06_14_13_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_49_world_2020_06_14_13_world.sql
index 0e194cb115d..0e194cb115d 100644
--- a/sql/updates/world/master/2022_01_06_49_world_2020_06_14_13_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_49_world_2020_06_14_13_world.sql
diff --git a/sql/updates/world/master/2022_01_06_50_world_2020_06_14_14_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_50_world_2020_06_14_14_world.sql
index 80daa7c0e4d..80daa7c0e4d 100644
--- a/sql/updates/world/master/2022_01_06_50_world_2020_06_14_14_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_50_world_2020_06_14_14_world.sql
diff --git a/sql/updates/world/master/2022_01_06_51_world_2020_06_17_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_51_world_2020_06_17_00_world.sql
index 922c2c8161a..922c2c8161a 100644
--- a/sql/updates/world/master/2022_01_06_51_world_2020_06_17_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_51_world_2020_06_17_00_world.sql
diff --git a/sql/updates/world/master/2022_01_06_52_world_2020_06_17_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_52_world_2020_06_17_01_world.sql
index 3f418ee2dce..3f418ee2dce 100644
--- a/sql/updates/world/master/2022_01_06_52_world_2020_06_17_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_52_world_2020_06_17_01_world.sql
diff --git a/sql/updates/world/master/2022_01_06_53_world_2020_06_17_02_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_53_world_2020_06_17_02_world.sql
index e55a1d5fbe8..e55a1d5fbe8 100644
--- a/sql/updates/world/master/2022_01_06_53_world_2020_06_17_02_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_53_world_2020_06_17_02_world.sql
diff --git a/sql/updates/world/master/2022_01_06_54_world_2020_06_17_03_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_54_world_2020_06_17_03_world.sql
index 7f926143092..7f926143092 100644
--- a/sql/updates/world/master/2022_01_06_54_world_2020_06_17_03_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_54_world_2020_06_17_03_world.sql
diff --git a/sql/updates/world/master/2022_01_06_55_world_2020_06_17_04_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_55_world_2020_06_17_04_world.sql
index 41fa08dc5bb..41fa08dc5bb 100644
--- a/sql/updates/world/master/2022_01_06_55_world_2020_06_17_04_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_55_world_2020_06_17_04_world.sql
diff --git a/sql/updates/world/master/2022_01_06_56_world_2020_06_17_05_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_56_world_2020_06_17_05_world.sql
index 7b1b97b8db4..7b1b97b8db4 100644
--- a/sql/updates/world/master/2022_01_06_56_world_2020_06_17_05_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_56_world_2020_06_17_05_world.sql
diff --git a/sql/updates/world/master/2022_01_06_57_world_2020_06_17_06_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_57_world_2020_06_17_06_world.sql
index 778084d031e..778084d031e 100644
--- a/sql/updates/world/master/2022_01_06_57_world_2020_06_17_06_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_57_world_2020_06_17_06_world.sql
diff --git a/sql/updates/world/master/2022_01_06_58_world_2020_06_17_07_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_58_world_2020_06_17_07_world.sql
index 46a68b97bd7..46a68b97bd7 100644
--- a/sql/updates/world/master/2022_01_06_58_world_2020_06_17_07_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_58_world_2020_06_17_07_world.sql
diff --git a/sql/updates/world/master/2022_01_06_59_world_2020_06_17_08_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_59_world_2020_06_17_08_world.sql
index 0fb06c262ea..0fb06c262ea 100644
--- a/sql/updates/world/master/2022_01_06_59_world_2020_06_17_08_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_59_world_2020_06_17_08_world.sql
diff --git a/sql/updates/world/master/2022_01_06_60_world_2020_06_17_09_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_60_world_2020_06_17_09_world.sql
index e8b8e9137cc..e8b8e9137cc 100644
--- a/sql/updates/world/master/2022_01_06_60_world_2020_06_17_09_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_60_world_2020_06_17_09_world.sql
diff --git a/sql/updates/world/master/2022_01_06_61_world_2020_06_17_10_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_61_world_2020_06_17_10_world.sql
index 39f53ca6a2e..39f53ca6a2e 100644
--- a/sql/updates/world/master/2022_01_06_61_world_2020_06_17_10_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_61_world_2020_06_17_10_world.sql
diff --git a/sql/updates/world/master/2022_01_06_62_world_2020_06_18_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_62_world_2020_06_18_00_world.sql
index 26af8a744de..26af8a744de 100644
--- a/sql/updates/world/master/2022_01_06_62_world_2020_06_18_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_62_world_2020_06_18_00_world.sql
diff --git a/sql/updates/world/master/2022_01_06_63_world_2020_06_18_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_63_world_2020_06_18_01_world.sql
index 862ce73b0e4..862ce73b0e4 100644
--- a/sql/updates/world/master/2022_01_06_63_world_2020_06_18_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_63_world_2020_06_18_01_world.sql
diff --git a/sql/updates/world/master/2022_01_06_64_world_2020_06_18_02_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_64_world_2020_06_18_02_world.sql
index 68d87e1820d..68d87e1820d 100644
--- a/sql/updates/world/master/2022_01_06_64_world_2020_06_18_02_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_64_world_2020_06_18_02_world.sql
diff --git a/sql/updates/world/master/2022_01_06_65_world_2020_06_18_03_world_335.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_65_world_2020_06_18_03_world_335.sql
index caea7dae7c2..caea7dae7c2 100644
--- a/sql/updates/world/master/2022_01_06_65_world_2020_06_18_03_world_335.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_65_world_2020_06_18_03_world_335.sql
diff --git a/sql/updates/world/master/2022_01_06_66_world_2020_06_18_04_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_66_world_2020_06_18_04_world.sql
index 7b561326915..7b561326915 100644
--- a/sql/updates/world/master/2022_01_06_66_world_2020_06_18_04_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_66_world_2020_06_18_04_world.sql
diff --git a/sql/updates/world/master/2022_01_06_67_world_2020_06_18_05_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_67_world_2020_06_18_05_world.sql
index 0732a1b014b..0732a1b014b 100644
--- a/sql/updates/world/master/2022_01_06_67_world_2020_06_18_05_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_67_world_2020_06_18_05_world.sql
diff --git a/sql/updates/world/master/2022_01_06_68_world_2020_06_19_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_68_world_2020_06_19_00_world.sql
index 6ddde608b37..6ddde608b37 100644
--- a/sql/updates/world/master/2022_01_06_68_world_2020_06_19_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_68_world_2020_06_19_00_world.sql
diff --git a/sql/updates/world/master/2022_01_06_69_world_2020_06_20_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_69_world_2020_06_20_00_world.sql
index 315d28b3f4e..315d28b3f4e 100644
--- a/sql/updates/world/master/2022_01_06_69_world_2020_06_20_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_69_world_2020_06_20_00_world.sql
diff --git a/sql/updates/world/master/2022_01_06_70_world_2020_06_20_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_70_world_2020_06_20_01_world.sql
index 7bbac8acbf4..7bbac8acbf4 100644
--- a/sql/updates/world/master/2022_01_06_70_world_2020_06_20_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_70_world_2020_06_20_01_world.sql
diff --git a/sql/updates/world/master/2022_01_06_71_world_2020_06_20_02_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_71_world_2020_06_20_02_world.sql
index f8cc6af93d5..f8cc6af93d5 100644
--- a/sql/updates/world/master/2022_01_06_71_world_2020_06_20_02_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_71_world_2020_06_20_02_world.sql
diff --git a/sql/updates/world/master/2022_01_06_72_world_2020_06_20_03_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_72_world_2020_06_20_03_world.sql
index bed5b36db36..bed5b36db36 100644
--- a/sql/updates/world/master/2022_01_06_72_world_2020_06_20_03_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_72_world_2020_06_20_03_world.sql
diff --git a/sql/updates/world/master/2022_01_06_73_world_2020_06_20_04_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_73_world_2020_06_20_04_world.sql
index cbd34281a95..cbd34281a95 100644
--- a/sql/updates/world/master/2022_01_06_73_world_2020_06_20_04_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_73_world_2020_06_20_04_world.sql
diff --git a/sql/updates/world/master/2022_01_06_74_world_2020_06_20_05_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_74_world_2020_06_20_05_world.sql
index 63df7cfeac6..63df7cfeac6 100644
--- a/sql/updates/world/master/2022_01_06_74_world_2020_06_20_05_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_74_world_2020_06_20_05_world.sql
diff --git a/sql/updates/world/master/2022_01_06_75_world_2020_06_24_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_75_world_2020_06_24_00_world.sql
index df7d800621b..df7d800621b 100644
--- a/sql/updates/world/master/2022_01_06_75_world_2020_06_24_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_06_75_world_2020_06_24_00_world.sql
diff --git a/sql/updates/world/master/2022_01_07_00_world_warlock_drain_soul.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_07_00_world_warlock_drain_soul.sql
index a5b158b0d60..a5b158b0d60 100644
--- a/sql/updates/world/master/2022_01_07_00_world_warlock_drain_soul.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_07_00_world_warlock_drain_soul.sql
diff --git a/sql/updates/world/master/2022_01_07_01_world_mage_chrono_shift.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_07_01_world_mage_chrono_shift.sql
index 902ea234893..902ea234893 100644
--- a/sql/updates/world/master/2022_01_07_01_world_mage_chrono_shift.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_07_01_world_mage_chrono_shift.sql
diff --git a/sql/updates/world/master/2022_01_08_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_08_00_world.sql
index c3bf2c617db..c3bf2c617db 100644
--- a/sql/updates/world/master/2022_01_08_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_08_00_world.sql
diff --git a/sql/updates/world/master/2022_01_09_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_09_00_world.sql
index 1b6dcf65c16..1b6dcf65c16 100644
--- a/sql/updates/world/master/2022_01_09_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_09_00_world.sql
diff --git a/sql/updates/world/master/2022_01_09_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_09_01_world.sql
index 6d19eda4367..6d19eda4367 100644
--- a/sql/updates/world/master/2022_01_09_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_09_01_world.sql
diff --git a/sql/updates/world/master/2022_01_09_02_world_shaman_ghost_wolf.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_09_02_world_shaman_ghost_wolf.sql
index c1c0f0607e3..c1c0f0607e3 100644
--- a/sql/updates/world/master/2022_01_09_02_world_shaman_ghost_wolf.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_09_02_world_shaman_ghost_wolf.sql
diff --git a/sql/updates/world/master/2022_01_09_03_world_priest_shadow_mend.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_09_03_world_priest_shadow_mend.sql
index 6c4db49e415..6c4db49e415 100644
--- a/sql/updates/world/master/2022_01_09_03_world_priest_shadow_mend.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_09_03_world_priest_shadow_mend.sql
diff --git a/sql/updates/world/master/2022_01_10_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_10_00_world.sql
index d4959ac4a18..d4959ac4a18 100644
--- a/sql/updates/world/master/2022_01_10_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_10_00_world.sql
diff --git a/sql/updates/world/master/2022_01_10_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_10_01_world.sql
index ebcc94400f6..ebcc94400f6 100644
--- a/sql/updates/world/master/2022_01_10_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_10_01_world.sql
diff --git a/sql/updates/world/master/2022_01_11_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_11_00_world.sql
index ccc72868801..ccc72868801 100644
--- a/sql/updates/world/master/2022_01_11_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_11_00_world.sql
diff --git a/sql/updates/world/master/2022_01_11_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_11_01_world.sql
index 37cd01ab584..37cd01ab584 100644
--- a/sql/updates/world/master/2022_01_11_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_11_01_world.sql
diff --git a/sql/updates/world/master/2022_01_12_00_world_shaman_mastery_elemental_overload.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_12_00_world_shaman_mastery_elemental_overload.sql
index f77d2910c0a..f77d2910c0a 100644
--- a/sql/updates/world/master/2022_01_12_00_world_shaman_mastery_elemental_overload.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_12_00_world_shaman_mastery_elemental_overload.sql
diff --git a/sql/updates/world/master/2022_01_12_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_12_01_world.sql
index cc50be34f96..cc50be34f96 100644
--- a/sql/updates/world/master/2022_01_12_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_12_01_world.sql
diff --git a/sql/updates/world/master/2022_01_12_02_world_hunter_murder_of_crows.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_12_02_world_hunter_murder_of_crows.sql
index 33be2a705a8..33be2a705a8 100644
--- a/sql/updates/world/master/2022_01_12_02_world_hunter_murder_of_crows.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_12_02_world_hunter_murder_of_crows.sql
diff --git a/sql/updates/world/master/2022_01_12_03_world_mage_firestarter.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_12_03_world_mage_firestarter.sql
index 8259a3d6f0d..8259a3d6f0d 100644
--- a/sql/updates/world/master/2022_01_12_03_world_mage_firestarter.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_12_03_world_mage_firestarter.sql
diff --git a/sql/updates/world/master/2022_01_13_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_00_world.sql
index 86b5ecffe7a..86b5ecffe7a 100644
--- a/sql/updates/world/master/2022_01_13_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_00_world.sql
diff --git a/sql/updates/world/master/2022_01_13_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_01_world.sql
index 18d71331735..18d71331735 100644
--- a/sql/updates/world/master/2022_01_13_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_01_world.sql
diff --git a/sql/updates/world/master/2022_01_13_02_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_02_world.sql
index ba86e9a74e7..ba86e9a74e7 100644
--- a/sql/updates/world/master/2022_01_13_02_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_02_world.sql
diff --git a/sql/updates/world/master/2022_01_13_03_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_03_world.sql
index f21348a2812..f21348a2812 100644
--- a/sql/updates/world/master/2022_01_13_03_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_03_world.sql
diff --git a/sql/updates/world/master/2022_01_13_04_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_04_world.sql
index 9d1b953cd6c..9d1b953cd6c 100644
--- a/sql/updates/world/master/2022_01_13_04_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_04_world.sql
diff --git a/sql/updates/world/master/2022_01_13_05_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_05_world.sql
index 97f9c3af781..97f9c3af781 100644
--- a/sql/updates/world/master/2022_01_13_05_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_05_world.sql
diff --git a/sql/updates/world/master/2022_01_13_06_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_06_world.sql
index a855af3db62..a855af3db62 100644
--- a/sql/updates/world/master/2022_01_13_06_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_06_world.sql
diff --git a/sql/updates/world/master/2022_01_13_07_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_07_world.sql
index 5532f948589..5532f948589 100644
--- a/sql/updates/world/master/2022_01_13_07_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_07_world.sql
diff --git a/sql/updates/world/master/2022_01_13_08_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_08_world.sql
index 1aee4723a52..1aee4723a52 100644
--- a/sql/updates/world/master/2022_01_13_08_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_08_world.sql
diff --git a/sql/updates/world/master/2022_01_13_09_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_09_world.sql
index 271112c08bf..271112c08bf 100644
--- a/sql/updates/world/master/2022_01_13_09_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_13_09_world.sql
diff --git a/sql/updates/world/master/2022_01_14_00_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_14_00_world.sql
index c599dbf69e2..c599dbf69e2 100644
--- a/sql/updates/world/master/2022_01_14_00_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_14_00_world.sql
diff --git a/sql/updates/world/master/2022_01_14_01_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_14_01_world.sql
index 932d4be0884..932d4be0884 100644
--- a/sql/updates/world/master/2022_01_14_01_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_14_01_world.sql
diff --git a/sql/updates/world/master/2022_01_14_02_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_14_02_world.sql
index 2085de94078..2085de94078 100644
--- a/sql/updates/world/master/2022_01_14_02_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_14_02_world.sql
diff --git a/sql/updates/world/master/2022_01_14_03_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_14_03_world.sql
index 609f4b576a4..609f4b576a4 100644
--- a/sql/updates/world/master/2022_01_14_03_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_14_03_world.sql
diff --git a/sql/updates/world/master/2022_01_14_04_world.sql b/sql/old/9.x/world/22011_2022_01_15/2022_01_14_04_world.sql
index 56181bdae21..56181bdae21 100644
--- a/sql/updates/world/master/2022_01_14_04_world.sql
+++ b/sql/old/9.x/world/22011_2022_01_15/2022_01_14_04_world.sql
diff --git a/sql/updates/auth/master/2022_01_15_00_auth.sql b/sql/updates/auth/master/2022_01_15_00_auth.sql
new file mode 100644
index 00000000000..a178b68a082
--- /dev/null
+++ b/sql/updates/auth/master/2022_01_15_00_auth.sql
@@ -0,0 +1,3 @@
+-- TDB 915.22012 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/2022_01_15_00_characters.sql b/sql/updates/characters/master/2022_01_15_00_characters.sql
new file mode 100644
index 00000000000..9fc61f158ff
--- /dev/null
+++ b/sql/updates/characters/master/2022_01_15_00_characters.sql
@@ -0,0 +1,3 @@
+-- TDB 915.22012 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/2022_01_15_01_hotfixes.sql b/sql/updates/hotfixes/master/2022_01_15_01_hotfixes.sql
new file mode 100644
index 00000000000..a24762a729c
--- /dev/null
+++ b/sql/updates/hotfixes/master/2022_01_15_01_hotfixes.sql
@@ -0,0 +1,3 @@
+-- TDB 915.22012 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/2022_01_15_00_world.sql b/sql/updates/world/master/2022_01_15_00_world.sql
new file mode 100644
index 00000000000..7092661cf97
--- /dev/null
+++ b/sql/updates/world/master/2022_01_15_00_world.sql
@@ -0,0 +1,4 @@
+-- TDB 915.22012 world
+UPDATE `version` SET `db_version`='TDB 915.22012', `cache_id`=22012 LIMIT 1;
+UPDATE `updates` SET `state`='ARCHIVED',`speed`=0;
+REPLACE INTO `updates_include` (`path`, `state`) VALUES ('$/sql/old/9.x/world', 'ARCHIVED');