Merge. Revision history for source files should be all back now.

--HG--
branch : trunk
rename : sql/CMakeLists.txt => sql/tools/CMakeLists.txt
rename : src/server/game/Pools/PoolHandler.cpp => src/server/game/Pools/PoolMgr.cpp
rename : src/server/game/Pools/PoolHandler.h => src/server/game/Pools/PoolMgr.h
rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp
rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h

79 files changed, 204 insertions, 22 deletions

diff --git a/sql/updates/2.4.3_old/CMakeLists.txt b/sql/updates/2.4.3_old/CMakeLists.txt
index 229a6de626c..585813a934b 100644
--- a/sql/updates/2.4.3_old/CMakeLists.txt
+++ b/sql/updates/2.4.3_old/CMakeLists.txt
@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_243 *.sql)
 
-INSTALL(FILES
-${_SQL_243}
-DESTINATION share/trinity/sql/updates/2.4.3_updates)
\ No newline at end of file
+INSTALL(FILES ${_SQL_243} DESTINATION share/trinity/sql/updates/2.4.3_old)
\ No newline at end of file
diff --git a/sql/updates/3.0.9_old/CMakeLists.txt b/sql/updates/3.0.9_old/CMakeLists.txt
index 7d2b2d975d3..d09917d76f9 100644
--- a/sql/updates/3.0.9_old/CMakeLists.txt
+++ b/sql/updates/3.0.9_old/CMakeLists.txt
@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_309 *.sql)
 
-INSTALL(FILES
-${_SQL_309}
-DESTINATION share/trinity/sql/updates/3.0.9_old)
\ No newline at end of file
+INSTALL(FILES ${_SQL_309} DESTINATION share/trinity/sql/updates/3.0.9_old)
\ No newline at end of file
diff --git a/sql/updates/3.1.3_old/CMakeLists.txt b/sql/updates/3.1.3_old/CMakeLists.txt
index 1c99a2be619..5a99663dff5 100644
--- a/sql/updates/3.1.3_old/CMakeLists.txt
+++ b/sql/updates/3.1.3_old/CMakeLists.txt
@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_313 *.sql)
 
-INSTALL(FILES
-${_SQL_313}
-DESTINATION share/trinity/sql/updates/3.1.3_old)
\ No newline at end of file
+INSTALL(FILES ${_SQL_313} DESTINATION share/trinity/sql/updates/3.1.3_old)
\ No newline at end of file
diff --git a/sql/updates/3.2.2a_old/CMakeLists.txt b/sql/updates/3.2.2a_old/CMakeLists.txt
index e6193267b8a..391d4895850 100644
--- a/sql/updates/3.2.2a_old/CMakeLists.txt
+++ b/sql/updates/3.2.2a_old/CMakeLists.txt
@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_322 *.sql)
 
-INSTALL(FILES
-${_SQL_322}
-DESTINATION share/trinity/sql/updates/3.2.2a_old)
\ No newline at end of file
+INSTALL(FILES ${_SQL_322} DESTINATION share/trinity/sql/updates/3.2.2a_old)
\ No newline at end of file
diff --git a/sql/updates/3.3.2_old/CMakeLists.txt b/sql/updates/3.3.2_old/CMakeLists.txt
index 87734d93da3..75f051dcede 100644
--- a/sql/updates/3.3.2_old/CMakeLists.txt
+++ b/sql/updates/3.3.2_old/CMakeLists.txt
@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_332 *.sql)
 
-INSTALL(FILES
-${_SQL_332}
-DESTINATION share/trinity/sql/updates/3.3.2_old)
\ No newline at end of file
+INSTALL(FILES ${_SQL_332} DESTINATION share/trinity/sql/updates/3.3.2_old)
\ No newline at end of file
diff --git a/sql/updates/8312_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8312_world_spell_proc_event.sql
index 775ad64f307..775ad64f307 100644
--- a/sql/updates/8312_world_spell_proc_event.sql
+++ b/sql/updates/3.3.3a_old/8312_world_spell_proc_event.sql
diff --git a/sql/updates/8313_world_spell_bonus_data.sql b/sql/updates/3.3.3a_old/8313_world_spell_bonus_data.sql
index 7121fd8a4e1..7121fd8a4e1 100644
--- a/sql/updates/8313_world_spell_bonus_data.sql
+++ b/sql/updates/3.3.3a_old/8313_world_spell_bonus_data.sql
diff --git a/sql/updates/8315_world_spell_bonus_data.sql b/sql/updates/3.3.3a_old/8315_world_spell_bonus_data.sql
index 6a95716a1d7..6a95716a1d7 100644
--- a/sql/updates/8315_world_spell_bonus_data.sql
+++ b/sql/updates/3.3.3a_old/8315_world_spell_bonus_data.sql
diff --git a/sql/updates/8316_world_spell_bonus_data.sql b/sql/updates/3.3.3a_old/8316_world_spell_bonus_data.sql
index bad80f0cd4c..bad80f0cd4c 100644
--- a/sql/updates/8316_world_spell_bonus_data.sql
+++ b/sql/updates/3.3.3a_old/8316_world_spell_bonus_data.sql
diff --git a/sql/updates/8318_world_spell_bonus_data.sql b/sql/updates/3.3.3a_old/8318_world_spell_bonus_data.sql
index c262f5e5c05..c262f5e5c05 100644
--- a/sql/updates/8318_world_spell_bonus_data.sql
+++ b/sql/updates/3.3.3a_old/8318_world_spell_bonus_data.sql
diff --git a/sql/updates/8319_world_spell_linked_spell.sql b/sql/updates/3.3.3a_old/8319_world_spell_linked_spell.sql
index 5c8db788868..5c8db788868 100644
--- a/sql/updates/8319_world_spell_linked_spell.sql
+++ b/sql/updates/3.3.3a_old/8319_world_spell_linked_spell.sql
diff --git a/sql/updates/8327_world_scriptname.sql b/sql/updates/3.3.3a_old/8327_world_scriptname.sql
index be75f817100..be75f817100 100644
--- a/sql/updates/8327_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8327_world_scriptname.sql
diff --git a/sql/updates/8330_world_playercreateinfo_spell.sql b/sql/updates/3.3.3a_old/8330_world_playercreateinfo_spell.sql
index c79731abdfe..c79731abdfe 100644
--- a/sql/updates/8330_world_playercreateinfo_spell.sql
+++ b/sql/updates/3.3.3a_old/8330_world_playercreateinfo_spell.sql
diff --git a/sql/updates/8334_world_scriptname.sql b/sql/updates/3.3.3a_old/8334_world_scriptname.sql
index abd905d0f22..abd905d0f22 100644
--- a/sql/updates/8334_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8334_world_scriptname.sql
diff --git a/sql/updates/8348_world_script_texts.sql b/sql/updates/3.3.3a_old/8348_world_script_texts.sql
index af3d17c700b..af3d17c700b 100644
--- a/sql/updates/8348_world_script_texts.sql
+++ b/sql/updates/3.3.3a_old/8348_world_script_texts.sql
diff --git a/sql/updates/8348_world_scriptname.sql b/sql/updates/3.3.3a_old/8348_world_scriptname.sql
index 42fbaed7eb7..42fbaed7eb7 100644
--- a/sql/updates/8348_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8348_world_scriptname.sql
diff --git a/sql/updates/8352_world_scriptname.sql b/sql/updates/3.3.3a_old/8352_world_scriptname.sql
index d3e350f60f3..d3e350f60f3 100644
--- a/sql/updates/8352_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8352_world_scriptname.sql
diff --git a/sql/updates/8352_world_spell_linked_spell.sql b/sql/updates/3.3.3a_old/8352_world_spell_linked_spell.sql
index 00462fce1ac..9feca78a3ff 100644
--- a/sql/updates/8352_world_spell_linked_spell.sql
+++ b/sql/updates/3.3.3a_old/8352_world_spell_linked_spell.sql
@@ -1,5 +1,4 @@
 DELETE FROM `spell_linked_spell` WHERE `spell_effect` IN (52418, -52418);
-
 INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
 (52415, 52418, 0, 'Carrying Seaforium - Add'),
 (52410, -52418, 0, 'Carrying Seaforium - Remove');
diff --git a/sql/updates/8358_world_spell_linked_spell.sql b/sql/updates/3.3.3a_old/8358_world_spell_linked_spell.sql
index f86328d30e0..f86328d30e0 100644
--- a/sql/updates/8358_world_spell_linked_spell.sql
+++ b/sql/updates/3.3.3a_old/8358_world_spell_linked_spell.sql
diff --git a/sql/updates/8361_world_trinity_string.sql b/sql/updates/3.3.3a_old/8361_world_trinity_string.sql
index f8bf096c075..f8bf096c075 100644
--- a/sql/updates/8361_world_trinity_string.sql
+++ b/sql/updates/3.3.3a_old/8361_world_trinity_string.sql
diff --git a/sql/updates/8371_world_spell_bonus_data.sql b/sql/updates/3.3.3a_old/8371_world_spell_bonus_data.sql
index 5b72884b34c..5b72884b34c 100644
--- a/sql/updates/8371_world_spell_bonus_data.sql
+++ b/sql/updates/3.3.3a_old/8371_world_spell_bonus_data.sql
diff --git a/sql/updates/8372_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8372_world_spell_proc_event.sql
index 0f072328d27..0f072328d27 100644
--- a/sql/updates/8372_world_spell_proc_event.sql
+++ b/sql/updates/3.3.3a_old/8372_world_spell_proc_event.sql
diff --git a/sql/updates/8373_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8373_world_spell_proc_event.sql
index 20f87b3f1f9..20f87b3f1f9 100644
--- a/sql/updates/8373_world_spell_proc_event.sql
+++ b/sql/updates/3.3.3a_old/8373_world_spell_proc_event.sql
diff --git a/sql/updates/8374_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8374_world_spell_proc_event.sql
index 2ee60a1b9af..2ee60a1b9af 100644
--- a/sql/updates/8374_world_spell_proc_event.sql
+++ b/sql/updates/3.3.3a_old/8374_world_spell_proc_event.sql
diff --git a/sql/updates/8375_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8375_world_spell_proc_event.sql
index 62700485066..62700485066 100644
--- a/sql/updates/8375_world_spell_proc_event.sql
+++ b/sql/updates/3.3.3a_old/8375_world_spell_proc_event.sql
diff --git a/sql/updates/8391_world_conditions.sql b/sql/updates/3.3.3a_old/8391_world_conditions.sql
index 2eb3d79fac9..fb5cc9fbc9e 100644
--- a/sql/updates/8391_world_conditions.sql
+++ b/sql/updates/3.3.3a_old/8391_world_conditions.sql
@@ -1,6 +1,7 @@
 -- ----------------------------
 -- Table structure for conditions
 -- ----------------------------
+DROP TABLE IF EXISTS `conditions`;
 CREATE TABLE `conditions` (
   `SourceTypeOrReferenceId` mediumint(8) NOT NULL DEFAULT '0',
   `SourceGroup` mediumint(8) unsigned NOT NULL DEFAULT '0',
diff --git a/sql/updates/8397_world_command.sql b/sql/updates/3.3.3a_old/8397_world_command.sql
index f90f37e7eab..f90f37e7eab 100644
--- a/sql/updates/8397_world_command.sql
+++ b/sql/updates/3.3.3a_old/8397_world_command.sql
diff --git a/sql/updates/3.3.3a_old/8510_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8510_world_spell_proc_event.sql
new file mode 100644
index 00000000000..c9d0a9cbc69
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8510_world_spell_proc_event.sql
@@ -0,0 +1 @@
+UPDATE spell_proc_event SET SpellFamilyMask0 = SpellFamilyMask0 | 0x40000000, procEx = ProcEx | 0x0000001 WHERE entry IN(53569,53576);
diff --git a/sql/updates/3.3.3a_old/8511_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8511_world_spell_proc_event.sql
new file mode 100644
index 00000000000..91cc7841f97
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8511_world_spell_proc_event.sql
@@ -0,0 +1 @@
+UPDATE spell_proc_event SET procEx = 0x0 WHERE entry IN(53569,53576);
diff --git a/sql/updates/3.3.3a_old/8512_world_command.sql b/sql/updates/3.3.3a_old/8512_world_command.sql
new file mode 100644
index 00000000000..6293503d492
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8512_world_command.sql
@@ -0,0 +1,3 @@
+DELETE FROM `command` WHERE `name`='reload creature_onkill_reputation';
+INSERT INTO `command` VALUES 
+('reload creature_onkill_reputation','3','Syntax: .reload creature_onkill_reputation\r\nReload creature_onkill_reputation table.');
diff --git a/sql/updates/3.3.3a_old/8565_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8565_world_spell_proc_event.sql
new file mode 100644
index 00000000000..b4a378e458c
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8565_world_spell_proc_event.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_proc_event` WHERE `entry`=70761;
+INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES
+( 70761, 0x00,  10, 0x00000000, 0x80004000, 0x00000001, 0x00000400, 0x00000000,   0,   0,   0); -- Item - Paladin T10 Protection 4P Bonus
diff --git a/sql/updates/3.3.3a_old/8568_world_npc_vendor.sql b/sql/updates/3.3.3a_old/8568_world_npc_vendor.sql
new file mode 100644
index 00000000000..63645847ef6
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8568_world_npc_vendor.sql
@@ -0,0 +1 @@
+ALTER TABLE npc_vendor CHANGE COLUMN `ExtendedCost` `ExtendedCost` mediumint(8) NOT NULL default '0' COMMENT 'negative if cost must exclude normal money cost';
diff --git a/sql/updates/3.3.3a_old/8568_world_trinity_string.sql b/sql/updates/3.3.3a_old/8568_world_trinity_string.sql
new file mode 100644
index 00000000000..c4fdc2f8480
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8568_world_trinity_string.sql
@@ -0,0 +1,3 @@
+DELETE FROM trinity_string WHERE entry IN (210);
+INSERT INTO trinity_string VALUES
+(210,'Item \'%i\' (with extended cost %i) already in vendor list.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/sql/updates/3.3.3a_old/8575_world_command.sql b/sql/updates/3.3.3a_old/8575_world_command.sql
new file mode 100644
index 00000000000..8175ad3d453
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8575_world_command.sql
@@ -0,0 +1,2 @@
+DELETE FROM command WHERE name = 'reload conditions';
+INSERT INTO command (name, security, help) VALUES ('reload conditions', 3, 'Reload conditions table.');
diff --git a/sql/updates/3.3.3a_old/8576_world_command.sql b/sql/updates/3.3.3a_old/8576_world_command.sql
new file mode 100644
index 00000000000..4512dfe8a28
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8576_world_command.sql
@@ -0,0 +1 @@
+DELETE FROM command WHERE name = 'reload spell_script_target';
diff --git a/sql/updates/3.3.3a_old/8586_world_command.sql b/sql/updates/3.3.3a_old/8586_world_command.sql
new file mode 100644
index 00000000000..b554755df08
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8586_world_command.sql
@@ -0,0 +1,4 @@
+DELETE FROM `command` WHERE `name` IN ('reload item_set_names','reload locales_item_set_name');
+INSERT INTO `command` VALUES 
+('reload item_set_names',3,'Syntax: .reload item_set_names\nReload item_set_names table.'),
+('reload locales_item_set_name',3,'Syntax: .reload locales_item_set_name\nReload locales_item_set_name table.');
diff --git a/sql/updates/3.3.3a_old/8586_world_item_set_names.sql b/sql/updates/3.3.3a_old/8586_world_item_set_names.sql
new file mode 100644
index 00000000000..f62df79678a
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8586_world_item_set_names.sql
@@ -0,0 +1,14 @@
+--
+-- Table structure for table `item_set_names`
+--
+
+DROP TABLE IF EXISTS `item_set_names`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_set_names` (
+  `entry` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) character set utf8 NOT NULL default '',
+  `InventoryType` tinyint(3) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/sql/updates/3.3.3a_old/8586_world_locales_item_set_name.sql b/sql/updates/3.3.3a_old/8586_world_locales_item_set_name.sql
new file mode 100644
index 00000000000..30d39f978a2
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8586_world_locales_item_set_name.sql
@@ -0,0 +1,20 @@
+--
+-- Table structure for table `locales_item_set_name`
+--
+
+DROP TABLE IF EXISTS `locales_item_set_name`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `locales_item_set_name` (
+  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `name_loc1` varchar(100) NOT NULL DEFAULT '',
+  `name_loc2` varchar(100) NOT NULL DEFAULT '',
+  `name_loc3` varchar(100) NOT NULL DEFAULT '',
+  `name_loc4` varchar(100) NOT NULL DEFAULT '',
+  `name_loc5` varchar(100) NOT NULL DEFAULT '',
+  `name_loc6` varchar(100) NOT NULL DEFAULT '',
+  `name_loc7` varchar(100) NOT NULL DEFAULT '',
+  `name_loc8` varchar(100) NOT NULL DEFAULT '',
+  PRIMARY KEY (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/sql/updates/3.3.3a_old/8589_world_item_set_names.sql b/sql/updates/3.3.3a_old/8589_world_item_set_names.sql
new file mode 100644
index 00000000000..2edcc160c65
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8589_world_item_set_names.sql
@@ -0,0 +1 @@
+ALTER TABLE `item_set_names` ADD COLUMN `WDBVerified` smallint(5) signed NOT NULL DEFAULT '1';
diff --git a/sql/updates/3.3.3a_old/8602_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8602_world_spell_proc_event.sql
new file mode 100644
index 00000000000..ce7873f3a83
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8602_world_spell_proc_event.sql
@@ -0,0 +1 @@
+UPDATE `spell_proc_event` SET `Cooldown`=30 WHERE `entry` IN (30886, 30885, 30884, 30883, 30881);
diff --git a/sql/updates/3.3.3a_old/8605_world_playercreateinfo_item.sql b/sql/updates/3.3.3a_old/8605_world_playercreateinfo_item.sql
new file mode 100644
index 00000000000..c5d423c1744
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8605_world_playercreateinfo_item.sql
@@ -0,0 +1 @@
+ALTER TABLE `playercreateinfo_item` CHANGE `amount` `amount` tinyint(3) NOT NULL DEFAULT '1';
diff --git a/sql/updates/3.3.3a_old/8607_world_pool_creature.sql b/sql/updates/3.3.3a_old/8607_world_pool_creature.sql
new file mode 100644
index 00000000000..400e54cc6b5
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8607_world_pool_creature.sql
@@ -0,0 +1,2 @@
+UPDATE `pool_creature` SET `description` = `comment` WHERE `comment` <> '' AND `comment` IS NOT NULL AND (`description` = '' OR `description` IS NULL);
+ALTER TABLE `pool_creature` DROP COLUMN `comment`;
diff --git a/sql/updates/3.3.3a_old/8607_world_pool_template.sql b/sql/updates/3.3.3a_old/8607_world_pool_template.sql
new file mode 100644
index 00000000000..ac1cbf70223
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8607_world_pool_template.sql
@@ -0,0 +1,2 @@
+UPDATE `pool_template` SET `description` = `comment` WHERE `comment` <> '' AND `comment` IS NOT NULL AND (`description` = '' OR `description` IS NULL);
+ALTER TABLE `pool_template` DROP COLUMN `comment`;
diff --git a/sql/updates/3.3.3a_old/8625_world_pool_creature.sql b/sql/updates/3.3.3a_old/8625_world_pool_creature.sql
new file mode 100644
index 00000000000..ade35efe138
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8625_world_pool_creature.sql
@@ -0,0 +1 @@
+ALTER TABLE `pool_creature` DROP PRIMARY KEY, ADD PRIMARY KEY (`guid`);
diff --git a/sql/updates/3.3.3a_old/8625_world_pool_gameobject.sql b/sql/updates/3.3.3a_old/8625_world_pool_gameobject.sql
new file mode 100644
index 00000000000..720fbb76a0c
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8625_world_pool_gameobject.sql
@@ -0,0 +1 @@
+ALTER TABLE `pool_gameobject` DROP PRIMARY KEY, ADD PRIMARY KEY (`guid`);
diff --git a/sql/updates/3.3.3a_old/8625_world_pool_pool.sql b/sql/updates/3.3.3a_old/8625_world_pool_pool.sql
new file mode 100644
index 00000000000..1c8b9f3db8e
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8625_world_pool_pool.sql
@@ -0,0 +1 @@
+ALTER TABLE `pool_pool` DROP PRIMARY KEY, ADD PRIMARY KEY (`pool_id`);
diff --git a/sql/updates/3.3.3a_old/8638_world_scriptname.sql b/sql/updates/3.3.3a_old/8638_world_scriptname.sql
new file mode 100644
index 00000000000..d3f357f43bf
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8638_world_scriptname.sql
@@ -0,0 +1,12 @@
+update `creature_template` SET `scriptname`='mob_azure_invader' WHERE `entry`=30661; -- Azure Invader 1
+update `creature_template` SET `scriptname`='mob_azure_spellbreaker' WHERE `entry`=30662; -- Azure Spellbreaker
+update `creature_template` SET `scriptname`='mob_azure_binder' WHERE `entry`=30663; -- Azure Binder 1
+update `creature_template` SET `scriptname`='mob_azure_mage_slayer' WHERE `entry`=30664; -- Azure Mage Slayer 1
+update `creature_template` SET `scriptname`='mob_azure_captain' WHERE `entry`=30666; -- Azure Captain
+update `creature_template` SET `scriptname`='mob_azure_sorceror' WHERE `entry`=30667; -- Azure Sorceror
+update `creature_template` SET `scriptname`='mob_azure_raider' WHERE `entry`=30668; -- Azure Raider
+update `creature_template` SET `scriptname`='mob_azure_stalker' WHERE `entry`=32191; -- Azure Stalker
+update `creature_template` SET `scriptname`='mob_azure_invader' WHERE `entry`=30961; -- Azure Invader 2
+update `creature_template` SET `scriptname`='mob_azure_spellbreaker' WHERE `entry`=30962; -- Azure Spellbreaker
+update `creature_template` SET `scriptname`='mob_azure_binder' WHERE `entry`=30918; -- Azure Binder 2
+update `creature_template` SET `scriptname`='mob_azure_mage_slayer' WHERE `entry`=30963; -- Azure Mage Sl
diff --git a/sql/updates/3.3.3a_old/8658_world_spell_linked_spell.sql b/sql/updates/3.3.3a_old/8658_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..59e96ca2ac5
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8658_world_spell_linked_spell.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=20066;
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(20066, -61840, 0, 'Repentance');
diff --git a/sql/updates/3.3.3a_old/8671_world_spell_linked_spell.sql b/sql/updates/3.3.3a_old/8671_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..d2572727e59
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8671_world_spell_linked_spell.sql
@@ -0,0 +1,6 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (54861,55004)AND `spell_effect` IN (-23335,-23333);
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(54861,-23335,0, 'Drop Flag on Nitro Boost WSG'),
+(54861,-23333,0, 'Drop Flag on Nitro Boost WSG'),
+(55004,-23335,0, 'Drop Flag on Nitro Boost WSG'),
+(55004,-23333,0, 'Drop Flag on Nitro Boost WSG');
diff --git a/sql/updates/3.3.3a_old/8672_world_gossip_menu_option.sql b/sql/updates/3.3.3a_old/8672_world_gossip_menu_option.sql
new file mode 100644
index 00000000000..2ba86951100
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8672_world_gossip_menu_option.sql
@@ -0,0 +1,2 @@
+-- Drop forgotten fields after condition implementation
+ALTER TABLE gossip_menu_option DROP COLUMN cond_3,DROP COLUMN cond_3_val_1,DROP COLUMN cond_3_val_2;
diff --git a/sql/updates/3.3.3a_old/8674_world_spell_dbc.sql b/sql/updates/3.3.3a_old/8674_world_spell_dbc.sql
new file mode 100644
index 00000000000..e1e9e8d2fe2
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8674_world_spell_dbc.sql
@@ -0,0 +1,4 @@
+-- Add serverside spells place holders for future development
+DELETE FROM `spell_dbc` WHERE `Id`=39616;
+INSERT INTO `spell_dbc` (`Id`,`Comment`) VALUES
+(39616, 'Quest 10966 reward serverside spell');
diff --git a/sql/updates/3.3.3a_old/8674_world_spell_linked_spell.sql b/sql/updates/3.3.3a_old/8674_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..1333c728a8a
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8674_world_spell_linked_spell.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (54861,55004)AND `spell_effect` IN (-34976);
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+( 54861,-34976, 0, 'Drop Flag on Nitro Boost EOS'),
+( 55004,-34976, 0, 'Drop Flag on Nitro Boost EOS');
diff --git a/sql/updates/3.3.3a_old/8694_world_transport_events.sql b/sql/updates/3.3.3a_old/8694_world_transport_events.sql
new file mode 100644
index 00000000000..0e8786f777f
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8694_world_transport_events.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS `transport_events`;
diff --git a/sql/updates/3.3.3a_old/8752_world_scriptname.sql b/sql/updates/3.3.3a_old/8752_world_scriptname.sql
new file mode 100644
index 00000000000..03bc1bb354c
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8752_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `scriptname`='mob_azure_saboteur' WHERE `entry`=31079; -- Azure Saboteur
diff --git a/sql/updates/3.3.3a_old/8770_world_areatrigger_scripts.sql b/sql/updates/3.3.3a_old/8770_world_areatrigger_scripts.sql
new file mode 100644
index 00000000000..044725b3a5f
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8770_world_areatrigger_scripts.sql
@@ -0,0 +1,4 @@
+DELETE FROM `areatrigger_scripts` WHERE `entry` IN (5369,5423);
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(5369, 'at_RX_214_repair_o_matic_station'),
+(5423, 'at_RX_214_repair_o_matic_station');
diff --git a/sql/updates/3.3.3a_old/8770_world_script_waypoints.sql b/sql/updates/3.3.3a_old/8770_world_script_waypoints.sql
new file mode 100644
index 00000000000..c2418f6da33
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8770_world_script_waypoints.sql
@@ -0,0 +1,9 @@
+-- Waypoints for Mimron Inferno
+DELETE FROM `script_waypoint` WHERE `entry`=33370;
+INSERT INTO `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) VALUES
+(33370, 1, 331.674, -68.6878, 409.804, 0, '0'),
+(33370, 2, 274.578, -92.1829, 409.804, 0, '0'),
+(33370, 3, 226.433, -66.6652, 409.793, 0, '0'),
+(33370, 4, 206.092, -34.7447, 409.801, 0, '0'),
+(33370, 5, 240.208, 1.10346, 409.802, 0, '0'),
+(33370, 6, 337.199, 11.7051, 409.802, 0, '0');
diff --git a/sql/updates/3.3.3a_old/8770_world_scriptname.sql b/sql/updates/3.3.3a_old/8770_world_scriptname.sql
new file mode 100644
index 00000000000..e173f7e41f2
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8770_world_scriptname.sql
@@ -0,0 +1,12 @@
+UPDATE `creature_template` SET `ScriptName`= 'npc_thorims_hammer' WHERE `entry`=33365;
+UPDATE `creature_template` SET `ScriptName`= 'npc_mimirons_inferno' WHERE `entry`=33370;
+UPDATE `creature_template` SET `ScriptName`= 'npc_hodirs_fury' WHERE `entry`=33312;
+UPDATE `creature_template` SET `ScriptName`= 'npc_freyas_ward' WHERE `entry`=33367;
+UPDATE `creature_template` SET `ScriptName`= 'npc_lorekeeper' WHERE `entry`=33686;
+UPDATE `creature_template` SET `ScriptName`= 'npc_brann_bronzebeard' WHERE `entry`=33579;
+UPDATE `creature_template` SET `ScriptName`= 'npc_freya_ward_summon' WHERE `entry`=34275;
+UPDATE `creature_template` SET `ScriptName`= 'npc_mechanolift' WHERE `entry`=33214;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194375;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194371;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194370;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194377;
diff --git a/sql/updates/3.3.3a_old/8790_world_locales_item_set_names.sql b/sql/updates/3.3.3a_old/8790_world_locales_item_set_names.sql
new file mode 100644
index 00000000000..4f6015ac749
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8790_world_locales_item_set_names.sql
@@ -0,0 +1,2 @@
+DROP TABLE IF EXISTS `locales_item_set_names`;
+RENAME TABLE `locales_item_set_name` TO `locales_item_set_names`;
diff --git a/sql/updates/3.3.3a_old/8816_world_spell_bonus_data.sql b/sql/updates/3.3.3a_old/8816_world_spell_bonus_data.sql
new file mode 100644
index 00000000000..67d01d19b77
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8816_world_spell_bonus_data.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (45284,45297);
+INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES
+(45284,0.357,-1,-1,-1,'Shaman - LO Lightning Bolt'),
+(45297,0.285,-1,-1,-1,'Shaman - LO Chain Lightning');
diff --git a/sql/updates/3.3.3a_old/8821_world_spell_dbc.sql b/sql/updates/3.3.3a_old/8821_world_spell_dbc.sql
new file mode 100644
index 00000000000..903a932edaf
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8821_world_spell_dbc.sql
@@ -0,0 +1,8 @@
+-- Add serverside spells place holders for future development
+DELETE FROM `spell_dbc` WHERE `Id` IN (11202,25359,40145,45767,71098);
+INSERT INTO `spell_dbc` (`Id`,`Comment`) VALUES
+(11202, 'Item 3776 spellid_1 serverside spell'),
+(25359, 'Item 21293 spellid_2 serverside spell'),
+(40145, 'Quest 11000 RewSpellCast serverside spell'),
+(45767, 'Quest 11670 RewSpellCast serverside spell'),
+(71098, 'Quest 24451 RewSpellCast serverside spell');
diff --git a/sql/updates/3.3.3a_old/8836_world_spell_linked_spell.sql b/sql/updates/3.3.3a_old/8836_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..64c3c66c9e1
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8836_world_spell_linked_spell.sql
@@ -0,0 +1,3 @@
+-- Make the Ardent Defender heal (66235) trigger the visuals (66233)
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=66235;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES (66235,66233,0, 'Ardent Defender Visuals');
diff --git a/sql/updates/3.3.3a_old/8842_world_script_texts.sql b/sql/updates/3.3.3a_old/8842_world_script_texts.sql
new file mode 100644
index 00000000000..617b61a694f
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8842_world_script_texts.sql
@@ -0,0 +1,5 @@
+DELETE FROM script_texts where entry IN (-1000474, -1000475, -1000476);
+INSERT INTO script_texts (`npc_entry`, `entry`, `content_default`, `type`, `language`, `comment`) VALUE
+(17375, -1000474, '[Fulborg] The Stillpine furbolgs will not soon forget your bravery!', 0, 0, 'Stillpine Capitive free say text 1'),
+(17375, -1000475, '[Fulborg] Thank you, $N', 0, 0, 'Stillpine Capitive free say text 2'),
+(17375, -1000476, '[Fulborg] Those remaining at Stillpine Hold will welcome you as a hero!', 0, 0, 'Stillpine Capitive free say text 3');
diff --git a/sql/updates/3.3.3a_old/8842_world_scriptname.sql b/sql/updates/3.3.3a_old/8842_world_scriptname.sql
new file mode 100644
index 00000000000..5ef8e4b6aa9
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8842_world_scriptname.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `ScriptName`='npc_stillpine_capitive' where `entry`=17375;
+UPDATE `gameobject_template` SET `ScriptName`='go_stillpine_cage' WHERE `entry`=181714;
diff --git a/sql/updates/3.3.3a_old/8843_world_scriptname.sql b/sql/updates/3.3.3a_old/8843_world_scriptname.sql
new file mode 100644
index 00000000000..4517544d99d
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8843_world_scriptname.sql
@@ -0,0 +1,2 @@
+UPDATE `gameobject_template` SET `ScriptName`='go_bristlelimb_cage' WHERE `entry`=181714;
+
diff --git a/sql/updates/3.3.3a_old/CMakeLists.txt b/sql/updates/3.3.3a_old/CMakeLists.txt
index 94143fe1e5b..8557b4d4bf3 100644
--- a/sql/updates/3.3.3a_old/CMakeLists.txt
+++ b/sql/updates/3.3.3a_old/CMakeLists.txt
@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_333 *.sql)
 
-INSTALL(FILES
-${_SQL_333}
-DESTINATION share/trinity/sql/updates/3.3.3a_old)
\ No newline at end of file
+INSTALL(FILES ${_SQL_333} DESTINATION share/trinity/sql/updates/3.3.3a_old)
\ No newline at end of file
diff --git a/sql/updates/3.3.5a_old/8861_auth_realmlist.sql b/sql/updates/3.3.5a_old/8861_auth_realmlist.sql
new file mode 100644
index 00000000000..c6622d5ce1e
--- /dev/null
+++ b/sql/updates/3.3.5a_old/8861_auth_realmlist.sql
@@ -0,0 +1,3 @@
+UPDATE `realmlist` SET `gamebuild`=12340 WHERE `id`=1;
+ALTER TABLE `realmlist` CHANGE COLUMN `gamebuild` `gamebuild` int(11) unsigned NOT NULL default '12340';
+
diff --git a/sql/updates/3.3.5a_old/CMakeLists.txt b/sql/updates/3.3.5a_old/CMakeLists.txt
new file mode 100644
index 00000000000..63cb6eab23e
--- /dev/null
+++ b/sql/updates/3.3.5a_old/CMakeLists.txt
@@ -0,0 +1,3 @@
+FILE(GLOB _SQL_335 *.sql)
+
+INSTALL(FILES ${_SQL_333} DESTINATION share/trinity/sql/updates/3.3.5a_old)
diff --git a/sql/updates/8890_world_spell_dbc.sql b/sql/updates/8890_world_spell_dbc.sql
new file mode 100644
index 00000000000..a5e0927806f
--- /dev/null
+++ b/sql/updates/8890_world_spell_dbc.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `spell_dbc`
+  ADD COLUMN `Stances` int(10) unsigned NOT NULL DEFAULT '0' AFTER `AttributesEx5`,
+  ADD COLUMN `StancesNot` int(10) unsigned NOT NULL DEFAULT '0' AFTER `Stances`;
diff --git a/sql/updates/8891_world_spell_dbc.sql b/sql/updates/8891_world_spell_dbc.sql
new file mode 100644
index 00000000000..6adb4e5fd28
--- /dev/null
+++ b/sql/updates/8891_world_spell_dbc.sql
@@ -0,0 +1,2 @@
+UPDATE `spell_dbc` SET `Stances`=0x90 WHERE `Id`=24899;
+UPDATE `spell_dbc` SET `Stances`=0x1 WHERE `Id`=24900;
diff --git a/sql/updates/8897_world_npc_vendor.sql b/sql/updates/8897_world_npc_vendor.sql
new file mode 100644
index 00000000000..0e1c793863d
--- /dev/null
+++ b/sql/updates/8897_world_npc_vendor.sql
@@ -0,0 +1,5 @@
+-- Restore negative ExtendedCost, we now use FlagsExtra value instead
+UPDATE `npc_vendor` SET `ExtendedCost`=-`ExtendedCost` WHERE `ExtendedCost`<0;
+
+-- Set field type to unsigned
+ALTER TABLE npc_vendor CHANGE COLUMN `ExtendedCost` `ExtendedCost` mediumint(8) UNSIGNED NOT NULL default '0' COMMENT '';
diff --git a/sql/updates/8897_world_trinity_string.sql b/sql/updates/8897_world_trinity_string.sql
new file mode 100644
index 00000000000..691b0723a5b
--- /dev/null
+++ b/sql/updates/8897_world_trinity_string.sql
@@ -0,0 +1,2 @@
+-- UPDATE so we don't kill customized locale strings if user has any
+UPDATE `trinity_string` SET `content_default`='Item ''%u'' (with extended cost %u) already in vendor list.' WHERE `entry`=210;
diff --git a/sql/updates/8905_world_spell_proc_event.sql b/sql/updates/8905_world_spell_proc_event.sql
new file mode 100644
index 00000000000..7429a6a06b4
--- /dev/null
+++ b/sql/updates/8905_world_spell_proc_event.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_proc_event` WHERE `entry` IN(67758);
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+(67758,0,0,0,0,0,0,2,0,0,2);
diff --git a/sql/updates/8906_world_spell_proc_event.sql b/sql/updates/8906_world_spell_proc_event.sql
new file mode 100644
index 00000000000..2d5c35c02a5
--- /dev/null
+++ b/sql/updates/8906_world_spell_proc_event.sql
@@ -0,0 +1,7 @@
+DELETE FROM `spell_proc_event` WHERE `entry` IN (47201,47202,47203,47204,47205);
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+(47201,0,5,0x00004009,0x00040000,0x00000000,0x00000000,0x0000000,0,0,0),
+(47202,0,5,0x00004009,0x00040000,0x00000000,0x00000000,0x0000000,0,0,0),
+(47203,0,5,0x00004009,0x00040000,0x00000000,0x00000000,0x0000000,0,0,0),
+(47204,0,5,0x00004009,0x00040000,0x00000000,0x00000000,0x0000000,0,0,0),
+(47205,0,5,0x00004009,0x00040000,0x00000000,0x00000000,0x0000000,0,0,0);
\ No newline at end of file
diff --git a/sql/updates/8915_world_trinity_string.sql b/sql/updates/8915_world_trinity_string.sql
new file mode 100644
index 00000000000..3c882c98895
--- /dev/null
+++ b/sql/updates/8915_world_trinity_string.sql
@@ -0,0 +1,5 @@
+-- UPDATE so we don't kill customized locale strings if user has any
+UPDATE `trinity_string` SET `content_default`='The old password is wrong' WHERE `entry`=27;
+-- INSERT as this string has not been used before
+DELETE FROM `trinity_string` WHERE `entry`=62;
+INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`) VALUES (62, 'One on more parameters have incorrect values', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/sql/updates/8920_world_spell_dbc.sql b/sql/updates/8920_world_spell_dbc.sql
new file mode 100644
index 00000000000..a400139824a
--- /dev/null
+++ b/sql/updates/8920_world_spell_dbc.sql
@@ -0,0 +1,4 @@
+-- Add serverside spells place holders for future development
+DELETE FROM `spell_dbc` WHERE `Id` IN (70878);
+INSERT INTO `spell_dbc` (`Id`,`Comment`) VALUES
+(70878, 'Creature 40160 creature_addon serverside spell');
diff --git a/sql/updates/8920_world_spell_linked_spell.sql b/sql/updates/8920_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..2b6a4bcf9ed
--- /dev/null
+++ b/sql/updates/8920_world_spell_linked_spell.sql
@@ -0,0 +1,4 @@
+-- For quest: Truce?
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=50141;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(50141,50001,0, 'Blood Oath to Blood Oath Aura');
diff --git a/sql/updates/8921_world_spell_dbc.sql b/sql/updates/8921_world_spell_dbc.sql
new file mode 100644
index 00000000000..7e53fc4bbf2
--- /dev/null
+++ b/sql/updates/8921_world_spell_dbc.sql
@@ -0,0 +1 @@
+UPDATE `spell_dbc` SET `Effect1`=6,`EffectApplyAuraName1`=4 WHERE `Id` IN (70878);
diff --git a/sql/updates/8925_world_spell_group.sql b/sql/updates/8925_world_spell_group.sql
new file mode 100644
index 00000000000..0e7d2cf894e
--- /dev/null
+++ b/sql/updates/8925_world_spell_group.sql
@@ -0,0 +1,6 @@
+DELETE FROM `spell_group` WHERE `id` = 1103;
+-- Cast Speed Slow
+INSERT INTO `spell_group` (`id`,`spell_id`) VALUES
+(1103,-1100),
+(1103,-1101),
+(1103,-1102);
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index 68639a4b265..fca7e740f90 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -4,9 +4,8 @@ add_subdirectory(3.1.3_old)
 add_subdirectory(3.2.2a_old)
 add_subdirectory(3.3.2_old)
 add_subdirectory(3.3.3a_old)
+add_subdirectory(3.3.5a_old)
 
 FILE(GLOB _SQL_UPDATES *.sql)
 
-INSTALL(FILES
-${_SQL_UPDATES}
-DESTINATION share/trinity/sql/updates)
+INSTALL(FILES ${_SQL_UPDATES} DESTINATION share/trinity/sql/updates)