From 0b6bc42c3f7c34bd6128886cef6d421f42afce7d Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Sat, 13 Feb 2010 20:32:36 +0300
Subject: [PATCH] [9367] Fixes for [9366] for restore server startup and other.

* Add expected sql update order guards to sql updates
* Update size of spell id field in spell_bonus_data.

Note: You need apply new sql updates versions or just re-aplly
      one more time new sql update version if apply already old.
---
 sql/mangos.sql                                  | 4 ++--
 sql/updates/9366_01_mangos_spell_bonus_data.sql | 6 ++++++
 sql/updates/9366_02_mangos_spell_proc_event.sql | 2 ++
 src/shared/revision_nr.h                        | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/sql/mangos.sql b/sql/mangos.sql
index 97d5b60f9..bc17264f3 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -14100,7 +14100,7 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `spell_bonus_data`;
 CREATE TABLE `spell_bonus_data` (
-  `entry` smallint(5) unsigned NOT NULL,
+  `spell` mediumint(8) unsigned NOT NULL,
   `direct_bonus` float NOT NULL default '0',
   `dot_bonus` float NOT NULL default '0',
   `ap_bonus` float NOT NULL default '0',
@@ -18653,7 +18653,7 @@ INSERT INTO `spell_proc_event` VALUES
 (64976, 0x00000000,  4, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0.000000, 0.000000,  0),
 (65661, 0x00000000, 15, 0x00400011, 0x00020004, 0x00000000, 0x00000010, 0x00000001, 0.000000, 100.000000,0),
 (64127, 0x00000000,  6, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(67228, 0x00000004, 11, 0x00000000, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0),
+(67228, 0x00000004, 11, 0x00000000, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (67353, 0x00000000,  7, 0x00008000, 0x00100500, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (67667, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),
 (67672, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 50),
diff --git a/sql/updates/9366_01_mangos_spell_bonus_data.sql b/sql/updates/9366_01_mangos_spell_bonus_data.sql
index 8328e74ca..e88319092 100644
--- a/sql/updates/9366_01_mangos_spell_bonus_data.sql
+++ b/sql/updates/9366_01_mangos_spell_bonus_data.sql
@@ -1,3 +1,9 @@
+ALTER TABLE db_version CHANGE COLUMN required_9331_01_mangos_quest_template required_9366_01_mangos_spell_bonus_data bit;
+
+ALTER TABLE spell_bonus_data
+  CHANGE COLUMN entry entry mediumint(8) unsigned NOT NULL;
+
+
 DELETE FROM spell_bonus_data WHERE entry = 71824;
 INSERT INTO spell_bonus_data VALUES
 (71824,0,0,0,'Item - Shaman T9 Elemental 4P Bonus');
\ No newline at end of file
diff --git a/sql/updates/9366_02_mangos_spell_proc_event.sql b/sql/updates/9366_02_mangos_spell_proc_event.sql
index 54e8b063b..343c0fc1c 100644
--- a/sql/updates/9366_02_mangos_spell_proc_event.sql
+++ b/sql/updates/9366_02_mangos_spell_proc_event.sql
@@ -1,3 +1,5 @@
+ALTER TABLE db_version CHANGE COLUMN required_9366_01_mangos_spell_bonus_data required_9366_02_mangos_spell_proc_event bit;
+
 DELETE FROM `spell_proc_event` WHERE `entry` = 67228;
 INSERT INTO `spell_proc_event` VALUES
 (67228, 0x00000004, 11, 0x00000000, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); 
\ No newline at end of file
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index efdd68deb..ec9e52e6e 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9366"
+ #define REVISION_NR "9367"
 #endif // __REVISION_NR_H__