aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorMalcrom <malcromdev@gmail.com>2012-02-10 12:33:25 -0330
committerMalcrom <malcromdev@gmail.com>2012-02-10 12:33:25 -0330
commitbe64238b45bc5550fc61071ae4752c941b45d331 (patch)
tree5f03891228bcdba9c6986a49c0a81f540a894568 /sql
parentcefececdf99764872b7f866f9e5c1441f32c7a52 (diff)
parent586a76e3a0345a86f0e372f59aef082580bd266a (diff)
Merge branch 'master' of git://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'sql')
-rw-r--r--sql/updates/world/2012_02_10_00_world_conditions.sql1
-rw-r--r--sql/updates/world/2012_02_10_01_world_gameobject.sql3
2 files changed, 4 insertions, 0 deletions
diff --git a/sql/updates/world/2012_02_10_00_world_conditions.sql b/sql/updates/world/2012_02_10_00_world_conditions.sql
new file mode 100644
index 00000000000..508011609cf
--- /dev/null
+++ b/sql/updates/world/2012_02_10_00_world_conditions.sql
@@ -0,0 +1 @@
+ALTER TABLE `conditions` ADD COLUMN `NegativeCondition` tinyint(3) UNSIGNED NOT NULL default '0' AFTER `ConditionValue3`;
diff --git a/sql/updates/world/2012_02_10_01_world_gameobject.sql b/sql/updates/world/2012_02_10_01_world_gameobject.sql
new file mode 100644
index 00000000000..1dbbb850472
--- /dev/null
+++ b/sql/updates/world/2012_02_10_01_world_gameobject.sql
@@ -0,0 +1,3 @@
+-- Picnic Basket
+UPDATE `gameobject_template` SET `flags`=0, `AIName`='' WHERE `entry`=187267;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=187267 AND `source_type`=1;