Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into legion

2 files changed, 40 insertions, 0 deletions

diff --git a/sql/updates/hotfixes/2016_xx_xx_xx_hotfixes_legion_11.sql b/sql/updates/hotfixes/2016_xx_xx_xx_hotfixes_legion_11.sql
new file mode 100644
index 00000000000..ac0e9d5a81b
--- /dev/null
+++ b/sql/updates/hotfixes/2016_xx_xx_xx_hotfixes_legion_11.sql
@@ -0,0 +1,13 @@
+ALTER TABLE `item_upgrade`
+  CHANGE `CurrencyCost` `CurrencyCost` int(10) unsigned NOT NULL DEFAULT '0' AFTER `ID`,
+  CHANGE `PrevItemUpgradeID` `PrevItemUpgradeID` smallint(5) unsigned NOT NULL DEFAULT '0' AFTER `CurrencyCost`,
+  CHANGE `CurrencyID` `CurrencyID` smallint(5) unsigned NOT NULL DEFAULT '0' AFTER `PrevItemUpgradeID`,
+  CHANGE `ItemUpgradePathID` `ItemUpgradePathID` tinyint(3) unsigned NOT NULL DEFAULT '0' AFTER `CurrencyID`,
+  CHANGE `ItemLevelBonus` `ItemLevelBonus` tinyint(3) unsigned NOT NULL DEFAULT '0' AFTER `ItemUpgradePathID`;
+
+ALTER TABLE `ruleset_item_upgrade`
+  CHANGE `ItemID` `ItemID` int(10) unsigned NOT NULL DEFAULT '0' AFTER `ID`,
+  CHANGE `ItemUpgradeID` `ItemUpgradeID` smallint(5) unsigned NOT NULL DEFAULT '0' AFTER `ItemID`,
+  DROP `RulesetID`;
+
+ALTER TABLE `skill_line_ability` CHANGE `AquireMethod` `AcquireMethod` tinyint(3) unsigned NOT NULL DEFAULT '0';
diff --git a/sql/updates/hotfixes/6.x/2016_06_21_00_hotfixes.sql b/sql/updates/hotfixes/6.x/2016_06_21_00_hotfixes.sql
new file mode 100644
index 00000000000..e2ca7d2ce65
--- /dev/null
+++ b/sql/updates/hotfixes/6.x/2016_06_21_00_hotfixes.sql
@@ -0,0 +1,27 @@
+--
+-- Table structure for table `item_upgrade`
+--
+DROP TABLE IF EXISTS `item_upgrade`;
+CREATE TABLE `item_upgrade` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemUpgradePathID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemLevelBonus` int(10) unsigned NOT NULL DEFAULT '0',
+  `PrevItemUpgradeID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyCost` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `ruleset_item_upgrade`
+--
+DROP TABLE IF EXISTS `ruleset_item_upgrade`;
+CREATE TABLE `ruleset_item_upgrade` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `RulesetID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemUpgradeID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;