* Moved sql files from 2.4.3 to proper directory after merge

--HG--
branch : trunk

8 files changed, 4 insertions, 14 deletions

diff --git a/sql/updates/1018_world.sql b/sql/updates/1018_world.sql
deleted file mode 100644
index d231eb168b9..00000000000
--- a/sql/updates/1018_world.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (31224,41292,44007,44867);
-INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
-(31224,  -1543,  2, 'Cloak of Shadows - Flare'),
-(41292,  42017,  2, 'Aura of Suffering'),
-(44007,  -43657, 2, 'Storm Eye Safe Zone Immune'),
-(44867,  -46019, 2, 'Spectral Exhaustion - Teleport: Spectral Realm');
diff --git a/sql/updates/2.4.3_updates/1018_world.sql b/sql/updates/2.4.3_updates/1018_world.sql
index ca298faa8f3..d231eb168b9 100644
--- a/sql/updates/2.4.3_updates/1018_world.sql
+++ b/sql/updates/2.4.3_updates/1018_world.sql
@@ -3,4 +3,4 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comm
 (31224,  -1543,  2, 'Cloak of Shadows - Flare'),
 (41292,  42017,  2, 'Aura of Suffering'),
 (44007,  -43657, 2, 'Storm Eye Safe Zone Immune'),
-(44867,  -46019, 2, 'Spectral Exhaustion - Teleport: Spectral Realm');
\ No newline at end of file
+(44867,  -46019, 2, 'Spectral Exhaustion - Teleport: Spectral Realm');
diff --git a/sql/updates/1026_world.sql b/sql/updates/2.4.3_updates/1026_world.sql
index ae189469b41..ae189469b41 100644
--- a/sql/updates/1026_world.sql
+++ b/sql/updates/2.4.3_updates/1026_world.sql
diff --git a/sql/updates/1028_world_scripts.sql b/sql/updates/2.4.3_updates/1028_world_scripts.sql
index 9c821c7b093..9c821c7b093 100644
--- a/sql/updates/1028_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/1028_world_scripts.sql
diff --git a/sql/updates/2.4.3_updates/54_world.sql b/sql/updates/2.4.3_updates/54_world.sql
index 88ebc4b46db..2d5e984d9e7 100644
--- a/sql/updates/2.4.3_updates/54_world.sql
+++ b/sql/updates/2.4.3_updates/54_world.sql
@@ -2,4 +2,4 @@ CREATE TABLE `game_event_battleground_holiday` (
  `event` int(10) unsigned NOT NULL,
  `bgflag` int(10) unsigned NOT NULL default '0',
  PRIMARY KEY  (`event`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
\ No newline at end of file
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/sql/updates/2.4.3_updates/CMakeLists.txt b/sql/updates/2.4.3_updates/CMakeLists.txt
index 13c45a9cbc5..bb2090d80b2 100644
--- a/sql/updates/2.4.3_updates/CMakeLists.txt
+++ b/sql/updates/2.4.3_updates/CMakeLists.txt
@@ -163,4 +163,6 @@ INSTALL(FILES
 970_world_scripts.sql
 973_world_scripts.sql
 1018_world.sql
+1026_world.sql
+1028_world_scripts.sql
 DESTINATION share/trinity/sql/updates/2.4.3_updates)
diff --git a/sql/updates/54_world.sql b/sql/updates/54_world.sql
deleted file mode 100644
index 2d5e984d9e7..00000000000
--- a/sql/updates/54_world.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE TABLE `game_event_battleground_holiday` (
- `event` int(10) unsigned NOT NULL,
- `bgflag` int(10) unsigned NOT NULL default '0',
- PRIMARY KEY  (`event`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/sql/updates/973_world_scripts.sql b/sql/updates/973_world_scripts.sql
deleted file mode 100644
index b53219c6afe..00000000000
--- a/sql/updates/973_world_scripts.sql
+++ /dev/null
@@ -1 +0,0 @@
-update creature_template set scriptname = 'npc_enraged_spirit' where entry in (21050, 21061, 21060, 21059);