From e43a6b373a258eb24fc8ea5d5a86c9ad44279cd0 Mon Sep 17 00:00:00 2001
From: DDuarte <dnpd.dd@gmail.com>
Date: Mon, 1 Jun 2015 02:31:32 +0100
Subject: Merge pull request #14613 from ariel-/shathalls

Fixed some issues with PR #14157
(cherry picked from commit 82a6cbcad4d34e4b20313c17af99b82be6368e3c)

Included coverity fix of 25881ca95fd3c8e6c8aecb93739d1642c7a4d9c8 (DD)

Conflicts:
	src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
---
 sql/updates/world/2015_06_01_00_world_2015_05_26_05.sql | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 sql/updates/world/2015_06_01_00_world_2015_05_26_05.sql

(limited to 'sql')

diff --git a/sql/updates/world/2015_06_01_00_world_2015_05_26_05.sql b/sql/updates/world/2015_06_01_00_world_2015_05_26_05.sql
new file mode 100644
index 00000000000..d7ef0e17204
--- /dev/null
+++ b/sql/updates/world/2015_06_01_00_world_2015_05_26_05.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` = 39291;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(39291, 'spell_remove_kargath_executioner');
-- 
cgit v1.2.3