Merge branch 'master' of https://github.com/EQEmu/Server into integration/multi-tenancy-expansions-repository

utils/sql/db_update_manifest.txt

@@ -406,6 +406,7 @@
 9150|2020_02_06_aa_reset_on_death.sql|SHOW COLUMNS FROM `aa_ability` LIKE 'reset_on_death'|empty|
 9151|2020_03_05_npc_always_aggro.sql|SHOW COLUMNS FROM `npc_types` LIKE 'always_aggro'|empty|
 9152|2020_03_09_convert_myisam_to_innodb.sql|SELECT * FROM db_version WHERE version >= 9152|empty|
+9153|2020_05_09_items_subtype.sql|SHOW COLUMNS from `items` LIKE 'UNK219'|not_empty|
 
 # Upgrade conditions:
 # 	This won't be needed after this system is implemented, but it is used database that are not

utils/sql/git/optional/2020_05_11_unbreakable_fishing.sql

@@ -0,0 +1,3 @@
+/* In July 2018 - magical poles were no longer breakable */
+
+UPDATE items SET subtype = magic WHERE itemtype = 36;

utils/sql/git/required/2020_05_09_items_subtype.sql

@@ -0,0 +1 @@
+ALTER TABLE `items` CHANGE `UNK219` `subtype` int(11) not null default '0';