From 6a63dc18527ebeb4392c6233a08a309a9133a138 Mon Sep 17 00:00:00 2001
From: Drahy <none@none>
Date: Tue, 3 Mar 2009 16:45:40 +0100
Subject: [PATCH] * Updated sql trinity code for proper built * Revert some
 changes for 3.0.x core

--HG--
branch : trunk
---
 ...os_command.sql => 1576_mangos_7332_01_world_command.sql} | 5 ++---
 ...ll_area.sql => 1605_mangos_7349_01_world_spell_area.sql} | 4 ++--
 ...ate.sql => 1646_mangos_7369_01_world_quest_template.sql} | 2 +-
 sql/updates/1654_world.sql                                  | 1 +
 sql/updates/CMakeLists.txt                                  | 6 +++++-
 5 files changed, 11 insertions(+), 7 deletions(-)
 rename sql/updates/{7332_01_mangos_command.sql => 1576_mangos_7332_01_world_command.sql} (66%)
 rename sql/updates/{7349_01_mangos_spell_area.sql => 1605_mangos_7349_01_world_spell_area.sql} (83%)
 rename sql/updates/{7369_01_mangos_quest_template.sql => 1646_mangos_7369_01_world_quest_template.sql} (54%)
 create mode 100644 sql/updates/1654_world.sql

diff --git a/sql/updates/7332_01_mangos_command.sql b/sql/updates/1576_mangos_7332_01_world_command.sql
similarity index 66%
rename from sql/updates/7332_01_mangos_command.sql
rename to sql/updates/1576_mangos_7332_01_world_command.sql
index 65248d19c6..197934db8a 100644
--- a/sql/updates/7332_01_mangos_command.sql
+++ b/sql/updates/1576_mangos_7332_01_world_command.sql
@@ -1,6 +1,5 @@
-ALTER TABLE db_version CHANGE COLUMN required_7331_01_mangos_command required_7332_01_mangos_command bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7331_01_mangos_command required_7332_01_mangos_command bit;*/
 
 DELETE FROM `command` WHERE `name` = 'distance';
-
 INSERT INTO `command` VALUES
-('distance',3,'Syntax: .distance [$name/$link]\r\n\r\nDisplay the distance from your character to the selected creature/player, or player with name $name, or player/creature/gameobject pointed to shift-link with guid.');
+('distance',3,'Syntax: .distance [$name/$link]\r\n\r\nDisplay the distance from your character to the selected creature/player, or player with name $name, or player/creature/gameobject pointed to shift-link with guid.');
\ No newline at end of file
diff --git a/sql/updates/7349_01_mangos_spell_area.sql b/sql/updates/1605_mangos_7349_01_world_spell_area.sql
similarity index 83%
rename from sql/updates/7349_01_mangos_spell_area.sql
rename to sql/updates/1605_mangos_7349_01_world_spell_area.sql
index 969fff950a..1e9e560412 100644
--- a/sql/updates/7349_01_mangos_spell_area.sql
+++ b/sql/updates/1605_mangos_7349_01_world_spell_area.sql
@@ -1,4 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_7332_01_mangos_command required_7349_01_mangos_spell_area bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7332_01_mangos_command required_7349_01_mangos_spell_area bit;*/
 
 DROP TABLE IF EXISTS `spell_area`;
 CREATE TABLE `spell_area` (
@@ -12,4 +12,4 @@ CREATE TABLE `spell_area` (
   `gender`             tinyint(1) unsigned NOT NULL default '2',
   `autocast`           tinyint(1) unsigned NOT NULL default '0',
   PRIMARY KEY  (`spell`,`area`,`quest_start`,`quest_start_active`,`aura_spell`,`racemask`,`gender`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
\ No newline at end of file
diff --git a/sql/updates/7369_01_mangos_quest_template.sql b/sql/updates/1646_mangos_7369_01_world_quest_template.sql
similarity index 54%
rename from sql/updates/7369_01_mangos_quest_template.sql
rename to sql/updates/1646_mangos_7369_01_world_quest_template.sql
index 734ebe5847..e3146993c0 100644
--- a/sql/updates/7369_01_mangos_quest_template.sql
+++ b/sql/updates/1646_mangos_7369_01_world_quest_template.sql
@@ -1,4 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_7349_01_mangos_spell_area required_7369_01_mangos_quest_template bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7349_01_mangos_spell_area required_7369_01_mangos_quest_template bit;*/
 
 ALTER TABLE quest_template
   DROP COLUMN ReqSourceRef1,
diff --git a/sql/updates/1654_world.sql b/sql/updates/1654_world.sql
new file mode 100644
index 0000000000..3e45462aa7
--- /dev/null
+++ b/sql/updates/1654_world.sql
@@ -0,0 +1 @@
+INSERT INTO `spell_proc_event` VALUES (17619, 0x00, 13, 0x00000000, 0x00000000, 0x00000000, 0x00008000, 0x00000000, 0.000000, 0.000000, 0);
\ No newline at end of file
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index 38b14195d9..e14be0119e 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -49,7 +49,11 @@ INSTALL(FILES
 1555_mangos_7331_01_world_command.sql
 1558_world_spell_linked_spell.sql
 1559_world.sql
-1570_world.sql
+1576_mangos_7332_01_world_command.sql
+1605_mangos_7349_01_world_spell_area
 1613_world_scripts.sql
 1614_characters_auctionhouse.sql
+1618_world.sql
+1646_mangos_7369_01_world_quest_template.sql
+1654_world.sql
 DESTINATION share/trinity/sql/updates)
\ No newline at end of file